mirror of
https://github.com/jumpserver/jumpserver.git
synced 2025-09-11 04:09:45 +00:00
perf: 合并授权规则用户相关的 API URL,统一使用 /<str:user>/ 格式
This commit is contained in:
@@ -7,7 +7,6 @@ from django.utils.translation import ugettext_lazy as _
|
||||
from common.http import is_true
|
||||
from common.utils import is_uuid
|
||||
from common.exceptions import JMSObjectDoesNotExist
|
||||
from common.mixins.api import RoleAdminMixin, RoleUserMixin
|
||||
from perms.utils.user_permission import UserGrantedTreeRefreshController
|
||||
from rbac.permissions import RBACPermission
|
||||
from users.models import User
|
||||
@@ -23,24 +22,6 @@ class RebuildTreeMixin:
|
||||
return super().get(request, *args, **kwargs)
|
||||
|
||||
|
||||
class AssetRoleAdminMixin(RebuildTreeMixin, RoleAdminMixin):
|
||||
rbac_perms = (
|
||||
('list', 'perms.view_userassets'),
|
||||
('retrieve', 'perms.view_userassets'),
|
||||
('get_tree', 'perms.view_userassets'),
|
||||
('GET', 'perms.view_userassets'),
|
||||
)
|
||||
|
||||
|
||||
class AssetRoleUserMixin(RebuildTreeMixin, RoleUserMixin):
|
||||
rbac_perms = (
|
||||
('list', 'perms.view_myassets'),
|
||||
('retrieve', 'perms.view_myassets'),
|
||||
('get_tree', 'perms.view_myassets'),
|
||||
('GET', 'perms.view_myassets'),
|
||||
)
|
||||
|
||||
|
||||
class SelfOrPKUserMixin:
|
||||
kwargs: dict
|
||||
request: Request
|
||||
@@ -59,6 +40,7 @@ class SelfOrPKUserMixin:
|
||||
('retrieve', 'perms.view_myassets'),
|
||||
('get_tree', 'perms.view_myassets'),
|
||||
('GET', 'perms.view_myassets'),
|
||||
('OPTIONS', 'perms.view_myassets'),
|
||||
)
|
||||
|
||||
@property
|
||||
@@ -68,6 +50,7 @@ class SelfOrPKUserMixin:
|
||||
('retrieve', 'perms.view_userassets'),
|
||||
('get_tree', 'perms.view_userassets'),
|
||||
('GET', 'perms.view_userassets'),
|
||||
('OPTIONS', 'perms.view_userassets'),
|
||||
)
|
||||
|
||||
@property
|
||||
@@ -76,6 +59,8 @@ class SelfOrPKUserMixin:
|
||||
user = self.request.user
|
||||
elif is_uuid(self.kwargs.get('user')):
|
||||
user = get_object_or_404(User, pk=self.kwargs.get('user'))
|
||||
elif hasattr(self, 'swagger_fake_view'):
|
||||
user = self.request.user
|
||||
else:
|
||||
raise JMSObjectDoesNotExist(object_name=_('User'))
|
||||
return user
|
||||
|
Reference in New Issue
Block a user