Skip to content

fix: ensure permissions are not None before checking their scopes #6937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wxg0103 merged 1 commit into from
Sep 7, 2026
Merged

fix: ensure permissions are not None before checking their scopes #6937

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions apps/common/auth/handle/impl/user_token.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ def get_permissions(
if _resource_permission in ["VIEW", "MANAGE"]
]
)
all_permissions = [_permission for _permission in all_permissions if _permission is not None]
for group, permissions in group_by(
all_permissions, lambda _permission: _permission.value.group
).items():
Expand All @@ -109,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 PermissionScopeConstants.WORKSPACE in p.meta.scope:
if p is not None and PermissionScopeConstants.WORKSPACE in p.meta.scope:
permissions.append(p)

for group, ps in group_by(permissions, lambda p: p.meta.group).items():
Expand All @@ -128,7 +129,7 @@ def get_permissions(
permissions = [
_permission
for _permission in permissions
if PermissionScopeConstants.WORKSPACE in _permission.meta.scope
if _permission is not None and PermissionScopeConstants.WORKSPACE in _permission.meta.scope
]
for group, ps in group_by(permissions, lambda p: p.meta.group).items():
k = f"{group}:w:{_.workspace_id}"
Expand All @@ -142,7 +143,7 @@ def get_permissions(
system_permissions = [
_permission
for _permission in system_permissions
if PermissionScopeConstants.SYSTEM in _permission.meta.scope
if _permission is not None and PermissionScopeConstants.SYSTEM in _permission.meta.scope
]
for group, permissions in group_by(system_permissions, lambda _permission: _permission.meta.group).items():
permission_map[f"{group}"] = reduce(
Expand Down
Loading