Skip to content

fix: enhance permission handling by adding WORKSPACE_MANAGE role to user group and workspace access #7503

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
Oct 28, 2026
Merged

fix: enhance permission handling by adding WORKSPACE_MANAGE role to user group and workspace access #7503

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
43 changes: 27 additions & 16 deletions apps/users/views/system_user_group.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,19 @@
from common.log.log import log
from models_provider.api.model import DefaultModelResponse
from users.api.user_group import (
AddMemberApi, CreateUserGroupApi, DeleteUserGroupApi,
RemoveMemberApi, UserGroupListApi, UserGroupListPageApi
AddMemberApi,
CreateUserGroupApi,
DeleteUserGroupApi,
RemoveMemberApi,
UserGroupListApi,
UserGroupListPageApi,
)
from users.models.user_group import SystemUserGroup
from users.serializers.user_group import (
SystemUserGroupCreateSerializer,
UserGroupAddMemberSerializer,
UserGroupRemoveMemberSerializer,
UserGroupListPageSerializer
UserGroupListPageSerializer,
)


Expand Down Expand Up @@ -52,9 +56,9 @@ class SystemUserGroupView(APIView):
responses=CreateUserGroupApi.get_response(),
tags=["IAM/System User Group"],
)
@has_permissions(PermissionConstants.SYSTEM_USER_GROUP_CREATE,
PermissionConstants.SYSTEM_USER_GROUP_EDIT,
RoleConstants.ADMIN)
@has_permissions(
PermissionConstants.SYSTEM_USER_GROUP_CREATE, PermissionConstants.SYSTEM_USER_GROUP_EDIT, RoleConstants.ADMIN
)
@log(
menu="IAM/System User Group",
operate="Create or update System User Group",
Expand All @@ -79,11 +83,9 @@ def post(self, request: Request, workspace_id: str):
responses=UserGroupListApi.get_response(),
tags=["IAM/System User Group"],
)
@has_permissions(PermissionConstants.SYSTEM_USER_GROUP_READ, RoleConstants.ADMIN)
@has_permissions(PermissionConstants.SYSTEM_USER_GROUP_READ, RoleConstants.ADMIN, RoleConstants.WORKSPACE_MANAGE)
def get(self, request: Request, workspace_id: str):
return result.success(SystemUserGroupCreateSerializer.Query(
data={'workspace_id': workspace_id}
).list())
return result.success(SystemUserGroupCreateSerializer.Query(data={"workspace_id": workspace_id}).list())

class Delete(APIView):
authentication_classes = [TokenAuth]
Expand All @@ -106,7 +108,8 @@ class Delete(APIView):
def delete(self, request: Request, workspace_id, user_group_id: str):
return result.success(
SystemUserGroupCreateSerializer.UserGroupDeleteSerializer(
data={"id": user_group_id, "workspace_id": workspace_id}).delete()
data={"id": user_group_id, "workspace_id": workspace_id}
).delete()
)

class AddMember(APIView):
Expand All @@ -130,8 +133,11 @@ class AddMember(APIView):
def post(self, request: Request, workspace_id: str, user_group_id: str):
return result.success(
UserGroupAddMemberSerializer(
data={"id": user_group_id, "workspace_id": workspace_id,
"user_ids": request.data.get("user_ids", [])}
data={
"id": user_group_id,
"workspace_id": workspace_id,
"user_ids": request.data.get("user_ids", []),
}
).add_member()
)

Expand All @@ -156,8 +162,11 @@ class RemoveMember(APIView):
def delete(self, request: Request, workspace_id: str, user_group_id: str):
return result.success(
UserGroupRemoveMemberSerializer(
data={"id": user_group_id, "workspace_id": workspace_id,
"group_relation_ids": request.data.get("group_relation_ids", [])}
data={
"id": user_group_id,
"workspace_id": workspace_id,
"group_relation_ids": request.data.get("group_relation_ids", []),
}
).remove_member()
)

Expand All @@ -173,7 +182,9 @@ class UserList(APIView):
parameters=UserGroupListPageApi.get_parameters(),
responses=UserGroupListPageApi.get_response(),
)
@has_permissions(PermissionConstants.SYSTEM_USER_GROUP_READ, RoleConstants.ADMIN)
@has_permissions(
PermissionConstants.SYSTEM_USER_GROUP_READ, RoleConstants.ADMIN, RoleConstants.WORKSPACE_MANAGE
)
def get(self, request: Request, workspace_id: str, user_group_id: str, current_page: int, page_size: int):
d = UserGroupListPageSerializer.Query(
data={
Expand Down
Loading