Browse Source

Merge pull request #1572 from colinin/enhance-security

Enhance security
pull/1586/head
yx lin 2 months ago
committed by GitHub
parent
commit
384798e804
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 1
      apps/vben5/packages/@abp/settings/src/components/settings/SettingForm.vue
  2. 8
      aspnet-core/framework/settings/LINGYUN.Abp.Settings/Volo/Abp/Settings/SettingDefinitionExtensions.cs
  3. 4
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain.Shared/LINGYUN/Abp/Identity/Localization/zh-Hans.json
  4. 20
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/IdentityGroupSettingDefinitionProvider.cs
  5. 3
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/IdentityRoleDefaultRoleChangeHandler.cs
  6. 13
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.Session/LINGYUN/Abp/Identity/Session/DefaultIdentitySessionChecker.cs

1
apps/vben5/packages/@abp/settings/src/components/settings/SettingForm.vue

@ -238,6 +238,7 @@ onMounted(onGet);
</Tabs> </Tabs>
</Form> </Form>
<Empty <Empty
v-else
:description=" :description="
$t('AbpFeature.Volo_Feature:010001', { $t('AbpFeature.Volo_Feature:010001', {
FeatureName: $t( FeatureName: $t(

8
aspnet-core/framework/settings/LINGYUN.Abp.Settings/Volo/Abp/Settings/SettingDefinitionExtensions.cs

@ -17,6 +17,14 @@ public static class SettingDefinitionExtensions
private const string RequiredFeaturesKey = "RequiredFeatures"; private const string RequiredFeaturesKey = "RequiredFeatures";
private const string RequiredPermissionsKey = "RequiredPermissions"; private const string RequiredPermissionsKey = "RequiredPermissions";
public static SettingDefinition Replace(
this SettingDefinition definition,
Action<SettingDefinition> configure)
{
configure.Invoke(definition);
return definition;
}
public static SettingDefinition RequiredFeatures( public static SettingDefinition RequiredFeatures(
this SettingDefinition definition, this SettingDefinition definition,
IEnumerable<string> requiredFeatures) IEnumerable<string> requiredFeatures)

4
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": "设置用户登录链接,用于外部认证用户重定向.", "Description:Abp.Identity.Link.UserLoginUri": "设置用户登录链接,用于外部认证用户重定向.",
"DisplayName:Abp.Identity.TwoFactorBehaviour": "双因素身份验证行为", "DisplayName:Abp.Identity.TwoFactorBehaviour": "双因素身份验证行为",
"Description:Abp.Identity.TwoFactorBehaviour": "双因素身份验证行为", "Description:Abp.Identity.TwoFactorBehaviour": "双因素身份验证行为",
"DisplayName:Abp.Identity.UsersCanChangeTwoFactor": "允许用户更改其因素身份验证", "DisplayName:Abp.Identity.UsersCanChangeTwoFactor": "允许用户更改其双因素身份验证",
"Description:Abp.Identity.UsersCanChangeTwoFactor": "允许用户更改其因素身份验证.", "Description:Abp.Identity.UsersCanChangeTwoFactor": "允许用户更改其双因素身份验证.",
"DisplayName:Abp.Identity.AdminRoleTwoFactorForceEnabled": "管理员角色强制启用二次认证", "DisplayName:Abp.Identity.AdminRoleTwoFactorForceEnabled": "管理员角色强制启用二次认证",
"Description:Abp.Identity.AdminRoleTwoFactorForceEnabled": "管理员角色登录时强制使用二次认证.", "Description:Abp.Identity.AdminRoleTwoFactorForceEnabled": "管理员角色登录时强制使用二次认证.",
"DisplayName:Abp.Identity.ProhibitDefaultAdminRole": "禁止设置管理员默认角色", "DisplayName:Abp.Identity.ProhibitDefaultAdminRole": "禁止设置管理员默认角色",

20
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) ?.WithParent("Lockout", L("Settings:Identity.Lockout"), order: 3)
?.WithOrder(0) ?.WithOrder(0)
?.WithValueType(ValueType.Boolean) ?.WithValueType(ValueType.Boolean)
?.Replace(x => x.IsVisibleToClients = false)
?.ReplaceProviders( ?.ReplaceProviders(
DefaultValueSettingValueProvider.ProviderName, DefaultValueSettingValueProvider.ProviderName,
ConfigurationSettingValueProvider.ProviderName, ConfigurationSettingValueProvider.ProviderName,
@ -37,6 +38,7 @@ public class IdentityGroupSettingDefinitionProvider : SettingDefinitionProvider
?.WithParent("Lockout", L("Settings:Identity.Lockout"), order: 3) ?.WithParent("Lockout", L("Settings:Identity.Lockout"), order: 3)
?.WithOrder(1) ?.WithOrder(1)
?.WithValueType(ValueType.Number) ?.WithValueType(ValueType.Number)
?.Replace(x => x.IsVisibleToClients = false)
?.ReplaceProviders( ?.ReplaceProviders(
DefaultValueSettingValueProvider.ProviderName, DefaultValueSettingValueProvider.ProviderName,
ConfigurationSettingValueProvider.ProviderName, ConfigurationSettingValueProvider.ProviderName,
@ -47,6 +49,7 @@ public class IdentityGroupSettingDefinitionProvider : SettingDefinitionProvider
?.WithParent("Lockout", L("Settings:Identity.Lockout"), order: 3) ?.WithParent("Lockout", L("Settings:Identity.Lockout"), order: 3)
?.WithOrder(2) ?.WithOrder(2)
?.WithValueType(ValueType.Number) ?.WithValueType(ValueType.Number)
?.Replace(x => x.IsVisibleToClients = false)
?.ReplaceProviders( ?.ReplaceProviders(
DefaultValueSettingValueProvider.ProviderName, DefaultValueSettingValueProvider.ProviderName,
ConfigurationSettingValueProvider.ProviderName, ConfigurationSettingValueProvider.ProviderName,
@ -189,6 +192,11 @@ public class IdentityGroupSettingDefinitionProvider : SettingDefinitionProvider
?.WithParent("Password", L("Settings:Identity.Password"), order: 4) ?.WithParent("Password", L("Settings:Identity.Password"), order: 4)
?.WithOrder(6) ?.WithOrder(6)
?.WithValueType(ValueType.Boolean) ?.WithValueType(ValueType.Boolean)
?.Replace(x =>
{
x.IsVisibleToClients = false;
x.DefaultValue = true.ToString();
})
?.ReplaceProviders( ?.ReplaceProviders(
DefaultValueSettingValueProvider.ProviderName, DefaultValueSettingValueProvider.ProviderName,
ConfigurationSettingValueProvider.ProviderName, ConfigurationSettingValueProvider.ProviderName,
@ -199,6 +207,11 @@ public class IdentityGroupSettingDefinitionProvider : SettingDefinitionProvider
?.WithParent("Password", L("Settings:Identity.Password"), order: 4) ?.WithParent("Password", L("Settings:Identity.Password"), order: 4)
?.WithOrder(7) ?.WithOrder(7)
?.WithValueType(ValueType.Number) ?.WithValueType(ValueType.Number)
?.Replace(x =>
{
x.IsVisibleToClients = false;
x.DefaultValue = 30.ToString();
})
?.ReplaceProviders( ?.ReplaceProviders(
DefaultValueSettingValueProvider.ProviderName, DefaultValueSettingValueProvider.ProviderName,
ConfigurationSettingValueProvider.ProviderName, ConfigurationSettingValueProvider.ProviderName,
@ -209,6 +222,11 @@ public class IdentityGroupSettingDefinitionProvider : SettingDefinitionProvider
?.WithParent("Password", L("Settings:Identity.Password"), order: 4) ?.WithParent("Password", L("Settings:Identity.Password"), order: 4)
?.WithOrder(8) ?.WithOrder(8)
?.WithValueType(ValueType.Boolean) ?.WithValueType(ValueType.Boolean)
?.Replace(x =>
{
x.IsVisibleToClients = false;
x.DefaultValue = true.ToString();
})
?.ReplaceProviders( ?.ReplaceProviders(
DefaultValueSettingValueProvider.ProviderName, DefaultValueSettingValueProvider.ProviderName,
ConfigurationSettingValueProvider.ProviderName, ConfigurationSettingValueProvider.ProviderName,
@ -219,6 +237,7 @@ public class IdentityGroupSettingDefinitionProvider : SettingDefinitionProvider
?.WithParent("Password", L("Settings:Identity.Password"), order: 4) ?.WithParent("Password", L("Settings:Identity.Password"), order: 4)
?.WithOrder(9) ?.WithOrder(9)
?.WithValueType(ValueType.Number) ?.WithValueType(ValueType.Number)
?.Replace(x => x.IsVisibleToClients = false)
?.ReplaceProviders( ?.ReplaceProviders(
DefaultValueSettingValueProvider.ProviderName, DefaultValueSettingValueProvider.ProviderName,
ConfigurationSettingValueProvider.ProviderName, ConfigurationSettingValueProvider.ProviderName,
@ -233,6 +252,7 @@ public class IdentityGroupSettingDefinitionProvider : SettingDefinitionProvider
?.WithParent("OrganizationUnit", L("Settings:Identity.OrganizationUnit"), order: 7) ?.WithParent("OrganizationUnit", L("Settings:Identity.OrganizationUnit"), order: 7)
?.WithOrder(0) ?.WithOrder(0)
?.WithValueType(ValueType.Number) ?.WithValueType(ValueType.Number)
?.Replace(x => x.IsVisibleToClients = false)
?.ReplaceProviders( ?.ReplaceProviders(
DefaultValueSettingValueProvider.ProviderName, DefaultValueSettingValueProvider.ProviderName,
ConfigurationSettingValueProvider.ProviderName, ConfigurationSettingValueProvider.ProviderName,

3
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<IdentityRole> eventData) public async virtual Task HandleEventAsync(EntityChangedEventData<IdentityRole> 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)) await SettingProvider.IsTrueAsync(IdentitySettingNames.Security.ProhibitDefaultAdminRole))
{ {
throw new BusinessException( throw new BusinessException(

13
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<bool> ValidateSessionAsync(ClaimsPrincipal claimsPrincipal, CancellationToken cancellationToken = default) public async virtual Task<bool> ValidateSessionAsync(ClaimsPrincipal claimsPrincipal, CancellationToken cancellationToken = default)
{ {
var userId = claimsPrincipal.FindImpersonatorUserId() ?? claimsPrincipal.FindUserId();
var sessionId = claimsPrincipal.FindSessionId(); var sessionId = claimsPrincipal.FindSessionId();
if (sessionId.IsNullOrWhiteSpace()) if (!userId.HasValue || sessionId.IsNullOrWhiteSpace())
{ {
Logger.LogDebug("No user session id found."); Logger.LogDebug("No user session id found.");
return false; return false;
@ -54,7 +55,15 @@ public class DefaultIdentitySessionChecker : IIdentitySessionChecker, ITransient
var identitySessionCacheItem = await IdentitySessionCache.GetAsync(sessionId, cancellationToken); var identitySessionCacheItem = await IdentitySessionCache.GetAsync(sessionId, cancellationToken);
if (identitySessionCacheItem == null) 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; return false;
} }

Loading…
Cancel
Save