Skip to content

CanCachePolicy->AllowsCachingPolicies #43469

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.

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

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,6 @@ public Task<AuthorizationPolicy> GetDefaultPolicyAsync()
/// <summary>
/// Determines if policies from this provider can be cached, which is true only for this type.
/// </summary>
public virtual bool CanCachePolicy => GetType() == typeof(DefaultAuthorizationPolicyProvider);
public virtual bool AllowsCachingPolicies => GetType() == typeof(DefaultAuthorizationPolicyProvider);
#endif
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ public interface IAuthorizationPolicyProvider
/// <summary>
/// Determines if policies from this provider can be cached, defaults to false.
/// </summary>
bool CanCachePolicy => false;
bool AllowsCachingPolicies => false;
#endif
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#nullable enable
Microsoft.AspNetCore.Authorization.AuthorizationBuilder
Microsoft.AspNetCore.Authorization.AuthorizationBuilder.AuthorizationBuilder(Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> void
Microsoft.AspNetCore.Authorization.IAuthorizationPolicyProvider.CanCachePolicy.get -> bool
Microsoft.AspNetCore.Authorization.IAuthorizationPolicyProvider.AllowsCachingPolicies.get -> bool
Microsoft.AspNetCore.Authorization.Infrastructure.PassThroughAuthorizationHandler.PassThroughAuthorizationHandler(Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Authorization.AuthorizationOptions!>! options) -> void
static Microsoft.AspNetCore.Authorization.AuthorizationPolicy.CombineAsync(Microsoft.AspNetCore.Authorization.IAuthorizationPolicyProvider! policyProvider, System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Authorization.IAuthorizeData!>! authorizeData, System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Authorization.AuthorizationPolicy!>! policies) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Authorization.AuthorizationPolicy?>!
virtual Microsoft.AspNetCore.Authorization.AuthorizationBuilder.AddDefaultPolicy(string! name, Microsoft.AspNetCore.Authorization.AuthorizationPolicy! policy) -> Microsoft.AspNetCore.Authorization.AuthorizationBuilder!
Expand All @@ -14,4 +14,4 @@ virtual Microsoft.AspNetCore.Authorization.AuthorizationBuilder.Services.get ->
virtual Microsoft.AspNetCore.Authorization.AuthorizationBuilder.SetDefaultPolicy(Microsoft.AspNetCore.Authorization.AuthorizationPolicy! policy) -> Microsoft.AspNetCore.Authorization.AuthorizationBuilder!
virtual Microsoft.AspNetCore.Authorization.AuthorizationBuilder.SetFallbackPolicy(Microsoft.AspNetCore.Authorization.AuthorizationPolicy? policy) -> Microsoft.AspNetCore.Authorization.AuthorizationBuilder!
virtual Microsoft.AspNetCore.Authorization.AuthorizationBuilder.SetInvokeHandlersAfterFailure(bool invoke) -> Microsoft.AspNetCore.Authorization.AuthorizationBuilder!
virtual Microsoft.AspNetCore.Authorization.DefaultAuthorizationPolicyProvider.CanCachePolicy.get -> bool
virtual Microsoft.AspNetCore.Authorization.DefaultAuthorizationPolicyProvider.AllowsCachingPolicies.get -> bool
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public AuthorizationMiddleware(RequestDelegate next, IAuthorizationPolicyProvide
{
ArgumentNullException.ThrowIfNull(services);

if (_policyProvider.CanCachePolicy)
if (_policyProvider.AllowsCachingPolicies)
{
_policyCache = services.GetService<AuthorizationPolicyCache>();
_canCache = _policyCache != null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ public async Task OnAuthorizationAsync_WillNotCallPolicyProviderWithCache()
.Callback(() => getPolicyCount++);
policyProvider.Setup(p => p.GetFallbackPolicyAsync()).ReturnsAsync(policy)
.Callback(() => getFallbackPolicyCount++);
policyProvider.Setup(p => p.CanCachePolicy).Returns(true);
policyProvider.Setup(p => p.AllowsCachingPolicies).Returns(true);
var next = new TestRequestDelegate();

var endpoint = CreateEndpoint(new AuthorizeAttribute("whatever"));
Expand Down Expand Up @@ -283,7 +283,7 @@ public override Task<AuthorizationPolicy> GetPolicyAsync(string policyName)
return Task.FromResult(new AuthorizationPolicyBuilder().RequireAssertion(_ => true).Build());
}

public override bool CanCachePolicy => _canCache;
public override bool AllowsCachingPolicies => _canCache;
}

[Theory]
Expand Down