add IPostConfigureOptions to support DI for IBasicAuthorizationProvider,

funcmike · Mar 4, 2020 · 8bdb150 · 8bdb150
1 parent 1f5b039
commit 8bdb150
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 18 deletions.
diff --git a/softaware.Authentication.Basic.AspNetCore/BasicAuthenticationExtensions.cs b/softaware.Authentication.Basic.AspNetCore/BasicAuthenticationExtensions.cs
@@ -1,25 +1,26 @@
 using System;
 using Microsoft.AspNetCore.Authentication;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Options;
 using softaware.Authentication.Hmac.AspNetCore;
 
 namespace softaware.Authentication.Basic.AspNetCore
 {
     public static class BasicAuthenticationExtensions
     {
-        public static AuthenticationBuilder AddBasicAuthentication(
-            this AuthenticationBuilder builder,
-            string authenticationScheme,
-            Action<BasicAuthenticationSchemeOptions> configureOptions)
-        {
-            return builder.AddScheme<BasicAuthenticationSchemeOptions, BasicAuthenticationHandler>(authenticationScheme, authenticationScheme, configureOptions);
-        }
+        public static AuthenticationBuilder AddJwtBearer(this AuthenticationBuilder builder)
+            => builder.AddBasicAuthentication(BasicAuthenticationDefaults.AuthenticationScheme, _ => { });
+
+        public static AuthenticationBuilder AddJwtBearer(this AuthenticationBuilder builder, Action<BasicAuthenticationSchemeOptions> configureOptions)
+            => builder.AddBasicAuthentication(BasicAuthenticationDefaults.AuthenticationScheme, configureOptions);
+
+        public static AuthenticationBuilder AddBasicAuthentication(this AuthenticationBuilder builder, string authenticationScheme, Action<BasicAuthenticationSchemeOptions> configureOptions)
+            => builder.AddBasicAuthentication(authenticationScheme, displayName: null, configureOptions);
 
-        public static AuthenticationBuilder AddBasicAuthentication(
-            this AuthenticationBuilder builder,
-            string authenticationScheme,
-            string displayName,
-            Action<BasicAuthenticationSchemeOptions> configureOptions)
+        public static AuthenticationBuilder AddBasicAuthentication(this AuthenticationBuilder builder, string authenticationScheme, string displayName, Action<BasicAuthenticationSchemeOptions> configureOptions)
         {
+            builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<IPostConfigureOptions<BasicAuthenticationSchemeOptions>, BasicAuthenticationPostConfigureOptions>());
             return builder.AddScheme<BasicAuthenticationSchemeOptions, BasicAuthenticationHandler>(authenticationScheme, displayName, configureOptions);
         }
     }

diff --git a/softaware.Authentication.Basic.AspNetCore/BasicAuthenticationHandler.cs b/softaware.Authentication.Basic.AspNetCore/BasicAuthenticationHandler.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Net.Http.Headers;
 using System.Security.Claims;
 using System.Text;
@@ -19,10 +20,9 @@ private class ValidationResult
         {
             public bool Valid { get; set; }
 
-            /// <summary>
-            /// Only valid if <see cref="Valid"/> is true.
-            /// </summary>
             public string Username { get; set; }
+
+            public string Password { get; set; }
         }
 
         public BasicAuthenticationHandler(IOptionsMonitor<BasicAuthenticationSchemeOptions> options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock)
@@ -34,7 +34,7 @@ protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
         {
             if (this.Options.AuthorizationProvider == null)
             {
-                throw new ArgumentException($"{this.Options.AuthorizationProvider} is absolutely necessary.");
+                throw new ArgumentException($"{nameof(this.Options.AuthorizationProvider)} is absolutely necessary.");
             }
 
             if (!this.Request.Headers.TryGetValue("Authorization", out var authorization))
@@ -51,7 +51,15 @@ protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
 
             if (validationResult.Valid)
             {
-                var claimsToSet = new Claim[] { new Claim(ClaimTypes.NameIdentifier, validationResult.Username) };
+                var claimsToSet = new List<Claim> 
+                { 
+                    new Claim(ClaimTypes.NameIdentifier, validationResult.Username) 
+                };
+
+                if (this.Options.AddPasswordAsClaim)
+                {
+                    claimsToSet.Add(new Claim("Password", validationResult.Password));
+                }
 
                 var principal = new ClaimsPrincipal(new ClaimsIdentity(claimsToSet, BasicAuthenticationDefaults.AuthenticationType, ClaimTypes.NameIdentifier, ClaimTypes.Role));
                 var ticket = new AuthenticationTicket(principal, new AuthenticationProperties(), this.Options.AuthenticationScheme);
@@ -80,6 +88,7 @@ private async Task<ValidationResult> ValidateAsync(HttpRequest request)
 
                     result.Valid = await this.Options.AuthorizationProvider.IsAuthorizedAsync(splittedUsernamePassword[0], splittedUsernamePassword[1]);
                     result.Username = splittedUsernamePassword[0];
+                    result.Password = splittedUsernamePassword[1];
                 }
             }
 

diff --git a/softaware.Authentication.Basic.AspNetCore/BasicAuthenticationPostConfigureOptions.cs b/softaware.Authentication.Basic.AspNetCore/BasicAuthenticationPostConfigureOptions.cs
@@ -0,0 +1,23 @@
+using Microsoft.Extensions.Options;
+using softaware.Authentication.Basic.AspNetCore.AuthorizationProvider;
+
+namespace softaware.Authentication.Basic.AspNetCore
+{
+    public class BasicAuthenticationPostConfigureOptions : IPostConfigureOptions<BasicAuthenticationSchemeOptions>
+    {
+        private readonly IBasicAuthorizationProvider basicAuthorizationProvider;
+
+        public BasicAuthenticationPostConfigureOptions(IBasicAuthorizationProvider basicAuthorizationProvider)
+        {
+            this.basicAuthorizationProvider = basicAuthorizationProvider;
+        }
+
+        public void PostConfigure(string name, BasicAuthenticationSchemeOptions options)
+        {
+            if (this.basicAuthorizationProvider != null)
+            {
+                options.AuthorizationProvider = this.basicAuthorizationProvider;
+            }
+        }
+    }
+}
diff --git a/softaware.Authentication.Basic.AspNetCore/BasicAuthenticationSchemeOptions.cs b/softaware.Authentication.Basic.AspNetCore/BasicAuthenticationSchemeOptions.cs
@@ -6,11 +6,24 @@ namespace softaware.Authentication.Basic.AspNetCore
     public class BasicAuthenticationSchemeOptions : AuthenticationSchemeOptions
     {
         public string AuthenticationScheme { get; set; }
+
         public IBasicAuthorizationProvider AuthorizationProvider { get; set; }
 
+        /// <summary>
+        /// Add password as claim after successfull authentication
+        /// Security risks should be weighed up.
+        /// </summary>
+        public bool AddPasswordAsClaim { get; set; }
+
         public BasicAuthenticationSchemeOptions()
         {
             this.AuthenticationScheme = BasicAuthenticationDefaults.AuthenticationScheme;
         }
+
+        public BasicAuthenticationSchemeOptions(IBasicAuthorizationProvider basicAuthorizationProvider)
+        {
+            this.AuthenticationScheme = BasicAuthenticationDefaults.AuthenticationScheme;
+            this.AuthorizationProvider = basicAuthorizationProvider;
+        }
     }
 }
diff --git a/softaware.Authentication.Basic.AspNetCore/softaware.Authentication.Basic.AspNetCore.csproj b/softaware.Authentication.Basic.AspNetCore/softaware.Authentication.Basic.AspNetCore.csproj
@@ -17,7 +17,7 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <PackageReleaseNotes>Support netstandard2.0</PackageReleaseNotes>
+    <PackageReleaseNotes>Add IPostConfigureOptions to support DI for IBasicAuthorizationProvider</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net461'">