zhuchaowe/maxkb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Community user permissions (#3465)

Browse Source
This commit is contained in:
shaohuzhang1 2025-07-03 15:30:28 +08:00 committed by GitHub
parent e0075c3dd5
commit c2256a5305
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/common/auth/handle/impl/user_token.py
View File

@ -195,7 +195,7 @@ def get_permission_list(user,
else: else:
workspace_id_list = ['default'] workspace_id_list = ['default']
workspace_user_resource_permission_list = QuerySet(WorkspaceUserResourcePermission).filter( workspace_user_resource_permission_list = QuerySet(WorkspaceUserResourcePermission).filter(
workspace_id__in=workspace_id_list) workspace_id__in=workspace_id_list, user_id=user_id)
role_permission_mapping_list = get_default_role_permission_mapping_list() role_permission_mapping_list = get_default_role_permission_mapping_list()
role_permission_mapping_dict = group_by(role_permission_mapping_list, lambda item: item.role_id) role_permission_mapping_dict = group_by(role_permission_mapping_list, lambda item: item.role_id)
workspace_user_role_mapping_list = get_default_workspace_user_role_mapping_list([user.role]) workspace_user_role_mapping_list = get_default_workspace_user_role_mapping_list([user.role])
@ -206,15 +206,8 @@ def get_permission_list(user,
workspace_user_resource_permission_list, workspace_user_resource_permission_list,
role_permission_mapping_dict, role_permission_mapping_dict,
workspace_user_role_mapping_dict) workspace_user_role_mapping_dict)
workspace_permission_list = get_workspace_permission_list(role_permission_mapping_dict,
workspace_user_role_mapping_list, {})
# 系统权限
system_permission_list = [role_permission_mapping.permission_id for role_permission_mapping in
role_permission_mapping_list if
[user.role].__contains__(role_permission_mapping.role_id)]
# 合并权限 # 合并权限
permission_list = system_permission_list + workspace_permission_list + workspace_resource_permission_list permission_list = workspace_resource_permission_list
permission_list = list(set(permission_list)) permission_list = list(set(permission_list))
cache.set(key, permission_list, version=version) cache.set(key, permission_list, version=version)
return permission_list return permission_list
@ -271,9 +264,10 @@ def get_role_list(user,
cache.set(key, workspace_list, version=version) cache.set(key, workspace_list, version=version)
return role_list return role_list
else: else:
role_list = [user.role]
if user.role == RoleConstants.ADMIN.value.__str__(): if user.role == RoleConstants.ADMIN.value.__str__():
role_list = [user.role, get_role_permission(RoleConstants.WORKSPACE_MANAGE, 'default')] role_list = [user.role, get_role_permission(RoleConstants.WORKSPACE_MANAGE, 'default')]
else:
role_list = [user.role, get_role_permission(RoleConstants.USER, 'default')]
cache.set(key, role_list, version=version) cache.set(key, role_list, version=version)
return role_list return role_list
return workspace_list return workspace_list