Skip to content
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

Add safe delete role logic #338

Merged
merged 1 commit into from
Sep 5, 2024
Merged

Add safe delete role logic #338

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions src/spaceone/identity/error/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,7 @@ class ERROR_ROLE_DOES_NOT_EXIST_OF_USER(ERROR_NOT_FOUND):

class ERROR_NOT_ALLOWED_TO_DELETE_ROLE_BINDING(ERROR_INVALID_ARGUMENT):
_message = "Not allowed to delete role binding. (workspace_group_id = {workspace_group_id}, role_binding_id = {role_binding_id})"


class ERROR_ROLE_IN_USED_AT_ROLE_BINDING(ERROR_INVALID_ARGUMENT):
_message = "Role is in used at RoleBinding. (role_id = {role_id})"
10 changes: 10 additions & 0 deletions src/spaceone/identity/service/role_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
from spaceone.core.service import *
from spaceone.core.service.utils import *

from spaceone.identity.error.custom import ERROR_ROLE_IN_USED_AT_ROLE_BINDING
from spaceone.identity.manager.role_binding_manager import RoleBindingManager
from spaceone.identity.manager.role_manager import RoleManager
from spaceone.identity.model.role.request import *
from spaceone.identity.model.role.request import BasicRoleSearchQueryRequest
Expand All @@ -23,6 +25,7 @@ class RoleService(BaseService):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.role_mgr = RoleManager()
self.rb_mgr = RoleBindingManager()

@transaction(permission="identity:Role.write", role_types=["DOMAIN_ADMIN"])
@convert_model
Expand Down Expand Up @@ -133,6 +136,13 @@ def delete(self, params: RoleDeleteRequest) -> None:
if role_vo.is_managed:
raise ERROR_PERMISSION_DENIED()

rb_vos = self.rb_mgr.filter_role_bindings(
role_id=role_vo.role_id, domain_id=role_vo.domain_id
)

if rb_vos.count() > 0:
raise ERROR_ROLE_IN_USED_AT_ROLE_BINDING(role_id=role_vo.role_id)

self.role_mgr.delete_role_by_vo(role_vo)

@transaction(
Expand Down
Loading