✨ fix: 修改IdentityServer缓存不一致问题

5 years ago · 819b38d35c
5 changed files with 114 additions and 95 deletions
--- a/aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/appsettings.Development.json
+++ b/aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/appsettings.Development.json
@ -24,9 +24,6 @@
      "DatabaseId": 0
    }
  },
-  "StringEncryption": {
-    "DefaultPassPhrase": "YFLtqf75HkDnKR0n"
-  },
  "Jwt": {
    "Audience": "CompanyNameProjectName",
    //客户端标识
--- a/aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/ProjectNameIdentityServerModule.cs
+++ b/aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/ProjectNameIdentityServerModule.cs
@ -14,6 +14,7 @@ using CompanyName.ProjectName.MultiTenancy;
 using IdentityServer4.Configuration;
 using IdentityServer4.Extensions;
 using IdentityServer4.Models;
+using Microsoft.Extensions.Configuration;
 using StackExchange.Redis;
 using Volo.Abp;
 using Volo.Abp.Account;
@ -56,48 +57,53 @@ namespace CompanyName.ProjectName
            var hostingEnvironment = context.Services.GetHostingEnvironment();
            var configuration = context.Services.GetConfiguration();
            context.Services.AddSameSiteCookiePolicy();
-            Configure<AbpLocalizationOptions>(options =>
-            {
-                options.Resources
-                    .Get<ProjectNameResource>()
-                    .AddBaseTypes(
-                        typeof(AbpUiResource)
-                    );
-                
-                options.Languages.Add(new LanguageInfo("ar", "ar", "العربية"));
-                options.Languages.Add(new LanguageInfo("cs", "cs", "Čeština"));
-                options.Languages.Add(new LanguageInfo("en", "en", "English"));
-                options.Languages.Add(new LanguageInfo("en-GB", "en-GB", "English (UK)"));
-                options.Languages.Add(new LanguageInfo("fr", "fr", "Français"));
-                options.Languages.Add(new LanguageInfo("hu", "hu", "Magyar"));
-                options.Languages.Add(new LanguageInfo("pt-BR", "pt-BR", "Português"));
-                options.Languages.Add(new LanguageInfo("ru", "ru", "Русский"));
-                options.Languages.Add(new LanguageInfo("tr", "tr", "Türkçe"));
-                options.Languages.Add(new LanguageInfo("zh-Hans", "zh-Hans", "简体中文"));
-                options.Languages.Add(new LanguageInfo("zh-Hant", "zh-Hant", "繁體中文"));
-                options.Languages.Add(new LanguageInfo("de-DE", "de-DE", "Deutsch", "de"));
-                options.Languages.Add(new LanguageInfo("es", "es", "Español", "es"));
-            });
+            ConfigureLocalization();
+            ConfigureVirtualFileSystem(context);
+            ConfigureCache(context);
+            ConfigureCors(context, configuration);
+            ConfigureOther(configuration);
+        }

-            Configure<AbpBundlingOptions>(options =>
+        public override void OnApplicationInitialization(ApplicationInitializationContext context)
+        {
+            var app = context.GetApplicationBuilder();
+            var env = context.GetEnvironment();
+
+            if (env.IsDevelopment())
            {
-                options.StyleBundles.Configure(
-                    BasicThemeBundles.Styles.Global,
-                    bundle => { bundle.AddFiles("/global-styles.css"); }
-                );
-            });
+                app.UseDeveloperExceptionPage();
+            }

-            Configure<AbpAuditingOptions>(options =>
+            app.UseAbpRequestLocalization();
+
+            if (!env.IsDevelopment())
            {
-                //options.IsEnabledForGetRequests = true;
-                options.ApplicationName = "AuthServer";
-            });
+                app.UseErrorPage();
+            }

-            if (hostingEnvironment.IsDevelopment())
+            app.UseCorrelationId();
+            app.UseStaticFiles();
+            app.UseRouting();
+            app.UseCors(DefaultCorsPolicyName);
+            app.UseCookiePolicy();
+            app.UseAuthentication();
+
+            if (MultiTenancyConsts.IsEnabled)
            {
-                Configure<AbpVirtualFileSystemOptions>(options => { options.FileSets.AddEmbedded<ProjectNameIdentityServerModule>(); });
+                app.UseMultiTenancy();
            }

+            app.UseUnitOfWork();
+            app.UseIdentityServer();
+            app.UseAuthorization();
+            app.UseAuditing();
+            app.UseAbpSerilogEnrichers();
+            app.UseConfiguredEndpoints();
+        }
+
+        private void ConfigureOther(IConfiguration configuration)
+
+        {
            Configure<AppUrlOptions>(options =>
            {
                options.Applications["MVC"].RootUrl = configuration["App:SelfUrl"];
@ -106,19 +112,16 @@ namespace CompanyName.ProjectName
                options.Applications["Angular"].RootUrl = configuration["App:ClientUrl"];
                options.Applications["Angular"].Urls[AccountUrlNames.PasswordReset] = "account/reset-password";
            });
-
            Configure<AbpBackgroundJobOptions>(options => { options.IsJobExecutionEnabled = false; });
-
-            Configure<AbpDistributedCacheOptions>(options => { options.KeyPrefix = "ProjectName:"; });
-
-            if (!hostingEnvironment.IsDevelopment())
+            Configure<AbpAuditingOptions>(options =>
            {
-                var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]);
-                context.Services
-                    .AddDataProtection()
-                    .PersistKeysToStackExchangeRedis(redis, "ProjectName-Protection-Keys");
-            }
+                //options.IsEnabledForGetRequests = true;
+                options.ApplicationName = "AuthServer";
+            });
+        }

+        private void ConfigureCors(ServiceConfigurationContext context, IConfiguration configuration)
+        {
            context.Services.AddCors(options =>
            {
                options.AddPolicy(DefaultCorsPolicyName, builder =>
@ -139,42 +142,60 @@ namespace CompanyName.ProjectName
            });
        }

-        public override void OnApplicationInitialization(ApplicationInitializationContext context)
+        private void ConfigureLocalization()
        {
-            var app = context.GetApplicationBuilder();
-            var env = context.GetEnvironment();
-
-            if (env.IsDevelopment())
+            Configure<AbpLocalizationOptions>(options =>
            {
-                app.UseDeveloperExceptionPage();
-            }
+                options.Resources
+                    .Get<ProjectNameResource>()
+                    .AddBaseTypes(
+                        typeof(AbpUiResource)
+                    );

-            app.UseAbpRequestLocalization();
+                options.Languages.Add(new LanguageInfo("ar", "ar", "العربية"));
+                options.Languages.Add(new LanguageInfo("cs", "cs", "Čeština"));
+                options.Languages.Add(new LanguageInfo("en", "en", "English"));
+                options.Languages.Add(new LanguageInfo("en-GB", "en-GB", "English (UK)"));
+                options.Languages.Add(new LanguageInfo("fr", "fr", "Français"));
+                options.Languages.Add(new LanguageInfo("hu", "hu", "Magyar"));
+                options.Languages.Add(new LanguageInfo("pt-BR", "pt-BR", "Português"));
+                options.Languages.Add(new LanguageInfo("ru", "ru", "Русский"));
+                options.Languages.Add(new LanguageInfo("tr", "tr", "Türkçe"));
+                options.Languages.Add(new LanguageInfo("zh-Hans", "zh-Hans", "简体中文"));
+                options.Languages.Add(new LanguageInfo("zh-Hant", "zh-Hant", "繁體中文"));
+                options.Languages.Add(new LanguageInfo("de-DE", "de-DE", "Deutsch", "de"));
+                options.Languages.Add(new LanguageInfo("es", "es", "Español", "es"));
+            });
+        }

-            if (!env.IsDevelopment())
-            {
-                app.UseErrorPage();
-            }
+        /// <summary>
+        /// Redis缓存
+        /// </summary>
+        private void ConfigureCache(ServiceConfigurationContext context)
+        {
+            var redisConnectionString =
+                context.Services.GetConfiguration().GetValue<string>("Cache:Redis:ConnectionString");
+            var redisDatabaseId = context.Services.GetConfiguration().GetValue<int>("Cache:Redis:DatabaseId");
+            var password = context.Services.GetConfiguration().GetValue<string>("Cache:Redis:Password");
+            var connectString = $"{redisConnectionString},password={password},defaultdatabase={redisDatabaseId}";
+            var redis = ConnectionMultiplexer.Connect(connectString);
+            context.Services.AddStackExchangeRedisCache(options => { options.Configuration = connectString; });
+            context.Services
+                .AddDataProtection()
+                .PersistKeysToStackExchangeRedis(redis, "ProjectName-Protection-Keys");
+        }

-            app.UseCorrelationId();
-            app.UseStaticFiles();
-            app.UseRouting();
-            app.UseCors(DefaultCorsPolicyName);
-            app.UseCookiePolicy();
-            app.UseAuthentication();
+        private void ConfigureVirtualFileSystem(ServiceConfigurationContext context)
+        {
+            Configure<AbpVirtualFileSystemOptions>(options => { options.FileSets.AddEmbedded<ProjectNameIdentityServerModule>(); });

-            if (MultiTenancyConsts.IsEnabled)
+            Configure<AbpBundlingOptions>(options =>
            {
-                app.UseMultiTenancy();
-            }
-     
-            app.UseUnitOfWork();
-            app.UseIdentityServer();
-            app.UseAuthorization();
-            app.UseAuditing();
-            app.UseAbpSerilogEnrichers();
-            app.UseConfiguredEndpoints();
-
+                options.StyleBundles.Configure(
+                    BasicThemeBundles.Styles.Global,
+                    bundle => { bundle.AddFiles("/global-styles.css"); }
+                );
+            });
        }
    }
 }
--- a/aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/appsettings.Development.json
+++ b/aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/appsettings.Development.json
@ -1,18 +1,19 @@
 {
-    "App": {
-      "SelfUrl": "https://localhost:44354",
-      "ClientUrl": "http://localhost:4200",
-      "CorsOrigins": "https://*.ProjectName.com,http://localhost:4200,https://localhost:44307,https://localhost:44315",
-      "RedirectAllowedUrls": "http://localhost:4200,https://localhost:44307"
-    },
-    "ConnectionStrings": {
-      "Default": "Data Source=localhost;Database=CompanyNameProjectNameDB;uid=root;pwd=1q2w3E*;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true"
-    },
+  "App": {
+    "SelfUrl": "https://localhost:44354",
+    "ClientUrl": "http://localhost:4200",
+    "CorsOrigins": "https://*.ProjectName.com,http://localhost:4200,https://localhost:44307,https://localhost:44315",
+    "RedirectAllowedUrls": "http://localhost:4200,https://localhost:44307"
+  },
+  "ConnectionStrings": {
+    "Default": "Data Source=localhost;Database=CompanyNameProjectNameDB;uid=root;pwd=1q2w3E*;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true"
+  },
+  "Cache": {
    "Redis": {
-      "Configuration": "localhost,password=mypassword"
-    },
-    "StringEncryption": {
-      "DefaultPassPhrase": "YFLtqf75HkDnKR0n"
+      "ConnectionString": "localhost",
+      "Password": "mypassword",
+      "DatabaseId": 0
    }
  }
+}

--- a/aspnet-core/services/src/CompanyName.ProjectName.Domain/IdentityServer/IdenityServerApiResourceManager.cs
+++ b/aspnet-core/services/src/CompanyName.ProjectName.Domain/IdentityServer/IdenityServerApiResourceManager.cs
@ -119,18 +119,19 @@ namespace CompanyName.ProjectName.IdentityServer
            apiResource.ShowInDiscoveryDocument = showInDiscoveryDocument;
            if (secret.IsNotNullOrWhiteSpace())
            {
+                // 判读密钥是否一样
                if (apiResource.Secrets.Count > 0)
                {
-                    apiResource.AddSecret(secret.ToSha256());
-                }
-                else
-                {
-                    if (apiResource.Secrets.Any(e => e.Value != secret))
+                    if (apiResource.Secrets.First().Value != secret)
                    {
                        apiResource.Secrets.Clear();
                        apiResource.AddSecret(secret.ToSha256());
                    }
                }
+                else
+                {
+                    apiResource.AddSecret(secret.ToSha256());
+                }
            }


--- a/aspnet-core/services/src/CompanyName.ProjectName.Domain/IdentityServer/IdenityServerClientManager.cs
+++ b/aspnet-core/services/src/CompanyName.ProjectName.Domain/IdentityServer/IdenityServerClientManager.cs
@ -151,7 +151,6 @@ namespace CompanyName.ProjectName.IdentityServer
            {
                if (client.ClientSecrets.Count == 0)
                {
-
                    client.AddSecret(secret.ToSha256(), null, secretType, String.Empty);
                }
                else