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

fix(auth): Allow .noconsent scope in EndUser auth policy #1760

Merged
merged 1 commit into from
Jan 29, 2025
Merged

fix(auth): Allow .noconsent scope in EndUser auth policy #1760

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
11 changes: 10 additions & 1 deletion src/Digdir.Domain.Dialogporten.GraphQL/Common/Authorization/AuthorizationOptionsSetup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,16 @@ public void Configure(AuthorizationOptions options)

options.AddPolicy(AuthorizationPolicy.EndUser, builder => builder
.Combine(options.DefaultPolicy)
.RequireScope(AuthorizationScope.EndUser));
.RequireAssertion(context =>
{
var userScopes = context.User
.FindAll(AuthorizationPolicyBuilderExtensions.ScopeClaim)
.Select(s => s.Value)
.ToList();

return userScopes.Contains(AuthorizationScope.EndUser) ||
userScopes.Contains(AuthorizationScope.EndUserNoConsent);
}));

options.AddPolicy(AuthorizationPolicy.ServiceProvider, builder => builder
.Combine(options.DefaultPolicy)
Expand Down
1 change: 1 addition & 0 deletions src/Digdir.Domain.Dialogporten.GraphQL/Common/Authorization/AuthorizationPolicy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ internal static class AuthorizationPolicy
internal static class AuthorizationScope
{
public const string EndUser = "digdir:dialogporten";
public const string EndUserNoConsent = "digdir:dialogporten.noconsent";
public const string ServiceProvider = "digdir:dialogporten.serviceprovider";
public const string ServiceProviderSearch = "digdir:dialogporten.serviceprovider.search";
public const string Testing = "digdir:dialogporten.developer.test";
Expand Down
2 changes: 1 addition & 1 deletion ....Domain.Dialogporten.GraphQL/Common/Authorization/AuthorizationPolicyBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace Digdir.Domain.Dialogporten.GraphQL.Common.Authorization;

internal static class AuthorizationPolicyBuilderExtensions
{
private const string ScopeClaim = "scope";
public const string ScopeClaim = "scope";
private const char ScopeClaimSeparator = ' ';

public static AuthorizationPolicyBuilder RequireScope(this AuthorizationPolicyBuilder builder, string scope) =>
Expand Down
11 changes: 10 additions & 1 deletion src/Digdir.Domain.Dialogporten.WebApi/Common/Authorization/AuthorizationOptionsSetup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,16 @@ public void Configure(AuthorizationOptions options)

options.AddPolicy(AuthorizationPolicy.EndUser, builder => builder
.Combine(options.DefaultPolicy)
.RequireScope(AuthorizationScope.EndUser));
.RequireAssertion(context =>
{
var userScopes = context.User
.FindAll(AuthorizationPolicyBuilderExtensions.ScopeClaim)
.Select(s => s.Value)
.ToList();

return userScopes.Contains(AuthorizationScope.EndUser) ||
userScopes.Contains(AuthorizationScope.EndUserNoConsent);
}));

options.AddPolicy(AuthorizationPolicy.ServiceProvider, builder => builder
.Combine(options.DefaultPolicy)
Expand Down
1 change: 1 addition & 0 deletions src/Digdir.Domain.Dialogporten.WebApi/Common/Authorization/AuthorizationPolicy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ internal static class AuthorizationPolicy
internal static class AuthorizationScope
{
public const string EndUser = "digdir:dialogporten";
public const string EndUserNoConsent = "digdir:dialogporten.noconsent";
public const string ServiceProvider = "digdir:dialogporten.serviceprovider";
public const string ServiceProviderSearch = "digdir:dialogporten.serviceprovider.search";
public const string Testing = "digdir:dialogporten.developer.test";
Expand Down
2 changes: 1 addition & 1 deletion ...r.Domain.Dialogporten.WebApi/Common/Authorization/AuthorizationPolicyBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace Digdir.Domain.Dialogporten.WebApi.Common.Authorization;

internal static class AuthorizationPolicyBuilderExtensions
{
private const string ScopeClaim = "scope";
public const string ScopeClaim = "scope";
private const char ScopeClaimSeparator = ' ';

public static AuthorizationPolicyBuilder RequireScope(this AuthorizationPolicyBuilder builder, string scope) =>
Expand Down