Annotate Authorization.Core, Authorization.Policy with nullable (#22990)

pranavkm · web-flow · commit f3b370c1ac98 · 2020-06-18T23:43:35.000Z
Contributes to #5680
diff --git a/eng/targets/CSharp.Common.targets b/eng/targets/CSharp.Common.targets
@@ -35,13 +35,14 @@
         The code block that follows sets it up so projects in this repo that target ns2.0 or netfx can compile when Nullable is configured.
         Based on https://github.com/dotnet/runtime/blob/93b6c449d4f31ddd7d573d1d3769e681d5ebceb9/src/libraries/Directory.Build.targets#L215-L222
      -->
-    <When Condition="'$(Nullable)' != '' AND ('$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFrameworkIdentifier)' == '.NETFramework')">
-        <PropertyGroup>
-          <DefineConstants>$(DefineConstants),INTERNAL_NULLABLE_ATTRIBUTES</DefineConstants>
-        </PropertyGroup>
-        <ItemGroup>
-          <Compile Include="$(SharedSourceRoot)Nullable\NullableAttributes.cs" />
-        </ItemGroup>
+    <When Condition="'$(Nullable)' != '' AND ('$(TargetFrameworkIdentifier)' == '.NETStandard' OR '$(TargetFrameworkIdentifier)' == '.NETFramework')">
+      <PropertyGroup>
+        <DefineConstants>$(DefineConstants),INTERNAL_NULLABLE_ATTRIBUTES</DefineConstants>
+        <NoWarn>$(NoWarn);nullable</NoWarn>
+      </PropertyGroup>
+      <ItemGroup>
+        <Compile Include="$(SharedSourceRoot)Nullable\NullableAttributes.cs" />
+      </ItemGroup>
     </When>
   </Choose>
 
diff --git a/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.csproj b/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <Nullable>annotations</Nullable>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <Compile Include="Microsoft.AspNetCore.Authorization.netstandard2.0.cs" />
diff --git a/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.netcoreapp.cs b/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.netcoreapp.cs
diff --git a/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.netstandard2.0.cs b/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.netstandard2.0.cs
diff --git a/src/Security/Authorization/Core/src/AuthorizationFailure.cs b/src/Security/Authorization/Core/src/AuthorizationFailure.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Collections.Generic;
 using System.Security.Claims;
 
@@ -21,7 +22,7 @@ private AuthorizationFailure() { }
         /// <summary>
         /// Failure was due to these requirements not being met via <see cref="AuthorizationHandlerContext.Succeed(IAuthorizationRequirement)"/>.
         /// </summary>
-        public IEnumerable<IAuthorizationRequirement> FailedRequirements { get; private set; }
+        public IEnumerable<IAuthorizationRequirement> FailedRequirements { get; private set; } = Array.Empty<IAuthorizationRequirement>();
 
         /// <summary>
         /// Return a failure due to <see cref="AuthorizationHandlerContext.Fail"/> being called.
@@ -31,7 +32,6 @@ public static AuthorizationFailure ExplicitFail()
             => new AuthorizationFailure
             {
                 FailCalled = true,
-                FailedRequirements = new IAuthorizationRequirement[0]
             };
 
         /// <summary>
diff --git a/src/Security/Authorization/Core/src/AuthorizationHandlerContext.cs b/src/Security/Authorization/Core/src/AuthorizationHandlerContext.cs
@@ -26,7 +26,7 @@ public class AuthorizationHandlerContext
         public AuthorizationHandlerContext(
             IEnumerable<IAuthorizationRequirement> requirements,
             ClaimsPrincipal user,
-            object resource)
+            object? resource)
         {
             if (requirements == null)
             {
@@ -52,7 +52,7 @@ public AuthorizationHandlerContext(
         /// <summary>
         /// The optional resource to evaluate the <see cref="AuthorizationHandlerContext.Requirements"/> against.
         /// </summary>
-        public virtual object Resource { get; }
+        public virtual object? Resource { get; }
 
         /// <summary>
         /// Gets the requirements that have not yet been marked as succeeded.
@@ -95,4 +95,4 @@ public virtual void Succeed(IAuthorizationRequirement requirement)
             _pendingRequirements.Remove(requirement);
         }
     }
-}
+}
diff --git a/src/Security/Authorization/Core/src/AuthorizationOptions.cs b/src/Security/Authorization/Core/src/AuthorizationOptions.cs
@@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Authorization
     /// </summary>
     public class AuthorizationOptions
     {
-        private IDictionary<string, AuthorizationPolicy> PolicyMap { get; } = new Dictionary<string, AuthorizationPolicy>(StringComparer.OrdinalIgnoreCase);
+        private Dictionary<string, AuthorizationPolicy> PolicyMap { get; } = new Dictionary<string, AuthorizationPolicy>(StringComparer.OrdinalIgnoreCase);
 
         /// <summary>
         /// Determines whether authentication handlers should be invoked after a failure.
@@ -35,7 +35,7 @@ public class AuthorizationOptions
         /// effect unless you have the AuthorizationMiddleware in your pipeline. It is not used in any way by the 
         /// default <see cref="IAuthorizationService"/>.
         /// </summary>
-        public AuthorizationPolicy FallbackPolicy { get; set; }
+        public AuthorizationPolicy? FallbackPolicy { get; set; }
 
         /// <summary>
         /// Add an authorization policy with the provided name.
@@ -84,14 +84,19 @@ public void AddPolicy(string name, Action<AuthorizationPolicyBuilder> configureP
         /// </summary>
         /// <param name="name">The name of the policy to return.</param>
         /// <returns>The policy for the specified name, or null if a policy with the name does not exist.</returns>
-        public AuthorizationPolicy GetPolicy(string name)
+        public AuthorizationPolicy? GetPolicy(string name)
         {
             if (name == null)
             {
                 throw new ArgumentNullException(nameof(name));
             }
 
-            return PolicyMap.ContainsKey(name) ? PolicyMap[name] : null;
+            if (PolicyMap.TryGetValue(name, out var value))
+            {
+                return value;
+            }
+
+            return null;
         }
     }
 }
diff --git a/src/Security/Authorization/Core/src/AuthorizationPolicy.cs b/src/Security/Authorization/Core/src/AuthorizationPolicy.cs
@@ -108,7 +108,7 @@ public static AuthorizationPolicy Combine(IEnumerable<AuthorizationPolicy> polic
         /// A new <see cref="AuthorizationPolicy"/> which represents the combination of the
         /// authorization policies provided by the specified <paramref name="policyProvider"/>.
         /// </returns>
-        public static async Task<AuthorizationPolicy> CombineAsync(IAuthorizationPolicyProvider policyProvider, IEnumerable<IAuthorizeData> authorizeData)
+        public static async Task<AuthorizationPolicy?> CombineAsync(IAuthorizationPolicyProvider policyProvider, IEnumerable<IAuthorizeData> authorizeData)
         {
             if (policyProvider == null)
             {
@@ -127,7 +127,7 @@ public static async Task<AuthorizationPolicy> CombineAsync(IAuthorizationPolicyP
                 skipEnumeratingData = dataList.Count == 0;
             }
 
-            AuthorizationPolicyBuilder policyBuilder = null;
+            AuthorizationPolicyBuilder? policyBuilder = null;
             if (!skipEnumeratingData)
             {
                 foreach (var authorizeDatum in authorizeData)
diff --git a/src/Security/Authorization/Core/src/AuthorizationResult.cs b/src/Security/Authorization/Core/src/AuthorizationResult.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Security.Claims;
 
 namespace Microsoft.AspNetCore.Authorization
@@ -21,7 +22,7 @@ private AuthorizationResult() { }
         /// <summary>
         /// Contains information about why authorization failed.
         /// </summary>
-        public AuthorizationFailure Failure { get; private set; }
+        public AuthorizationFailure? Failure { get; private set; }
 
         /// <summary>
         /// Returns a successful result.
diff --git a/src/Security/Authorization/Core/src/AuthorizationServiceCollectionExtensions.cs b/src/Security/Authorization/Core/src/AuthorizationServiceCollectionExtensions.cs
@@ -51,11 +51,7 @@ public static IServiceCollection AddAuthorizationCore(this IServiceCollection se
                 throw new ArgumentNullException(nameof(services));
             }
 
-            if (configure != null)
-            {
-                services.Configure(configure);
-            }
-
+            services.Configure(configure);
             return services.AddAuthorizationCore();
         }
     }
diff --git a/src/Security/Authorization/Core/src/AuthorizationServiceExtensions.cs b/src/Security/Authorization/Core/src/AuthorizationServiceExtensions.cs
@@ -50,7 +50,7 @@ public static Task<AuthorizationResult> AuthorizeAsync(this IAuthorizationServic
         /// A flag indicating whether policy evaluation has succeeded or failed.
         /// This value is <value>true</value> when the user fulfills the policy, otherwise <value>false</value>.
         /// </returns>
-        public static Task<AuthorizationResult> AuthorizeAsync(this IAuthorizationService service, ClaimsPrincipal user, object resource, AuthorizationPolicy policy)
+        public static Task<AuthorizationResult> AuthorizeAsync(this IAuthorizationService service, ClaimsPrincipal user, object? resource, AuthorizationPolicy policy)
         {
             if (service == null)
             {
@@ -115,4 +115,4 @@ public static Task<AuthorizationResult> AuthorizeAsync(this IAuthorizationServic
             return service.AuthorizeAsync(user, resource: null, policyName: policyName);
         }
     }
-}
+}
diff --git a/src/Security/Authorization/Core/src/AuthorizeAttribute.cs b/src/Security/Authorization/Core/src/AuthorizeAttribute.cs
@@ -28,16 +28,16 @@ public AuthorizeAttribute(string policy)
         /// <summary>
         /// Gets or sets the policy name that determines access to the resource.
         /// </summary>
-        public string Policy { get; set; }
+        public string? Policy { get; set; }
 
         /// <summary>
         /// Gets or sets a comma delimited list of roles that are allowed to access the resource.
         /// </summary>
-        public string Roles { get; set; }
+        public string? Roles { get; set; }
 
         /// <summary>
         /// Gets or sets a comma delimited list of schemes from which user information is constructed.
         /// </summary>
-        public string AuthenticationSchemes { get; set; }
+        public string? AuthenticationSchemes { get; set; }
     }
 }
diff --git a/src/Security/Authorization/Core/src/ClaimsAuthorizationRequirement.cs b/src/Security/Authorization/Core/src/ClaimsAuthorizationRequirement.cs
@@ -22,7 +22,7 @@ public class ClaimsAuthorizationRequirement : AuthorizationHandler<ClaimsAuthori
         /// <param name="claimType">The claim type that must be present.</param>
         /// <param name="allowedValues">The optional list of claim values, which, if present, 
         /// the claim must match.</param>
-        public ClaimsAuthorizationRequirement(string claimType, IEnumerable<string> allowedValues)
+        public ClaimsAuthorizationRequirement(string claimType, IEnumerable<string>? allowedValues)
         {
             if (claimType == null)
             {
@@ -42,7 +42,7 @@ public ClaimsAuthorizationRequirement(string claimType, IEnumerable<string> allo
         /// Gets the optional list of claim values, which, if present, 
         /// the claim must match.
         /// </summary>
-        public IEnumerable<string> AllowedValues { get; }
+        public IEnumerable<string>? AllowedValues { get; }
 
         /// <summary>
         /// Makes a decision if authorization is allowed based on the claims requirements specified.
diff --git a/src/Security/Authorization/Core/src/DefaultAuthorizationHandlerContextFactory.cs b/src/Security/Authorization/Core/src/DefaultAuthorizationHandlerContextFactory.cs
@@ -21,7 +21,7 @@ public class DefaultAuthorizationHandlerContextFactory : IAuthorizationHandlerCo
         /// If a resource is not required for policy evaluation you may pass null as the value.
         /// </param>
         /// <returns>The <see cref="AuthorizationHandlerContext"/>.</returns>
-        public virtual AuthorizationHandlerContext CreateContext(IEnumerable<IAuthorizationRequirement> requirements, ClaimsPrincipal user, object resource)
+        public virtual AuthorizationHandlerContext CreateContext(IEnumerable<IAuthorizationRequirement> requirements, ClaimsPrincipal user, object? resource)
         {
             return new AuthorizationHandlerContext(requirements, user, resource);
         }
diff --git a/src/Security/Authorization/Core/src/DefaultAuthorizationPolicyProvider.cs b/src/Security/Authorization/Core/src/DefaultAuthorizationPolicyProvider.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Options;
 
@@ -14,8 +15,8 @@ namespace Microsoft.AspNetCore.Authorization
     public class DefaultAuthorizationPolicyProvider : IAuthorizationPolicyProvider
     {
         private readonly AuthorizationOptions _options;
-        private Task<AuthorizationPolicy> _cachedDefaultPolicy;
-        private Task<AuthorizationPolicy> _cachedFallbackPolicy;
+        private Task<AuthorizationPolicy>? _cachedDefaultPolicy;
+        private Task<AuthorizationPolicy?>? _cachedFallbackPolicy;
 
         /// <summary>
         /// Creates a new instance of <see cref="DefaultAuthorizationPolicyProvider"/>.
@@ -37,34 +38,34 @@ public DefaultAuthorizationPolicyProvider(IOptions<AuthorizationOptions> options
         /// <returns>The default authorization policy.</returns>
         public Task<AuthorizationPolicy> GetDefaultPolicyAsync()
         {
-            return GetCachedPolicy(ref _cachedDefaultPolicy, _options.DefaultPolicy);
+            if (_cachedDefaultPolicy == null || _cachedDefaultPolicy.Result != _options.DefaultPolicy)
+            {
+                _cachedDefaultPolicy = Task.FromResult(_options.DefaultPolicy);
+            }
+
+            return _cachedDefaultPolicy;
         }
 
         /// <summary>
         /// Gets the fallback authorization policy.
         /// </summary>
         /// <returns>The fallback authorization policy.</returns>
-        public Task<AuthorizationPolicy> GetFallbackPolicyAsync()
+        public Task<AuthorizationPolicy?> GetFallbackPolicyAsync()
         {
-            return GetCachedPolicy(ref _cachedFallbackPolicy, _options.FallbackPolicy);
-        }
-
-        private Task<AuthorizationPolicy> GetCachedPolicy(ref Task<AuthorizationPolicy> cachedPolicy, AuthorizationPolicy currentPolicy)
-        {
-            var local = cachedPolicy;
-            if (local == null || local.Result != currentPolicy)
+            if (_cachedFallbackPolicy == null || _cachedFallbackPolicy.Result != _options.FallbackPolicy)
             {
-                cachedPolicy = local = Task.FromResult(currentPolicy);
+                _cachedFallbackPolicy = Task.FromResult(_options.FallbackPolicy);
             }
-            return local;
+
+            return _cachedFallbackPolicy;
         }
 
         /// <summary>
         /// Gets a <see cref="AuthorizationPolicy"/> from the given <paramref name="policyName"/>
         /// </summary>
         /// <param name="policyName">The policy name to retrieve.</param>
         /// <returns>The named <see cref="AuthorizationPolicy"/>.</returns>
-        public virtual Task<AuthorizationPolicy> GetPolicyAsync(string policyName)
+        public virtual Task<AuthorizationPolicy?> GetPolicyAsync(string policyName)
         {
             // MVC caches policies specifically for this class, so this method MUST return the same policy per
             // policyName for every request or it could allow undesired access. It also must return synchronously.
diff --git a/src/Security/Authorization/Core/src/DefaultAuthorizationService.cs b/src/Security/Authorization/Core/src/DefaultAuthorizationService.cs
@@ -77,7 +77,7 @@ public DefaultAuthorizationService(IAuthorizationPolicyProvider policyProvider,
         /// A flag indicating whether authorization has succeeded.
         /// This value is <value>true</value> when the user fulfills the policy otherwise <value>false</value>.
         /// </returns>
-        public async Task<AuthorizationResult> AuthorizeAsync(ClaimsPrincipal user, object resource, IEnumerable<IAuthorizationRequirement> requirements)
+        public async Task<AuthorizationResult> AuthorizeAsync(ClaimsPrincipal user, object? resource, IEnumerable<IAuthorizationRequirement> requirements)
         {
             if (requirements == null)
             {
@@ -102,7 +102,7 @@ public async Task<AuthorizationResult> AuthorizeAsync(ClaimsPrincipal user, obje
             }
             else
             {
-                _logger.UserAuthorizationFailed(result.Failure);
+                _logger.UserAuthorizationFailed(result.Failure!);
             }
             return result;
         }
@@ -117,7 +117,7 @@ public async Task<AuthorizationResult> AuthorizeAsync(ClaimsPrincipal user, obje
         /// A flag indicating whether authorization has succeeded.
         /// This value is <value>true</value> when the user fulfills the policy otherwise <value>false</value>.
         /// </returns>
-        public async Task<AuthorizationResult> AuthorizeAsync(ClaimsPrincipal user, object resource, string policyName)
+        public async Task<AuthorizationResult> AuthorizeAsync(ClaimsPrincipal user, object? resource, string policyName)
         {
             if (policyName == null)
             {
diff --git a/src/Security/Authorization/Core/src/IAuthorizationHandlerContextFactory.cs b/src/Security/Authorization/Core/src/IAuthorizationHandlerContextFactory.cs
@@ -21,6 +21,6 @@ public interface IAuthorizationHandlerContextFactory
         /// If a resource is not required for policy evaluation you may pass null as the value.
         /// </param>
         /// <returns>The <see cref="AuthorizationHandlerContext"/>.</returns>
-        AuthorizationHandlerContext CreateContext(IEnumerable<IAuthorizationRequirement> requirements, ClaimsPrincipal user, object resource);
+        AuthorizationHandlerContext CreateContext(IEnumerable<IAuthorizationRequirement> requirements, ClaimsPrincipal user, object? resource);
     }
 }
diff --git a/src/Security/Authorization/Core/src/IAuthorizationPolicyProvider.cs b/src/Security/Authorization/Core/src/IAuthorizationPolicyProvider.cs
@@ -15,7 +15,7 @@ public interface IAuthorizationPolicyProvider
         /// </summary>
         /// <param name="policyName">The policy name to retrieve.</param>
         /// <returns>The named <see cref="AuthorizationPolicy"/>.</returns>
-        Task<AuthorizationPolicy> GetPolicyAsync(string policyName);
+        Task<AuthorizationPolicy?> GetPolicyAsync(string policyName);
 
         /// <summary>
         /// Gets the default authorization policy.
@@ -27,6 +27,6 @@ public interface IAuthorizationPolicyProvider
         /// Gets the fallback authorization policy.
         /// </summary>
         /// <returns>The fallback authorization policy.</returns>
-        Task<AuthorizationPolicy> GetFallbackPolicyAsync();
+        Task<AuthorizationPolicy?> GetFallbackPolicyAsync();
     }
 }
diff --git a/src/Security/Authorization/Core/src/IAuthorizationService.cs b/src/Security/Authorization/Core/src/IAuthorizationService.cs
@@ -29,7 +29,7 @@ public interface IAuthorizationService
         /// Resource is an optional parameter and may be null. Please ensure that you check it is not 
         /// null before acting upon it.
         /// </remarks>
-        Task<AuthorizationResult> AuthorizeAsync(ClaimsPrincipal user, object resource, IEnumerable<IAuthorizationRequirement> requirements);
+        Task<AuthorizationResult> AuthorizeAsync(ClaimsPrincipal user, object? resource, IEnumerable<IAuthorizationRequirement> requirements);
 
         /// <summary>
         /// Checks if a user meets a specific authorization policy
@@ -49,6 +49,6 @@ public interface IAuthorizationService
         /// Resource is an optional parameter and may be null. Please ensure that you check it is not 
         /// null before acting upon it.
         /// </remarks>
-        Task<AuthorizationResult> AuthorizeAsync(ClaimsPrincipal user, object resource, string policyName);
+        Task<AuthorizationResult> AuthorizeAsync(ClaimsPrincipal user, object? resource, string policyName);
     }
-}
+}
diff --git a/src/Security/Authorization/Core/src/LoggingExtensions.cs b/src/Security/Authorization/Core/src/LoggingExtensions.cs
@@ -8,8 +8,8 @@ namespace Microsoft.Extensions.Logging
 {
     internal static class LoggingExtensions
     {
-        private static Action<ILogger, string, Exception> _userAuthorizationFailed;
-        private static Action<ILogger, Exception> _userAuthorizationSucceeded;
+        private static Action<ILogger, string, Exception?> _userAuthorizationFailed;
+        private static Action<ILogger, Exception?> _userAuthorizationSucceeded;
 
         static LoggingExtensions()
         {
diff --git a/src/Security/Authorization/Core/src/Microsoft.AspNetCore.Authorization.csproj b/src/Security/Authorization/Core/src/Microsoft.AspNetCore.Authorization.csproj
@@ -11,6 +11,7 @@ Microsoft.AspNetCore.Authorization.AuthorizeAttribute</Description>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;authorization</PackageTags>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Security/Authorization/Core/src/OperationAuthorizationRequirement.cs b/src/Security/Authorization/Core/src/OperationAuthorizationRequirement.cs
@@ -12,7 +12,7 @@ public class OperationAuthorizationRequirement : IAuthorizationRequirement
         /// <summary>
         /// The name of this instance of <see cref="IAuthorizationRequirement"/>.
         /// </summary>
-        public string Name { get; set; }
+        public string Name { get; set; } = default!;
 
         public override string ToString()
         {
diff --git a/src/Security/Authorization/Policy/ref/Microsoft.AspNetCore.Authorization.Policy.csproj b/src/Security/Authorization/Policy/ref/Microsoft.AspNetCore.Authorization.Policy.csproj
diff --git a/src/Security/Authorization/Policy/ref/Microsoft.AspNetCore.Authorization.Policy.netcoreapp.cs b/src/Security/Authorization/Policy/ref/Microsoft.AspNetCore.Authorization.Policy.netcoreapp.cs
diff --git a/src/Security/Authorization/Policy/src/IPolicyEvaluator.cs b/src/Security/Authorization/Policy/src/IPolicyEvaluator.cs
diff --git a/src/Security/Authorization/Policy/src/Microsoft.AspNetCore.Authorization.Policy.csproj b/src/Security/Authorization/Policy/src/Microsoft.AspNetCore.Authorization.Policy.csproj
diff --git a/src/Security/Authorization/Policy/src/PolicyAuthorizationResult.cs b/src/Security/Authorization/Policy/src/PolicyAuthorizationResult.cs
diff --git a/src/Security/Authorization/Policy/src/PolicyEvaluator.cs b/src/Security/Authorization/Policy/src/PolicyEvaluator.cs
diff --git a/src/Security/Authorization/Policy/src/PolicyServiceCollectionExtensions.cs b/src/Security/Authorization/Policy/src/PolicyServiceCollectionExtensions.cs
diff --git a/src/Shared/SecurityHelper/SecurityHelper.cs b/src/Shared/SecurityHelper/SecurityHelper.cs

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public class AuthorizationHandlerContext`
`26`	`26`	`public AuthorizationHandlerContext(`
`27`	`27`	`IEnumerable<IAuthorizationRequirement> requirements,`
`28`	`28`	`ClaimsPrincipal user,`
`29`		`- object resource)`
	`29`	`+ object? resource)`
`30`	`30`	`{`
`31`	`31`	`if (requirements == null)`
`32`	`32`	`{`
`@@ -52,7 +52,7 @@ public AuthorizationHandlerContext(`
`52`	`52`	`/// <summary>`
`53`	`53`	`/// The optional resource to evaluate the <see cref="AuthorizationHandlerContext.Requirements"/> against.`
`54`	`54`	`/// </summary>`
`55`		`- public virtual object Resource { get; }`
	`55`	`+ public virtual object? Resource { get; }`
`56`	`56`
`57`	`57`	`/// <summary>`
`58`	`58`	`/// Gets the requirements that have not yet been marked as succeeded.`
`@@ -95,4 +95,4 @@ public virtual void Succeed(IAuthorizationRequirement requirement)`
`95`	`95`	`_pendingRequirements.Remove(requirement);`
`96`	`96`	`}`
`97`	`97`	`}`
`98`		`-}`
	`98`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Authorization`
`11`	`11`	`/// </summary>`
`12`	`12`	`public class AuthorizationOptions`
`13`	`13`	`{`
`14`		`- private IDictionary<string, AuthorizationPolicy> PolicyMap { get; } = new Dictionary<string, AuthorizationPolicy>(StringComparer.OrdinalIgnoreCase);`
	`14`	`+ private Dictionary<string, AuthorizationPolicy> PolicyMap { get; } = new Dictionary<string, AuthorizationPolicy>(StringComparer.OrdinalIgnoreCase);`
`15`	`15`
`16`	`16`	`/// <summary>`
`17`	`17`	`/// Determines whether authentication handlers should be invoked after a failure.`
`@@ -35,7 +35,7 @@ public class AuthorizationOptions`
`35`	`35`	`/// effect unless you have the AuthorizationMiddleware in your pipeline. It is not used in any way by the`
`36`	`36`	`/// default <see cref="IAuthorizationService"/>.`
`37`	`37`	`/// </summary>`
`38`		`- public AuthorizationPolicy FallbackPolicy { get; set; }`
	`38`	`+ public AuthorizationPolicy? FallbackPolicy { get; set; }`
`39`	`39`
`40`	`40`	`/// <summary>`
`41`	`41`	`/// Add an authorization policy with the provided name.`
`@@ -84,14 +84,19 @@ public void AddPolicy(string name, Action<AuthorizationPolicyBuilder> configureP`
`84`	`84`	`/// </summary>`
`85`	`85`	`/// <param name="name">The name of the policy to return.</param>`
`86`	`86`	`/// <returns>The policy for the specified name, or null if a policy with the name does not exist.</returns>`
`87`		`- public AuthorizationPolicy GetPolicy(string name)`
	`87`	`+ public AuthorizationPolicy? GetPolicy(string name)`
`88`	`88`	`{`
`89`	`89`	`if (name == null)`
`90`	`90`	`{`
`91`	`91`	`throw new ArgumentNullException(nameof(name));`
`92`	`92`	`}`
`93`	`93`
`94`		`- return PolicyMap.ContainsKey(name) ? PolicyMap[name] : null;`
	`94`	`+ if (PolicyMap.TryGetValue(name, out var value))`
	`95`	`+ {`
	`96`	`+ return value;`
	`97`	`+ }`
	`98`	`+`
	`99`	`+ return null;`
`95`	`100`	`}`
`96`	`101`	`}`
`97`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public static AuthorizationPolicy Combine(IEnumerable<AuthorizationPolicy> polic`
`108`	`108`	`/// A new <see cref="AuthorizationPolicy"/> which represents the combination of the`
`109`	`109`	`/// authorization policies provided by the specified <paramref name="policyProvider"/>.`
`110`	`110`	`/// </returns>`
`111`		`- public static async Task<AuthorizationPolicy> CombineAsync(IAuthorizationPolicyProvider policyProvider, IEnumerable<IAuthorizeData> authorizeData)`
	`111`	`+ public static async Task<AuthorizationPolicy?> CombineAsync(IAuthorizationPolicyProvider policyProvider, IEnumerable<IAuthorizeData> authorizeData)`
`112`	`112`	`{`
`113`	`113`	`if (policyProvider == null)`
`114`	`114`	`{`
`@@ -127,7 +127,7 @@ public static async Task<AuthorizationPolicy> CombineAsync(IAuthorizationPolicyP`
`127`	`127`	`skipEnumeratingData = dataList.Count == 0;`
`128`	`128`	`}`
`129`	`129`
`130`		`- AuthorizationPolicyBuilder policyBuilder = null;`
	`130`	`+ AuthorizationPolicyBuilder? policyBuilder = null;`
`131`	`131`	`if (!skipEnumeratingData)`
`132`	`132`	`{`
`133`	`133`	`foreach (var authorizeDatum in authorizeData)`
Original file line number	Diff line number	Diff line change
`@@ -51,11 +51,7 @@ public static IServiceCollection AddAuthorizationCore(this IServiceCollection se`
`51`	`51`	`throw new ArgumentNullException(nameof(services));`
`52`	`52`	`}`
`53`	`53`
`54`		`- if (configure != null)`
`55`		`- {`
`56`		`- services.Configure(configure);`
`57`		`- }`
`58`		`-`
	`54`	`+ services.Configure(configure);`
`59`	`55`	`return services.AddAuthorizationCore();`
`60`	`56`	`}`
`61`	`57`	`}`