Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[automated] Merge branch 'production' => 'main' #4398

Merged
merged 1 commit into from
Jan 31, 2025
Merged

[automated] Merge branch 'production' => 'main' #4398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ProductConstructionService/ProductConstructionService.Api/Configuration/ApiRedirection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ public static async Task<bool> IsAuthenticated(this HttpContext context)
}

var authService = context.RequestServices.GetRequiredService<IAuthorizationService>();
AuthorizationResult result = await authService.AuthorizeAsync(success.Ticket!.Principal, AuthenticationConfiguration.MsftAuthorizationPolicyName);
AuthorizationResult result = await authService.AuthorizeAsync(success.Ticket!.Principal, AuthenticationConfiguration.WebAuthorizationPolicyName);
if (!result.Succeeded)
{
context.Response.StatusCode = (int)HttpStatusCode.Forbidden;
Expand Down
20 changes: 15 additions & 5 deletions ...uctionService/ProductConstructionService.Api/Configuration/AuthenticationConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,16 @@ namespace ProductConstructionService.Api.Configuration;

internal static class AuthenticationConfiguration
{
public const string EntraAuthorizationPolicyName = "Entra";
public const string MsftAuthorizationPolicyName = "msft";
public const string EntraAuthorizationSchemeName = "Entra";
public const string ApiAuthorizationPolicyName = "MsftApi";
public const string WebAuthorizationPolicyName = "MsftWeb";
public const string AdminAuthorizationPolicyName = "RequireAdminAccess";

public const string AccountSignInRoute = "/Account/SignIn";

public static readonly string[] AuthenticationSchemes =
[
EntraAuthorizationPolicyName,
EntraAuthorizationSchemeName,
OpenIdConnectDefaults.AuthenticationScheme,
];

Expand Down Expand Up @@ -54,7 +55,7 @@ public static void ConfigureAuthServices(this IServiceCollection services, IConf
var openIdAuth = services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme);

openIdAuth
.AddMicrosoftIdentityWebApi(entraAuthConfig, EntraAuthorizationPolicyName);
.AddMicrosoftIdentityWebApi(entraAuthConfig, EntraAuthorizationSchemeName);

openIdAuth
.AddMicrosoftIdentityWebApp(options =>
Expand Down Expand Up @@ -88,12 +89,21 @@ public static void ConfigureAuthServices(this IServiceCollection services, IConf

services
.AddAuthorizationBuilder()
.AddPolicy(MsftAuthorizationPolicyName, policy =>
.AddDefaultPolicy(WebAuthorizationPolicyName, policy =>
{
policy.AddAuthenticationSchemes(AuthenticationSchemes);
policy.RequireAuthenticatedUser();
policy.RequireRole(userRole);
})
.AddPolicy(ApiAuthorizationPolicyName, policy =>
{
// Cookie scheme for BarViz, Entra JWT for Darc and other clients
// The order matters here as the last scheme's Forbid() handler is used for processing authentication failures
// Since cookie scheme returns 200 with the auth exception in the body, Entra should be used instead as it 401s
policy.AddAuthenticationSchemes([CookieAuthenticationDefaults.AuthenticationScheme, EntraAuthorizationSchemeName]);
policy.RequireAuthenticatedUser();
policy.RequireRole(userRole);
})
.AddPolicy(AdminAuthorizationPolicyName, policy =>
{
policy.AddAuthenticationSchemes(AuthenticationSchemes);
Expand Down
4 changes: 3 additions & 1 deletion src/ProductConstructionService/ProductConstructionService.Api/PcsStartup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ internal static async Task ConfigurePcs(
builder.Services.AddRazorPages(
options =>
{
options.Conventions.AuthorizeFolder("/", AuthenticationConfiguration.MsftAuthorizationPolicyName);
options.Conventions.AuthorizeFolder("/", AuthenticationConfiguration.WebAuthorizationPolicyName);
options.Conventions.AllowAnonymousToPage("/Error");
})
.AddGitHubWebHooks()
Expand Down Expand Up @@ -297,6 +297,8 @@ public static void ConfigureApi(this IApplicationBuilder app, bool isDevelopment
app.UseEndpoints(e =>
{
var controllers = e.MapControllers();
controllers.RequireAuthorization(AuthenticationConfiguration.ApiAuthorizationPolicyName);

if (isDevelopment)
{
controllers.AllowAnonymous();
Expand Down