Breaking dependency from second JpContext

brunobritodev · brunobritodev · commit 3f9e2b7392a4 · 2019-03-02T08:29:24.000-03:00
diff --git a/src/Backend/Jp.Infra.CrossCutting.IdentityServer/Context/IdentityServerContext.cs b/src/Backend/Jp.Infra.CrossCutting.IdentityServer/Context/IdentityServerContext.cs
diff --git a/src/Backend/Jp.Infra.CrossCutting.IdentityServer/Jp.Infra.CrossCutting.IdentityServer.csproj b/src/Backend/Jp.Infra.CrossCutting.IdentityServer/Jp.Infra.CrossCutting.IdentityServer.csproj
@@ -26,4 +26,9 @@
     <ProjectReference Include="..\Jp.Infra.CrossCutting.Identity\Jp.Infra.CrossCutting.Identity.csproj" />
   </ItemGroup>
 
+ 
+  <ItemGroup>
+    <Folder Include="Context\" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Backend/Jp.Infra.Migrations.MySql.IdentityServer/Configuration/IdentityServerSqlConfig.cs b/src/Backend/Jp.Infra.Migrations.MySql.IdentityServer/Configuration/IdentityServerSqlConfig.cs
@@ -1,10 +1,10 @@
-﻿using System;
-using System.Reflection;
-using Jp.Infra.CrossCutting.IdentityServer.Context;
-using Microsoft.EntityFrameworkCore;
+﻿using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using System;
+using System.Reflection;
+using Jp.Infra.Data.Context;
 
 namespace Jp.Infra.Migrations.MySql.IdentityServer.Configuration
 {
@@ -34,7 +34,7 @@ public static IIdentityServerBuilder UseIdentityServerMySqlDatabase(this IIdenti
                     //options.TokenCleanupInterval = 15; // frequency in seconds to cleanup stale grants. 15 is useful during debugging
                 });
 
-            
+
 
             return builder;
         }
diff --git a/src/Backend/Jp.Infra.Migrations.MySql.IdentityServer/Jp.Infra.Migrations.MySql.IdentityServer.csproj b/src/Backend/Jp.Infra.Migrations.MySql.IdentityServer/Jp.Infra.Migrations.MySql.IdentityServer.csproj
@@ -15,6 +15,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Jp.Infra.CrossCutting.IdentityServer\Jp.Infra.CrossCutting.IdentityServer.csproj" />
+    <ProjectReference Include="..\Jp.Infra.Data\Jp.Infra.Data.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Backend/Jp.Infra.Migrations.MySql.IdentityServer/Migrations/IdentityServer/20180905194210_Initial.Designer.cs b/src/Backend/Jp.Infra.Migrations.MySql.IdentityServer/Migrations/IdentityServer/20180905194210_Initial.Designer.cs
diff --git a/src/Backend/Jp.Infra.Migrations.MySql.IdentityServer/Migrations/IdentityServer/IdentityServerContextModelSnapshot.cs b/src/Backend/Jp.Infra.Migrations.MySql.IdentityServer/Migrations/IdentityServer/IdentityServerContextModelSnapshot.cs
@@ -1,9 +1,8 @@
 ﻿// <auto-generated />
-using System;
-using Jp.Infra.CrossCutting.IdentityServer.Context;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using System;
+using Jp.Infra.Data.Context;
 
 namespace Jp.Infra.Migrations.MySql.IdentityServer.Migrations.IdentityServer
 {
diff --git a/src/Backend/Jp.Infra.Migrations.Sql.IdentityServer/Configuration/IdentityServerSqlConfig.cs b/src/Backend/Jp.Infra.Migrations.Sql.IdentityServer/Configuration/IdentityServerSqlConfig.cs
@@ -1,10 +1,10 @@
-﻿using System;
-using System.Reflection;
-using Jp.Infra.CrossCutting.IdentityServer.Context;
+﻿using Jp.Infra.Data.Context;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using System;
+using System.Reflection;
 
 namespace Jp.Infra.Migrations.Sql.IdentityServer.Configuration
 {
@@ -34,7 +34,7 @@ public static IIdentityServerBuilder UseIdentityServerSqlDatabase(this IIdentity
                     options.TokenCleanupInterval = 15; // frequency in seconds to cleanup stale grants. 15 is useful during debugging
                 });
 
-            
+
 
             return builder;
         }
diff --git a/src/Backend/Jp.Infra.Migrations.Sql.IdentityServer/Jp.Infra.Migrations.Sql.IdentityServer.csproj b/src/Backend/Jp.Infra.Migrations.Sql.IdentityServer/Jp.Infra.Migrations.Sql.IdentityServer.csproj
@@ -12,6 +12,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Jp.Infra.CrossCutting.IdentityServer\Jp.Infra.CrossCutting.IdentityServer.csproj" />
     <ProjectReference Include="..\Jp.Infra.CrossCutting.Identity\Jp.Infra.CrossCutting.Identity.csproj" />
+    <ProjectReference Include="..\Jp.Infra.Data\Jp.Infra.Data.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Backend/Jp.Infra.Migrations.Sql.IdentityServer/Migrations/IdentityServer/20180901233720_Initial.Designer.cs b/src/Backend/Jp.Infra.Migrations.Sql.IdentityServer/Migrations/IdentityServer/20180901233720_Initial.Designer.cs
diff --git a/src/Backend/Jp.Infra.Migrations.Sql.IdentityServer/Migrations/IdentityServer/IdentityServerContextModelSnapshot.cs b/src/Backend/Jp.Infra.Migrations.Sql.IdentityServer/Migrations/IdentityServer/IdentityServerContextModelSnapshot.cs
@@ -1,10 +1,10 @@
 ﻿// <auto-generated />
 
-using System;
-using Jp.Infra.CrossCutting.IdentityServer.Context;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
+using System;
+using Jp.Infra.Data.Context;
 
 namespace Jp.Infra.Migrations.Sql.Migrations.IdentityServer
 {
diff --git a/src/Frontend/Jp.UI.SSO/Configuration/IdentityServerConfig.cs b/src/Frontend/Jp.UI.SSO/Configuration/IdentityServerConfig.cs
@@ -0,0 +1,31 @@
+﻿using Jp.Infra.CrossCutting.Identity.Entities.Identity;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace Jp.UI.SSO.Configuration
+{
+    public static class IdentityServerConfig
+    {
+        public static IIdentityServerBuilder AddIdentityServer(this IServiceCollection services,
+            IConfiguration configuration, IHostingEnvironment environment, ILogger logger)
+        {
+
+            var builder = services.AddIdentityServer(
+                    options =>
+                    {
+                        options.Events.RaiseErrorEvents = true;
+                        options.Events.RaiseInformationEvents = true;
+                        options.Events.RaiseFailureEvents = true;
+                        options.Events.RaiseSuccessEvents = true;
+                    })
+                .AddAspNetIdentity<UserIdentity>();
+
+            builder.AddSigninCredentialFromConfig(configuration.GetSection("CertificateOptions"), logger, environment);
+
+            return builder;
+        }
+
+    }
+}
diff --git a/src/Frontend/Jp.UI.SSO/Configuration/SigninCredentialExtension.cs b/src/Frontend/Jp.UI.SSO/Configuration/SigninCredentialExtension.cs
@@ -0,0 +1,113 @@
+﻿using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography.X509Certificates;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace Jp.UI.SSO.Configuration
+{
+    /// <summary>
+    /// Impl of adding a signin key for identity server 4,
+    /// with an appsetting.json configuration look similar to:
+    /// "SigninKeyCredentials": {
+    ///     "KeyType": "KeyFile",
+    ///     "FileName": "C:\\certificates\\idsv4.pfx",
+    ///     "KeyStorePath": ""
+    /// }
+    /// </summary>
+    public static class SigninCredentialExtension
+    {
+        private const string File = nameof(File);
+        private const string Store = nameof(Store);
+        private const string Temporary = nameof(Temporary);
+        private const string Environment = nameof(Environment);
+
+        private const string FileName = nameof(FileName);
+        private const string FilePassword = nameof(FilePassword);
+        private const string KeyStoreIssuer = nameof(KeyStoreIssuer);
+
+        public static IIdentityServerBuilder AddSigninCredentialFromConfig(
+            this IIdentityServerBuilder builder, IConfigurationSection options, ILogger logger, IHostingEnvironment env)
+        {
+            string keyType = System.Environment.GetEnvironmentVariable("CERTIFICATE_TYPE") ?? options.GetSection("Type").Value;
+            logger.LogInformation($"SigninCredentialExtension keyType is {keyType}");
+
+            switch (keyType)
+            {
+                case Temporary:
+                    builder.AddDeveloperSigningCredential(false);
+                    break;
+
+                case File:
+                    AddCertificateFromFile(builder, options, logger, env);
+                    break;
+
+                case Store:
+                    AddCertificateFromStore(builder, options, logger);
+                    break;
+
+                case Environment:
+                    AddCertificateFromEnvironment(builder, logger);
+                    break;
+            }
+            logger.LogInformation($"SigninCredentialExtension added");
+            return builder;
+        }
+
+        private static void AddCertificateFromEnvironment(IIdentityServerBuilder builder, ILogger logger)
+        {
+            logger.LogInformation("Taking Certificate from Environment");
+            var file = System.Environment.GetEnvironmentVariable("ASPNETCORE_Kestrel__Certificates__Default__Path");
+            var password = System.Environment.GetEnvironmentVariable("ASPNETCORE_Kestrel__Certificates__Default__Password");
+            if (System.IO.File.Exists(file))
+            {
+                logger.LogInformation("Taked Certificate from Environment");
+                builder.AddSigningCredential(new X509Certificate2(file, password, X509KeyStorageFlags.MachineKeySet));
+            }
+            else
+            {
+                logger.LogError($"SigninCredentialExtension cannot find key file {System.Environment.GetEnvironmentVariable("ASPNETCORE_Kestrel__Certificates__Default__Path")}");
+            }
+        }
+
+        private static void AddCertificateFromStore(IIdentityServerBuilder builder,
+            IConfigurationSection options, ILogger logger)
+        {
+            var keyIssuer = options.GetValue<string>(KeyStoreIssuer);
+            logger.LogInformation($"SigninCredentialExtension adding key from store by {keyIssuer}");
+
+            X509Store store = new X509Store(StoreName.My, StoreLocation.LocalMachine);
+            store.Open(OpenFlags.ReadOnly);
+
+            var certificates = store.Certificates.Find(X509FindType.FindByIssuerName, keyIssuer, true);
+
+            if (certificates.Count > 0)
+                builder.AddSigningCredential(certificates[0]);
+            else
+                logger.LogError("A matching key couldn't be found in the store");
+        }
+
+        private static void AddCertificateFromFile(IIdentityServerBuilder builder,
+            IConfigurationSection options, ILogger logger, IHostingEnvironment env)
+        {
+            var keyFileName = options.GetValue<string>(FileName);
+            var keyFilePassword = options.GetValue<string>(FilePassword);
+            var file = Path.Combine(env.ContentRootPath, keyFileName);
+
+            if (System.IO.File.Exists(file))
+            {
+                logger.LogInformation($"SigninCredentialExtension adding key from file {keyFileName}");
+                builder.AddSigningCredential(new X509Certificate2(file, keyFilePassword));
+            }
+            else
+            {
+                logger.LogError($"SigninCredentialExtension cannot find key file {keyFileName}");
+            }
+        }
+    }
+}
diff --git a/src/Frontend/Jp.UI.SSO/Util/DbMigrationHelpers.cs b/src/Frontend/Jp.UI.SSO/Util/DbMigrationHelpers.cs
@@ -1,18 +1,15 @@
-﻿using System;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using IdentityServer4.EntityFramework.Mappers;
-using Jp.Infra.CrossCutting.Identity.Constants;
+﻿using IdentityServer4.EntityFramework.Mappers;
 using Jp.Infra.CrossCutting.Identity.Context;
 using Jp.Infra.CrossCutting.Identity.Entities.Identity;
-using Jp.Infra.CrossCutting.IdentityServer.Context;
 using Jp.Infra.Data.Context;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
-using JpContext = Jp.Infra.CrossCutting.IdentityServer.Context.JpContext;
+using System;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading.Tasks;
 
 namespace Jp.UI.SSO.Util
 {
@@ -77,7 +74,7 @@ private static async Task EnsureSeedIdentityData(UserManager<UserIdentity> userM
                 UserName = Users.AdminUserName,
                 Email = Users.AdminEmail,
                 EmailConfirmed = true,
-                
+
             };
 
             var result = await userManager.CreateAsync(user, Users.AdminPassword);
