From 670315e89c5915f8b79118aced347c09d296a687 Mon Sep 17 00:00:00 2001 From: panxinying Date: Fri, 9 Oct 2026 11:42:50 +0800 Subject: [PATCH] fix: key format and scope permission error --- apps/common/auth/constants/permission_constants.py | 4 ++-- apps/common/auth/handle/impl/user_token.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/common/auth/constants/permission_constants.py b/apps/common/auth/constants/permission_constants.py index 682e272b281..7850b3531d3 100644 --- a/apps/common/auth/constants/permission_constants.py +++ b/apps/common/auth/constants/permission_constants.py @@ -353,7 +353,7 @@ class PermissionConstants(Enum): role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, resource_permission_group_list=[ResourcePermissionConst.TOOL_MANAGE], - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE], ), ) @@ -363,7 +363,7 @@ class PermissionConstants(Enum): role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, resource_permission_group_list=[ResourcePermissionConst.TOOL_MANAGE], - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE], ), ) diff --git a/apps/common/auth/handle/impl/user_token.py b/apps/common/auth/handle/impl/user_token.py index cd65515dfab..7ad89a8851c 100644 --- a/apps/common/auth/handle/impl/user_token.py +++ b/apps/common/auth/handle/impl/user_token.py @@ -100,7 +100,7 @@ def get_permissions( for group, permissions in group_by( all_permissions, lambda _permission: _permission.value.group ).items(): - k = f"{group}:{_.workspace_id}:{_.target}" + k = f"{group}:w:{_.workspace_id}:r:{_.target}" bits = reduce(lambda x, y: x | y, [_permission.value.bit() for _permission in permissions], 0) permission_map[k] = permission_map.get(k, 0) | bits elif _.auth_type == ResourceAuthType.ROLE: @@ -110,7 +110,7 @@ def get_permissions( for role_id in role_ids: for m in role_permission_mapping_dict.get(str(role_id)) or []: p = PERMISSION_STR_MAP.get(m.permission_id) - if p is not None and PermissionScopeConstants.WORKSPACE in p.meta.scope: + if p is not None and PermissionScopeConstants.WORKSPACE_RESOURCE in p.meta.scope: permissions.append(p) for group, ps in group_by(permissions, lambda p: p.value.group).items():