feat: .net 6

brunobritodev · brunobritodev · commit 386210183526 · 2022-04-18T06:26:38.000-03:00
diff --git a/samples/NetDevPack.Security.JwtExtensions.ApiAuthenticator/NetDevPack.Security.JwtExtensions.ApiAuthenticator.csproj b/samples/NetDevPack.Security.JwtExtensions.ApiAuthenticator/NetDevPack.Security.JwtExtensions.ApiAuthenticator.csproj
@@ -6,11 +6,20 @@
 
 
   <ItemGroup>
-    <PackageReference Include="Bogus" Version="33.0.2" />
-    <PackageReference Include="NetDevPack.Security.JwtSigningCredentials.AspNetCore" Version="5.0.6" />
-    <PackageReference Include="NetDevPack.Security.JwtSigningCredentials.Store.FileSystem" Version="5.0.6" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.11.0" />
+    <PackageReference Include="Bogus" Version="34.0.2" />
+    <PackageReference Include="NetDevPack.Security.Jwt.AspNetCore" Version="6.0.5" />
+    <PackageReference Include="NetDevPack.Security.Jwt.Core" Version="6.0.5" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.17.0" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.24" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.16" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.4" />
+  </ItemGroup>
 
 </Project>
diff --git a/samples/NetDevPack.Security.JwtExtensions.ApiAuthenticator/Services/DummyAuthenticationService.cs b/samples/NetDevPack.Security.JwtExtensions.ApiAuthenticator/Services/DummyAuthenticationService.cs
@@ -1,22 +1,23 @@
-﻿using Bogus;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Configuration;
-using Microsoft.IdentityModel.Tokens;
-using NetDevPack.Security.JwtSigningCredentials.Interfaces;
-using System;
+﻿using System;
 using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
 using System.Threading.Tasks;
+using ApiAuthenticator.Services;
+using Bogus;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Configuration;
+using Microsoft.IdentityModel.Tokens;
+using NetDevPack.Security.Jwt.Core.Interfaces;
 
-namespace ApiAuthenticator.Services
+namespace NetDevPack.Security.JwtExtensions.ApiAuthenticator.Services
 {
     public class AuthenticationService : IAuthenticationService
     {
         private readonly IConfiguration _configuration;
-        private readonly IJsonWebKeySetService _jsonWebKeySetService;
+        private readonly IJwtService _jsonWebKeySetService;
         private readonly IHttpContextAccessor _httpContextAccessor;
 
-        public AuthenticationService(IConfiguration configuration, IJsonWebKeySetService jsonWebKeySetService, IHttpContextAccessor httpContextAccessor)
+        public AuthenticationService(IConfiguration configuration, IJwtService jsonWebKeySetService, IHttpContextAccessor httpContextAccessor)
         {
             _configuration = configuration;
             _jsonWebKeySetService = jsonWebKeySetService;
@@ -28,7 +29,7 @@ public async ValueTask<object> GenerateToken()
 
             var faker = new Faker();
             var tokenHandler = new JwtSecurityTokenHandler();
-            var key = _jsonWebKeySetService.GetCurrent();
+            var key = await _jsonWebKeySetService.GetCurrentSigningCredentials();
 
             var tokenDescriptor = new SecurityTokenDescriptor
             {
diff --git a/samples/NetDevPack.Security.JwtExtensions.ApiAuthenticator/Startup.cs b/samples/NetDevPack.Security.JwtExtensions.ApiAuthenticator/Startup.cs
@@ -3,7 +3,6 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using NetDevPack.Security.JwtSigningCredentials.AspNetCore;
 using System.IO;
 
 namespace ApiAuthenticator
@@ -25,7 +24,7 @@ public void ConfigureServices(IServiceCollection services)
         {
             services.AddControllers();
             services.AddHttpContextAccessor();
-            services.AddJwksManager().PersistKeysToFileSystem(new DirectoryInfo(_env.ContentRootPath));
+            services.AddJwksManager().PersistKeysInMemory();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
diff --git a/samples/NetDevPack.Security.JwtExtensions.ApiClient/NetDevPack.Security.JwtExtensions.ApiClient.csproj b/samples/NetDevPack.Security.JwtExtensions.ApiClient/NetDevPack.Security.JwtExtensions.ApiClient.csproj
@@ -13,13 +13,13 @@
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.15" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.24" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.11" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.16" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0-rc.2.21480.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.4" />
   </ItemGroup>
 
 </Project>
diff --git a/src/NetDevPack.Security.JwtExtensions/JwkOptions.cs b/src/NetDevPack.Security.JwtExtensions/JwkOptions.cs
@@ -4,29 +4,16 @@ namespace NetDevPack.Security.JwtExtensions
 {
     public class JwkOptions
     {
-        public JwkOptions(string jwksUri)
+        public JwkOptions(string jwksUri, string issuer = null, TimeSpan? cacheTime = null, string audience = null)
         {
             JwksUri = new Uri(jwksUri);
-            Issuer = $"{JwksUri.Scheme}://{JwksUri.Authority}";
-            KeepFor = TimeSpan.FromMinutes(15);
+            Issuer = issuer ??  $"{JwksUri.Scheme}://{JwksUri.Authority}";
+            KeepFor = cacheTime ?? TimeSpan.FromMinutes(15);
+            Audience = audience;
         }
-
-        public JwkOptions(string jwksUri, TimeSpan cacheTime)
-        {
-            JwksUri = new Uri(jwksUri);
-            Issuer = $"{JwksUri.Scheme}://{JwksUri.Authority}";
-            KeepFor = cacheTime;
-        }
-
-        public JwkOptions(string jwksUri, string issuer, TimeSpan cacheTime)
-        {
-            JwksUri = new Uri(jwksUri);
-            Issuer = issuer;
-            KeepFor = cacheTime;
-        }
-        public string Issuer { get; private set; }
-        public Uri JwksUri { get; private set; }
-        public TimeSpan KeepFor { get; private set; }
-
+        public string Issuer { get; }
+        public Uri JwksUri { get; }
+        public TimeSpan KeepFor { get; }
+        public string Audience { get; }
     }
 }
diff --git a/src/NetDevPack.Security.JwtExtensions/JwksExtension.cs b/src/NetDevPack.Security.JwtExtensions/JwksExtension.cs
@@ -21,8 +21,15 @@ public static void SetJwksOptions(this JwtBearerOptions options, JwkOptions jwkO
                 jwkOptions.JwksUri.OriginalString,
                 new JwksRetriever(),
                 new HttpDocumentRetriever(httpClient) { RequireHttps = options.RequireHttpsMetadata });
+
             options.TokenValidationParameters.ValidateAudience = false;
             options.TokenValidationParameters.ValidIssuer = jwkOptions.Issuer;
+
+            if (!string.IsNullOrEmpty(jwkOptions.Audience))
+            {
+                options.TokenValidationParameters.ValidateAudience = true;
+                options.TokenValidationParameters.ValidAudience = jwkOptions.Audience;
+            }
         }
     }
 }
diff --git a/src/NetDevPack.Security.JwtExtensions/JwksRetriever.cs b/src/NetDevPack.Security.JwtExtensions/JwksRetriever.cs
@@ -1,4 +1,5 @@
-﻿using System.Threading;
+﻿using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.IdentityModel.Logging;
 using Microsoft.IdentityModel.Protocols;
@@ -29,7 +30,8 @@ public static async Task<OpenIdConnectConfiguration> GetAsync(string address, ID
             if (retriever == null)
                 throw LogHelper.LogArgumentNullException(nameof(retriever));
 
-            var doc = await retriever.GetDocumentAsync(address, cancel).ConfigureAwait(false);
+            IdentityModelEventSource.ShowPII = true;
+            var doc = await retriever.GetDocumentAsync(address, cancel);
             LogHelper.LogVerbose("IDX21811: Deserializing the string: '{0}' obtained from metadata endpoint into openIdConnectConfiguration object.", doc);
             var jwks = new JsonWebKeySet(doc);
             var openIdConnectConfiguration = new OpenIdConnectConfiguration()
diff --git a/src/NetDevPack.Security.JwtExtensions/NetDevPack.Security.JwtExtensions.csproj b/src/NetDevPack.Security.JwtExtensions/NetDevPack.Security.JwtExtensions.csproj
@@ -15,23 +15,20 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.13.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.17.0" />
+    <PackageReference Include="System.Text.Json" Version="6.0.3" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="System.Text.Json" Version="5.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.2.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-    <PackageReference Include="System.Text.Json" Version="5.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.15" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.24" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
-    <PackageReference Include="System.Text.Json" Version="5.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.11" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.16" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="System.Text.Json" Version="6.0.0-rc.2.21480.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0-rc.2.21480.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.4" />
   </ItemGroup>
 </Project>
diff --git a/tests/NetDevPack.Security.JwtExtensions.ApiTests/NetDevPack.Security.JwtExtensions.ApiTests.csproj b/tests/NetDevPack.Security.JwtExtensions.ApiTests/NetDevPack.Security.JwtExtensions.ApiTests.csproj
@@ -13,12 +13,12 @@
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.15" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.24" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.11" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.16" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0-rc.2.21480.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.4" />
   </ItemGroup>
 </Project>
diff --git a/tests/NetDevPack.Security.JwtExtensions.ApiTests/Startup.cs b/tests/NetDevPack.Security.JwtExtensions.ApiTests/Startup.cs
@@ -25,7 +25,7 @@ public void ConfigureServices(IServiceCollection services)
                 .AddJwtBearer(options =>
                {
                    options.IncludeErrorDetails = true; // <- great for debugging
-                   options.SetJwksOptions(new JwkOptions("https://localhost:5001/jwks"));
+                   options.SetJwksOptions(new JwkOptions("https://localhost:5001/jwks", audience: "jwt-test"));
                });
         }
 
diff --git a/tests/NetDevPack.Security.JwtExtensions.Tests/Infra/AuthMiddleware.cs b/tests/NetDevPack.Security.JwtExtensions.Tests/Infra/AuthMiddleware.cs
@@ -1,13 +1,11 @@
 ﻿using Bogus;
-using Jwks.Manager;
-using Jwks.Manager.Interfaces;
 using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Tokens;
 using System;
 using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
 using System.Threading.Tasks;
+using NetDevPack.Security.Jwt.Core.Interfaces;
 
 namespace NetDevPack.Security.JwtExtensions.Tests.Infra
 {
@@ -20,7 +18,7 @@ public AuthMiddleware(RequestDelegate next)
             _next = next;
         }
 
-        public async Task Invoke(HttpContext httpContext, IJsonWebKeySetService keyService, IOptions<JwksOptions> options)
+        public async Task Invoke(HttpContext httpContext, IJwtService keyService)
         {
             if (!string.IsNullOrEmpty(_jws))
             {
@@ -30,7 +28,7 @@ public async Task Invoke(HttpContext httpContext, IJsonWebKeySetService keyServi
 
             var faker = new Faker();
             var tokenHandler = new JwtSecurityTokenHandler();
-            var key = keyService.GetCurrent();
+            var creds = await keyService.GetCurrentSigningCredentials();
             var tokenDescriptor = new SecurityTokenDescriptor
             {
                 Subject = new ClaimsIdentity(new Claim[]
@@ -43,7 +41,7 @@ public async Task Invoke(HttpContext httpContext, IJsonWebKeySetService keyServi
                 Expires = DateTime.UtcNow.AddHours(1),
                 Audience = "jwt-test",
                 Issuer = Server.ServerUrl,
-                SigningCredentials = key
+                SigningCredentials = creds
             };
             var jwt = tokenHandler.CreateToken(tokenDescriptor);
             _jws = tokenHandler.WriteToken(jwt);
diff --git a/tests/NetDevPack.Security.JwtExtensions.Tests/Infra/Server.cs b/tests/NetDevPack.Security.JwtExtensions.Tests/Infra/Server.cs
@@ -1,5 +1,4 @@
-﻿using Jwks.Manager.AspNetCore;
-using Microsoft.AspNetCore.Builder;
+﻿using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
@@ -23,7 +22,8 @@ public Server()
                 .UseKestrel()
                 .ConfigureServices(services =>
                 {
-                    services.AddJwksManager().PersistKeysToFileSystem(new DirectoryInfo(Directory.GetCurrentDirectory()));
+                    services.AddMemoryCache();
+                    services.AddJwksManager().PersistKeysInMemory();
                 })
                 .Configure(app =>
                 {
diff --git a/tests/NetDevPack.Security.JwtExtensions.Tests/Infra/ServiceDiscoveryMiddleware.cs b/tests/NetDevPack.Security.JwtExtensions.Tests/Infra/ServiceDiscoveryMiddleware.cs
diff --git a/tests/NetDevPack.Security.JwtExtensions.Tests/JwksTests.cs b/tests/NetDevPack.Security.JwtExtensions.Tests/JwksTests.cs
@@ -29,6 +29,9 @@ public JwksTests(WebApplicationFactory<Startup> webApplicationFactory, ITestOutp
             _output = output;
             _client = webApplicationFactory.CreateClient();
             _server = new Server();
+            // Force key generation
+            var tokenRequest = new HttpRequestMessage(HttpMethod.Get, "https://localhost:5001/auth");
+            _server.HttpClient.SendAsync(tokenRequest).Wait();
         }
 
         [Fact]
@@ -75,30 +78,7 @@ public async Task Should_Validate_Bearer_Token()
             try { response.EnsureSuccessStatusCode(); } catch { _output.WriteLine(string.Join(" ", response.Headers.GetValues("WWW-Authenticate"))); throw; };
         }
 
-        [Fact]
-        public async Task Should_Get_Jwks_From_Cache()
-        {
-            var tokenRequest = new HttpRequestMessage(HttpMethod.Get, "https://localhost:5001/auth");
-            var tokenResponse = await _server.HttpClient.SendAsync(tokenRequest);
-            var token = await tokenResponse.Content.ReadAsStringAsync();
-
-            // First Get
-            var request = new HttpRequestMessage(HttpMethod.Get, "https://localhost/ProtectedWeatherForecast");
-            request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token);
-            var response = await _client.SendAsync(request);
-
-            try { response.EnsureSuccessStatusCode(); } catch { _output.WriteLine(string.Join(" ", response.Headers.GetValues("WWW-Authenticate"))); throw; };
-
-            // 2nd Get
-            request = new HttpRequestMessage(HttpMethod.Get, "https://localhost/ProtectedWeatherForecast");
-            request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token);
-            response = await _client.SendAsync(request);
 
-            try { response.EnsureSuccessStatusCode(); } catch { _output.WriteLine(string.Join(" ", response.Headers.GetValues("WWW-Authenticate"))); throw; };
-
-
-            ServiceDiscoveryMiddleware.CallTimes.Should().BeLessOrEqualTo(1);
-        }
 
 
         public void Dispose()
diff --git a/tests/NetDevPack.Security.JwtExtensions.Tests/NetDevPack.Security.JwtExtensions.Tests.csproj b/tests/NetDevPack.Security.JwtExtensions.Tests/NetDevPack.Security.JwtExtensions.Tests.csproj

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`using Microsoft.Extensions.Configuration;`
`4`	`4`	`using Microsoft.Extensions.DependencyInjection;`
`5`	`5`	`using Microsoft.Extensions.Hosting;`
`6`		`-using NetDevPack.Security.JwtSigningCredentials.AspNetCore;`
`7`	`6`	`using System.IO;`
`8`	`7`
`9`	`8`	`namespace ApiAuthenticator`
`@@ -25,7 +24,7 @@ public void ConfigureServices(IServiceCollection services)`
`25`	`24`	`{`
`26`	`25`	`services.AddControllers();`
`27`	`26`	`services.AddHttpContextAccessor();`
`28`		`- services.AddJwksManager().PersistKeysToFileSystem(new DirectoryInfo(_env.ContentRootPath));`
	`27`	`+ services.AddJwksManager().PersistKeysInMemory();`
`29`	`28`	`}`
`30`	`29`
`31`	`30`	`// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,15 @@ public static void SetJwksOptions(this JwtBearerOptions options, JwkOptions jwkO`
`21`	`21`	`jwkOptions.JwksUri.OriginalString,`
`22`	`22`	`new JwksRetriever(),`
`23`	`23`	`new HttpDocumentRetriever(httpClient) { RequireHttps = options.RequireHttpsMetadata });`
	`24`	`+`
`24`	`25`	`options.TokenValidationParameters.ValidateAudience = false;`
`25`	`26`	`options.TokenValidationParameters.ValidIssuer = jwkOptions.Issuer;`
	`27`	`+`
	`28`	`+ if (!string.IsNullOrEmpty(jwkOptions.Audience))`
	`29`	`+ {`
	`30`	`+ options.TokenValidationParameters.ValidateAudience = true;`
	`31`	`+ options.TokenValidationParameters.ValidAudience = jwkOptions.Audience;`
	`32`	`+ }`
`26`	`33`	`}`
`27`	`34`	`}`
`28`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public void ConfigureServices(IServiceCollection services)`
`25`	`25`	`.AddJwtBearer(options =>`
`26`	`26`	`{`
`27`	`27`	`options.IncludeErrorDetails = true; // <- great for debugging`
`28`		`- options.SetJwksOptions(new JwkOptions("https://localhost:5001/jwks"));`
	`28`	`+ options.SetJwksOptions(new JwkOptions("https://localhost:5001/jwks", audience: "jwt-test"));`
`29`	`29`	`});`
`30`	`30`	`}`
`31`	`31`