Merge pull request #22 from NetDevPack/fix/namespaces

Fix/namespaces

Author: brunobritodev

samples/NetDevPack.Security.Jwt.AspNet.SymetricKey/Program.cs

@@ -1,15 +1,15 @@
 using System.Security.Claims;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.DataProtection;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.IdentityModel.JsonWebTokens;
 using Microsoft.IdentityModel.Logging;
 using Microsoft.IdentityModel.Tokens;
 using Microsoft.OpenApi.Models;
 using NetDevPack.Security.Jwt.AspNet.SymetricKey;
 using NetDevPack.Security.Jwt.AspNetCore;
-using NetDevPack.Security.Jwt.Core;
 using NetDevPack.Security.Jwt.Core.Interfaces;
-using NetDevPack.Security.Jwt.Core.Jwa;
 
 
 var builder = WebApplication.CreateBuilder(args);
@@ -21,7 +21,7 @@
 {
     c.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
     {
-        Description = "Insira o token JWT desta maneira: Bearer {seu token}",
+        Description = "Bearer {token}",
         Name = "Authorization",
         Scheme = "Bearer",
         BearerFormat = "JWT",
@@ -54,12 +54,14 @@
         ValidateLifetime = true,
         ValidateIssuerSigningKey = true,
         ValidIssuer = "NetDevPack",
-        ValidAudience = "NetDevPack.AspNet.SymetricKey"
+        ValidAudience = "NetDevPack.Security.Jwt.AspNet"
     };
 });
+builder.Services.AddDataProtection().PersistKeysToFileSystem(new DirectoryInfo(Directory.GetCurrentDirectory()));
 builder.Services.AddAuthorization();
-builder.Services.AddJwksManager().UseJwtValidation().PersistKeysInMemory();
+builder.Services.AddJwksManager().UseJwtValidation();
 builder.Services.AddMemoryCache();
+builder.Services.AddHttpContextAccessor();
 
 var app = builder.Build();
 IdentityModelEventSource.ShowPII = true;
@@ -74,7 +76,7 @@
 app.UseAuthorization();
 app.UseHttpsRedirection();
 
-app.MapGet("/random-jws", [AllowAnonymous]async (IJwtService service) =>
+app.MapGet("/random-jws", async (IJwtService service) =>
    {
        var handler = new JsonWebTokenHandler();
        var now = DateTime.Now;
@@ -94,27 +96,27 @@
     .WithName("Generate random JWS")
     .WithTags("JWS");
 
-app.MapGet("/random-jwe", [AllowAnonymous] async (IJwtService service) =>
-    {
-        var handler = new JsonWebTokenHandler();
-        var now = DateTime.Now;
-        var descriptor = new SecurityTokenDescriptor
-        {
-            Issuer = "NetDevPack",
-            Audience = "NetDevPack.Security.Jwt.AspNet",
-            IssuedAt = now,
-            NotBefore = now,
-            Expires = now.AddMinutes(5),
-            Subject = new ClaimsIdentity(FakeClaims.GenerateClaim().Generate(5)),
-            EncryptingCredentials = await service.GetCurrentEncryptingCredentials()
-        };
-
-        return handler.CreateToken(descriptor);
-    })
+app.MapGet("/random-jwe", async (IJwtService service) =>
+   {
+       var handler = new JsonWebTokenHandler();
+       var now = DateTime.Now;
+       var descriptor = new SecurityTokenDescriptor
+       {
+           Issuer = "NetDevPack",
+           Audience = "NetDevPack.Security.Jwt.AspNet",
+           IssuedAt = now,
+           NotBefore = now,
+           Expires = now.AddMinutes(5),
+           Subject = new ClaimsIdentity(FakeClaims.GenerateClaim().Generate(5)),
+           EncryptingCredentials = await service.GetCurrentEncryptingCredentials()
+       };
+
+       return handler.CreateToken(descriptor);
+   })
     .WithName("Generate random JWE")
     .WithTags("JWE");
 
-app.MapGet("/validate-jwt/{jwt}", [Authorize]async (IJwtService service, string jwt) =>
+app.MapGet("/validate-jwt/{jwt}", async (IJwtService service, string jwt) =>
 {
     var handler = new JsonWebTokenHandler();
 
@@ -151,5 +153,10 @@
     .WithName("Validate JWE")
     .WithTags("Validate");
 
+app.MapGet("/protected-endpoint", [Authorize] ([FromServices] IHttpContextAccessor context) =>
+{
+    return Results.Ok(context.HttpContext?.User.Claims.Select(s => new { s.Type, s.Value }));
+}).WithName("Protected Endpoint")
+    .WithTags("Validate");
 
 app.Run();

src/NetDevPack.Security.Jwt.AspNetCore/AspNetBuilderExtensions.cs

@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
+using NetDevPack.Security.Jwt.AspNetCore;
 using NetDevPack.Security.Jwt.Core.Interfaces;
 
-namespace NetDevPack.Security.Jwt.AspNetCore;
+namespace Microsoft.Extensions.DependencyInjection;
 
 public static class AspNetBuilderExtensions
 {

src/NetDevPack.Security.Jwt.AspNetCore/NetDevPack.Security.Jwt.AspNetCore.csproj

@@ -4,7 +4,7 @@
     <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Authors>Eduardo Pires</Authors>
+    <Authors>Bruno Brito, Eduardo Pires</Authors>
     <LangVersion>10.0</LangVersion>
     <PackageIconUrl>https://raw.githubusercontent.com/NetDevPack/NetDevPack/master/assets/IconNuget.png</PackageIconUrl>
     <PackageTags>jwt jwks rsa ecdsa hmac oauth2 key rotating</PackageTags>

src/NetDevPack.Security.Jwt.Core/JsonWebKeySetManagerDependencyInjection.cs

@@ -1,37 +1,36 @@
-using Microsoft.Extensions.DependencyInjection;
+using NetDevPack.Security.Jwt.Core;
 using NetDevPack.Security.Jwt.Core.DefaultStore;
 using NetDevPack.Security.Jwt.Core.Interfaces;
 using NetDevPack.Security.Jwt.Core.Jwt;
 
-namespace NetDevPack.Security.Jwt.Core
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class JsonWebKeySetManagerDependencyInjection
 {
-    public static class JsonWebKeySetManagerDependencyInjection
+    /// <summary>
+    /// Sets the signing credential.
+    /// </summary>
+    /// <returns></returns>
+    public static IJwksBuilder AddJwksManager(this IServiceCollection services, Action<JwtOptions> action = null)
     {
-        /// <summary>
-        /// Sets the signing credential.
-        /// </summary>
-        /// <returns></returns>
-        public static IJwksBuilder AddJwksManager(this IServiceCollection services, Action<JwtOptions> action = null)
-        {
-            if (action != null)
-                services.Configure(action);
+        if (action != null)
+            services.Configure(action);
 
-            services.AddDataProtection();
-            services.AddScoped<IJwtService, JwtService>();
-            services.AddScoped<IJsonWebKeyStore, DataProtectionStore>();
+        services.AddDataProtection();
+        services.AddScoped<IJwtService, JwtService>();
+        services.AddScoped<IJsonWebKeyStore, DataProtectionStore>();
 
-            return new JwksBuilder(services);
-        }
+        return new JwksBuilder(services);
+    }
 
-        /// <summary>
-        /// Sets the signing credential.
-        /// </summary>
-        /// <returns></returns>
-        public static IJwksBuilder PersistKeysInMemory(this IJwksBuilder builder)
-        {
-            builder.Services.AddScoped<IJsonWebKeyStore, InMemoryStore>();
+    /// <summary>
+    /// Sets the signing credential.
+    /// </summary>
+    /// <returns></returns>
+    public static IJwksBuilder PersistKeysInMemory(this IJwksBuilder builder)
+    {
+        builder.Services.AddScoped<IJsonWebKeyStore, InMemoryStore>();
 
-            return builder;
-        }
+        return builder;
     }
-}
+}

src/NetDevPack.Security.Jwt.IdentityServer4/IdentityServerBuilderKeysExtensions.cs

@@ -3,8 +3,9 @@
 using Microsoft.Extensions.Options;
 using NetDevPack.Security.Jwt.Core;
 using NetDevPack.Security.Jwt.Core.Interfaces;
+using NetDevPack.Security.Jwt.Store.FileSystem;
 
-namespace NetDevPack.Security.Jwt.Store.FileSystem;
+namespace Microsoft.Extensions.DependencyInjection;
 
 /// <summary>
 /// Builder extension methods for registering crypto services
@@ -17,7 +18,6 @@ public static class FileSystemStoreExtensions
     /// <returns></returns>
     public static IJwksBuilder PersistKeysToFileSystem(this IJwksBuilder builder, DirectoryInfo directory)
     {
-
         builder.Services.AddScoped<IJsonWebKeyStore, FileSystemStore>(provider => new FileSystemStore(directory, provider.GetRequiredService<IOptions<JwtOptions>>(), provider.GetRequiredService<IMemoryCache>()));
 
         return builder;

src/NetDevPack.Security.Jwt.Store.EntityFrameworkCore/EFCoreServiceExtensions.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using System.Security.Claims;
+using System.Threading;
 using System.Threading.Tasks;
 using Bogus;
 using FluentAssertions;
@@ -15,10 +16,11 @@
 using NetDevPack.Security.Jwt.Tests.Warmups;
 using Xunit;
 
-namespace NetDevPack.Security.Jwt.Tests.StoreTests; 
+namespace NetDevPack.Security.Jwt.Tests.StoreTests;
 public abstract class GenericStoreServiceTest<TWarmup> : IClassFixture<TWarmup>
     where TWarmup : class, IWarmupTest
 {
+    private static SemaphoreSlim TestSync = new(1);
     private readonly IJsonWebKeyStore _store;
     private readonly IOptions<JwtOptions> _options;
     public TWarmup WarmupData { get; }
@@ -375,18 +377,18 @@ public async Task ShouldSaveDeterministicJwkRecoverAndSigning(string algorithm)
     public async Task ShouldSaveJweRecoverAndEncrypt(string algorithm, string encryption)
     {
         await WarmupData.Clear();
-
         var handler = new JsonWebTokenHandler();
         var now = DateTime.Now;
 
         // Generate right now and in memory
-        var newKey = new CryptographicKey(Algorithm.Create(algorithm).WithContentEncryption(encryption));
-        await _store.Store(new KeyMaterial(newKey));
+        var newKey = new KeyMaterial(new CryptographicKey(Algorithm.Create(algorithm).WithContentEncryption(encryption)));
 
+        await _store.Store(newKey);
         // recovered from database
-        var currentKey = await _store.GetCurrent();
+        var currentKey = await _store.Get(newKey.KeyId);
 
-        newKey.Key.KeyId.Should().Be(currentKey.KeyId);
+
+        newKey.KeyId.Should().Be(currentKey.KeyId);
         var claims = new ClaimsIdentity(GenerateClaim().Generate(5));
         var descriptor = new SecurityTokenDescriptor
         {
@@ -442,7 +444,7 @@ public async Task ShouldGenerateAndValidateJweAndJws()
 
         var handler = new JsonWebTokenHandler();
         var now = DateTime.Now;
-        
+
         // Generate right now and in memory
         var newKey = new CryptographicKey(Algorithm.Create(AlgorithmType.RSA, JwtType.Both));