diff --git a/apps/vben5/packages/@abp/settings/src/components/settings/SettingForm.vue b/apps/vben5/packages/@abp/settings/src/components/settings/SettingForm.vue index 442aa8d66..de002cd3c 100644 --- a/apps/vben5/packages/@abp/settings/src/components/settings/SettingForm.vue +++ b/apps/vben5/packages/@abp/settings/src/components/settings/SettingForm.vue @@ -238,6 +238,7 @@ onMounted(onGet); configure) + { + configure.Invoke(definition); + return definition; + } + public static SettingDefinition RequiredFeatures( this SettingDefinition definition, IEnumerable requiredFeatures) diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain.Shared/LINGYUN/Abp/Identity/Localization/zh-Hans.json b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain.Shared/LINGYUN/Abp/Identity/Localization/zh-Hans.json index 1f7ac1679..390832a34 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain.Shared/LINGYUN/Abp/Identity/Localization/zh-Hans.json +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain.Shared/LINGYUN/Abp/Identity/Localization/zh-Hans.json @@ -78,8 +78,8 @@ "Description:Abp.Identity.Link.UserLoginUri": "设置用户登录链接,用于外部认证用户重定向.", "DisplayName:Abp.Identity.TwoFactorBehaviour": "双因素身份验证行为", "Description:Abp.Identity.TwoFactorBehaviour": "双因素身份验证行为", - "DisplayName:Abp.Identity.UsersCanChangeTwoFactor": "允许用户更改其因素身份验证", - "Description:Abp.Identity.UsersCanChangeTwoFactor": "允许用户更改其因素身份验证.", + "DisplayName:Abp.Identity.UsersCanChangeTwoFactor": "允许用户更改其双因素身份验证", + "Description:Abp.Identity.UsersCanChangeTwoFactor": "允许用户更改其双因素身份验证.", "DisplayName:Abp.Identity.AdminRoleTwoFactorForceEnabled": "管理员角色强制启用二次认证", "Description:Abp.Identity.AdminRoleTwoFactorForceEnabled": "管理员角色登录时强制使用二次认证.", "DisplayName:Abp.Identity.ProhibitDefaultAdminRole": "禁止设置管理员默认角色", diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/IdentityGroupSettingDefinitionProvider.cs b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/IdentityGroupSettingDefinitionProvider.cs index bb2e63ee8..745d5578b 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/IdentityGroupSettingDefinitionProvider.cs +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/IdentityGroupSettingDefinitionProvider.cs @@ -27,6 +27,7 @@ public class IdentityGroupSettingDefinitionProvider : SettingDefinitionProvider ?.WithParent("Lockout", L("Settings:Identity.Lockout"), order: 3) ?.WithOrder(0) ?.WithValueType(ValueType.Boolean) + ?.Replace(x => x.IsVisibleToClients = false) ?.ReplaceProviders( DefaultValueSettingValueProvider.ProviderName, ConfigurationSettingValueProvider.ProviderName, @@ -37,6 +38,7 @@ public class IdentityGroupSettingDefinitionProvider : SettingDefinitionProvider ?.WithParent("Lockout", L("Settings:Identity.Lockout"), order: 3) ?.WithOrder(1) ?.WithValueType(ValueType.Number) + ?.Replace(x => x.IsVisibleToClients = false) ?.ReplaceProviders( DefaultValueSettingValueProvider.ProviderName, ConfigurationSettingValueProvider.ProviderName, @@ -47,6 +49,7 @@ public class IdentityGroupSettingDefinitionProvider : SettingDefinitionProvider ?.WithParent("Lockout", L("Settings:Identity.Lockout"), order: 3) ?.WithOrder(2) ?.WithValueType(ValueType.Number) + ?.Replace(x => x.IsVisibleToClients = false) ?.ReplaceProviders( DefaultValueSettingValueProvider.ProviderName, ConfigurationSettingValueProvider.ProviderName, @@ -189,6 +192,11 @@ public class IdentityGroupSettingDefinitionProvider : SettingDefinitionProvider ?.WithParent("Password", L("Settings:Identity.Password"), order: 4) ?.WithOrder(6) ?.WithValueType(ValueType.Boolean) + ?.Replace(x => + { + x.IsVisibleToClients = false; + x.DefaultValue = true.ToString(); + }) ?.ReplaceProviders( DefaultValueSettingValueProvider.ProviderName, ConfigurationSettingValueProvider.ProviderName, @@ -199,6 +207,11 @@ public class IdentityGroupSettingDefinitionProvider : SettingDefinitionProvider ?.WithParent("Password", L("Settings:Identity.Password"), order: 4) ?.WithOrder(7) ?.WithValueType(ValueType.Number) + ?.Replace(x => + { + x.IsVisibleToClients = false; + x.DefaultValue = 30.ToString(); + }) ?.ReplaceProviders( DefaultValueSettingValueProvider.ProviderName, ConfigurationSettingValueProvider.ProviderName, @@ -209,6 +222,11 @@ public class IdentityGroupSettingDefinitionProvider : SettingDefinitionProvider ?.WithParent("Password", L("Settings:Identity.Password"), order: 4) ?.WithOrder(8) ?.WithValueType(ValueType.Boolean) + ?.Replace(x => + { + x.IsVisibleToClients = false; + x.DefaultValue = true.ToString(); + }) ?.ReplaceProviders( DefaultValueSettingValueProvider.ProviderName, ConfigurationSettingValueProvider.ProviderName, @@ -219,6 +237,7 @@ public class IdentityGroupSettingDefinitionProvider : SettingDefinitionProvider ?.WithParent("Password", L("Settings:Identity.Password"), order: 4) ?.WithOrder(9) ?.WithValueType(ValueType.Number) + ?.Replace(x => x.IsVisibleToClients = false) ?.ReplaceProviders( DefaultValueSettingValueProvider.ProviderName, ConfigurationSettingValueProvider.ProviderName, @@ -233,6 +252,7 @@ public class IdentityGroupSettingDefinitionProvider : SettingDefinitionProvider ?.WithParent("OrganizationUnit", L("Settings:Identity.OrganizationUnit"), order: 7) ?.WithOrder(0) ?.WithValueType(ValueType.Number) + ?.Replace(x => x.IsVisibleToClients = false) ?.ReplaceProviders( DefaultValueSettingValueProvider.ProviderName, ConfigurationSettingValueProvider.ProviderName, diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/IdentityRoleDefaultRoleChangeHandler.cs b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/IdentityRoleDefaultRoleChangeHandler.cs index 419481dba..de611f4aa 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/IdentityRoleDefaultRoleChangeHandler.cs +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/IdentityRoleDefaultRoleChangeHandler.cs @@ -22,7 +22,8 @@ public class IdentityRoleDefaultRoleChangeHandler : } public async virtual Task HandleEventAsync(EntityChangedEventData eventData) { - if (eventData.Entity.Name.Equals(AbpRoleConsts.AdminRoleName, StringComparison.CurrentCultureIgnoreCase) && + if (eventData.Entity.IsDefault && + eventData.Entity.Name.Equals(AbpRoleConsts.AdminRoleName, StringComparison.CurrentCultureIgnoreCase) && await SettingProvider.IsTrueAsync(IdentitySettingNames.Security.ProhibitDefaultAdminRole)) { throw new BusinessException( diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Session/LINGYUN/Abp/Identity/Session/DefaultIdentitySessionChecker.cs b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Session/LINGYUN/Abp/Identity/Session/DefaultIdentitySessionChecker.cs index 6bb746682..4c393bc2c 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Session/LINGYUN/Abp/Identity/Session/DefaultIdentitySessionChecker.cs +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Session/LINGYUN/Abp/Identity/Session/DefaultIdentitySessionChecker.cs @@ -44,8 +44,9 @@ public class DefaultIdentitySessionChecker : IIdentitySessionChecker, ITransient public async virtual Task ValidateSessionAsync(ClaimsPrincipal claimsPrincipal, CancellationToken cancellationToken = default) { + var userId = claimsPrincipal.FindImpersonatorUserId() ?? claimsPrincipal.FindUserId(); var sessionId = claimsPrincipal.FindSessionId(); - if (sessionId.IsNullOrWhiteSpace()) + if (!userId.HasValue || sessionId.IsNullOrWhiteSpace()) { Logger.LogDebug("No user session id found."); return false; @@ -54,7 +55,15 @@ public class DefaultIdentitySessionChecker : IIdentitySessionChecker, ITransient var identitySessionCacheItem = await IdentitySessionCache.GetAsync(sessionId, cancellationToken); if (identitySessionCacheItem == null) { - Logger.LogDebug($"No user session cache found for: {sessionId}."); + Logger.LogDebug("No user session cache found for: {sessionId}.", sessionId); + return false; + } + if (identitySessionCacheItem.UserId != userId.Value) + { + Logger.LogWarning("User session does not match. There might be a forged token. User ID: {userId}, Session ID: {sessionId}", + userId, sessionId); + Logger.LogWarning("The session is insecure and the leaked tokens have been forcibly cleared."); + await IdentitySessionCache.RemoveAsync(sessionId, cancellationToken); return false; }