enhance encryption and decryption security

aspnet-core/services/account/AuthServer.Host/AuthIdentityServerModule.cs

@@ -77,10 +77,6 @@ namespace AuthServer.Host
                 })
                 .UseDashboard();
             });
-
-            PreConfigure<IIdentityServerBuilder>(builder =>
-            {
-            });
         }
 
         public override void ConfigureServices(ServiceConfigurationContext context)
@@ -96,9 +92,17 @@ namespace AuthServer.Host
             // 加解密
             Configure<AbpStringEncryptionOptions>(options =>
             {
-                options.DefaultPassPhrase = "s46c5q55nxpeS8Ra";
+                var encryptionConfiguration = configuration.GetSection("Encryption");
-                options.InitVectorBytes = Encoding.ASCII.GetBytes("s83ng0abvd02js84");
+                if (encryptionConfiguration.Exists())
-                options.DefaultSalt = Encoding.ASCII.GetBytes("sf&5)s3#");
+                {
+                    options.DefaultPassPhrase = encryptionConfiguration["PassPhrase"] ?? options.DefaultPassPhrase;
+                    options.DefaultSalt = encryptionConfiguration.GetSection("Salt").Exists()
+                        ? Encoding.ASCII.GetBytes(encryptionConfiguration["Salt"])
+                        : options.DefaultSalt;
+                    options.InitVectorBytes = encryptionConfiguration.GetSection("InitVector").Exists() 
+                        ? Encoding.ASCII.GetBytes(encryptionConfiguration["InitVector"])
+                        : options.InitVectorBytes;
+                }
             });
 
             Configure<AbpDistributedCacheOptions>(options =>

aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/BackendAdminHostModule.cs

@@ -122,9 +122,17 @@ namespace LINGYUN.Abp.BackendAdmin
             // 加解密
             Configure<AbpStringEncryptionOptions>(options =>
             {
-                options.DefaultPassPhrase = "s46c5q55nxpeS8Ra";
+                var encryptionConfiguration = configuration.GetSection("Encryption");
-                options.InitVectorBytes = Encoding.ASCII.GetBytes("s83ng0abvd02js84");
+                if (encryptionConfiguration.Exists())
-                options.DefaultSalt = Encoding.ASCII.GetBytes("sf&5)s3#");
+                {
+                    options.DefaultPassPhrase = encryptionConfiguration["PassPhrase"] ?? options.DefaultPassPhrase;
+                    options.DefaultSalt = encryptionConfiguration.GetSection("Salt").Exists()
+                        ? Encoding.ASCII.GetBytes(encryptionConfiguration["Salt"])
+                        : options.DefaultSalt;
+                    options.InitVectorBytes = encryptionConfiguration.GetSection("InitVector").Exists()
+                        ? Encoding.ASCII.GetBytes(encryptionConfiguration["InitVector"])
+                        : options.InitVectorBytes;
+                }
             });
 
             Configure<PermissionManagementOptions>(options =>

aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/ApiGatewayHostModule.cs

@@ -11,6 +11,7 @@ using Ocelot.Middleware.Multiplexer;
 using Ocelot.Provider.Polly;
 using StackExchange.Redis;
 using System;
+using System.Text;
 using Volo.Abp;
 using Volo.Abp.AspNetCore;
 using Volo.Abp.Autofac;
@@ -20,6 +21,7 @@ using Volo.Abp.Caching.StackExchangeRedis;
 using Volo.Abp.Http.Client.IdentityModel;
 using Volo.Abp.IdentityModel;
 using Volo.Abp.Modularity;
+using Volo.Abp.Security.Encryption;
 
 namespace LINGYUN.ApiGateway
 {
@@ -100,6 +102,22 @@ namespace LINGYUN.ApiGateway
                 options.InstanceName = configuration["Redis:InstanceName"];
             });
 
+            // 加解密
+            Configure<AbpStringEncryptionOptions>(options =>
+            {
+                var encryptionConfiguration = configuration.GetSection("Encryption");
+                if (encryptionConfiguration.Exists())
+                {
+                    options.DefaultPassPhrase = encryptionConfiguration["PassPhrase"] ?? options.DefaultPassPhrase;
+                    options.DefaultSalt = encryptionConfiguration.GetSection("Salt").Exists()
+                        ? Encoding.ASCII.GetBytes(encryptionConfiguration["Salt"])
+                        : options.DefaultSalt;
+                    options.InitVectorBytes = encryptionConfiguration.GetSection("InitVector").Exists()
+                        ? Encoding.ASCII.GetBytes(encryptionConfiguration["InitVector"])
+                        : options.InitVectorBytes;
+                }
+            });
+
             Configure<IdentityModelHttpRequestMessageOptions>(options =>
             {
                 // See https://github.com/abpframework/abp/pull/4564

aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/ApiGatewayHttpApiHostModule.cs

@@ -77,9 +77,17 @@ namespace LINGYUN.ApiGateway
             // 加解密
             Configure<AbpStringEncryptionOptions>(options =>
             {
-                options.DefaultPassPhrase = "s46c5q55nxpeS8Ra";
+                var encryptionConfiguration = configuration.GetSection("Encryption");
-                options.InitVectorBytes = Encoding.ASCII.GetBytes("s83ng0abvd02js84");
+                if (encryptionConfiguration.Exists())
-                options.DefaultSalt = Encoding.ASCII.GetBytes("sf&5)s3#");
+                {
+                    options.DefaultPassPhrase = encryptionConfiguration["PassPhrase"] ?? options.DefaultPassPhrase;
+                    options.DefaultSalt = encryptionConfiguration.GetSection("Salt").Exists()
+                        ? Encoding.ASCII.GetBytes(encryptionConfiguration["Salt"])
+                        : options.DefaultSalt;
+                    options.InitVectorBytes = encryptionConfiguration.GetSection("InitVector").Exists()
+                        ? Encoding.ASCII.GetBytes(encryptionConfiguration["InitVector"])
+                        : options.InitVectorBytes;
+                }
             });
 
             Configure<AbpDistributedCacheOptions>(options =>

aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/AbpIdentityServerAdminHttpApiHostModule.cs

@@ -102,9 +102,17 @@ namespace LINGYUN.Abp.IdentityServer4
             // 加解密
             Configure<AbpStringEncryptionOptions>(options =>
             {
-                options.DefaultPassPhrase = "s46c5q55nxpeS8Ra";
+                var encryptionConfiguration = configuration.GetSection("Encryption");
-                options.InitVectorBytes = Encoding.ASCII.GetBytes("s83ng0abvd02js84");
+                if (encryptionConfiguration.Exists())
-                options.DefaultSalt = Encoding.ASCII.GetBytes("sf&5)s3#");
+                {
+                    options.DefaultPassPhrase = encryptionConfiguration["PassPhrase"] ?? options.DefaultPassPhrase;
+                    options.DefaultSalt = encryptionConfiguration.GetSection("Salt").Exists()
+                        ? Encoding.ASCII.GetBytes(encryptionConfiguration["Salt"])
+                        : options.DefaultSalt;
+                    options.InitVectorBytes = encryptionConfiguration.GetSection("InitVector").Exists()
+                        ? Encoding.ASCII.GetBytes(encryptionConfiguration["InitVector"])
+                        : options.InitVectorBytes;
+                }
             });
 
             Configure<PermissionManagementOptions>(options =>

aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/AbpMessageServiceHttpApiHostModule.cs

@@ -99,9 +99,17 @@ namespace LINGYUN.Abp.MessageService
             // 加解密
             Configure<AbpStringEncryptionOptions>(options =>
             {
-                options.DefaultPassPhrase = "s46c5q55nxpeS8Ra";
+                var encryptionConfiguration = configuration.GetSection("Encryption");
-                options.InitVectorBytes = Encoding.ASCII.GetBytes("s83ng0abvd02js84");
+                if (encryptionConfiguration.Exists())
-                options.DefaultSalt = Encoding.ASCII.GetBytes("sf&5)s3#");
+                {
+                    options.DefaultPassPhrase = encryptionConfiguration["PassPhrase"] ?? options.DefaultPassPhrase;
+                    options.DefaultSalt = encryptionConfiguration.GetSection("Salt").Exists()
+                        ? Encoding.ASCII.GetBytes(encryptionConfiguration["Salt"])
+                        : options.DefaultSalt;
+                    options.InitVectorBytes = encryptionConfiguration.GetSection("InitVector").Exists()
+                        ? Encoding.ASCII.GetBytes(encryptionConfiguration["InitVector"])
+                        : options.InitVectorBytes;
+                }
             });
 
             Configure<AbpExceptionHandlingOptions>(options =>

aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/AppPlatformHttpApiHostModule.cs

@@ -112,9 +112,17 @@ namespace LINGYUN.Platform
             // 加解密
             Configure<AbpStringEncryptionOptions>(options =>
             {
-                options.DefaultPassPhrase = "s46c5q55nxpeS8Ra";
+                var encryptionConfiguration = configuration.GetSection("Encryption");
-                options.InitVectorBytes = Encoding.ASCII.GetBytes("s83ng0abvd02js84");
+                if (encryptionConfiguration.Exists())
-                options.DefaultSalt = Encoding.ASCII.GetBytes("sf&5)s3#");
+                {
+                    options.DefaultPassPhrase = encryptionConfiguration["PassPhrase"] ?? options.DefaultPassPhrase;
+                    options.DefaultSalt = encryptionConfiguration.GetSection("Salt").Exists()
+                        ? Encoding.ASCII.GetBytes(encryptionConfiguration["Salt"])
+                        : options.DefaultSalt;
+                    options.InitVectorBytes = encryptionConfiguration.GetSection("InitVector").Exists()
+                        ? Encoding.ASCII.GetBytes(encryptionConfiguration["InitVector"])
+                        : options.InitVectorBytes;
+                }
             });
 
             // 自定义需要处理的异常