15308555518/ MaxKB
1
0
Fork 0
mirror of https://github.com/1Panel-dev/MaxKB.git synced 2025-12-26 10:12:51 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

feat: update account lock logic and modify workspace ID requirements in role settings

This commit is contained in:
wxg0103 2025-12-26 10:35:26 +08:00
parent d9a655190b
commit fcaac9c11a
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/users/api/user.py
View File

@ -25,8 +25,8 @@ class ApiUserProfileResponse(ResultSerializer):
class RoleSettingRequestSerializer(serializers.Serializer):
role_id = serializers.CharField(required=True, label=_('Role ID'))
workspace_ids = serializers.ListField(
child=serializers.CharField(required=True),
required=True,
child=serializers.CharField(required=False),
required=False,
label=_('Workspace IDs')
)

6
apps/users/serializers/login.py
View File

@ -106,7 +106,7 @@ class LoginSerializer(serializers.Serializer):
if is_license_valid:
# 检查账户是否被锁定
if LoginSerializer._is_account_locked(username):
if LoginSerializer._is_account_locked(username, failed_attempts):
raise AppApiException(
1005,
_("This account has been locked for %s minutes, please try again later") % lock_time
@ -146,8 +146,10 @@ class LoginSerializer(serializers.Serializer):
return {'token': token}
@staticmethod
def _is_account_locked(username: str) -> bool:
def _is_account_locked(username: str, failed_attempts: int) -> bool:
"""检查账户是否被锁定"""
if failed_attempts == -1:
return False
lock_cache = cache.get(system_get_key(f'system_{username}_lock'), version=system_version)
return bool(lock_cache)