github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: node test refresh perm

pull/7832/head
feng626 2022-03-14 14:22:10 +08:00 committed by Jiangjie.Bai
parent 2da541c127
commit 567c1b0124
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/assets/api/node.py
View File

@ -30,7 +30,6 @@ from .. import serializers
from .mixin import SerializeToTreeNodeMixin from .mixin import SerializeToTreeNodeMixin
from assets.locks import NodeAddChildrenLock from assets.locks import NodeAddChildrenLock
logger = get_logger(__file__) logger = get_logger(__file__)
__all__ = [ __all__ = [
'NodeViewSet', 'NodeChildrenApi', 'NodeAssetsApi', 'NodeViewSet', 'NodeChildrenApi', 'NodeAssetsApi',
@ -44,7 +43,7 @@ __all__ = [
class NodeViewSet(SuggestionMixin, OrgBulkModelViewSet): class NodeViewSet(SuggestionMixin, OrgBulkModelViewSet):
model = Node model = Node
filterset_fields = ('value', 'key', 'id') filterset_fields = ('value', 'key', 'id')
search_fields = ('value', ) search_fields = ('value',)
serializer_class = serializers.NodeSerializer serializer_class = serializers.NodeSerializer
rbac_perms = { rbac_perms = {
'match': 'assets.match_node', 'match': 'assets.match_node',
@ -298,8 +297,22 @@ class MoveAssetsToNodeApi(generics.UpdateAPIView):
class NodeTaskCreateApi(generics.CreateAPIView): class NodeTaskCreateApi(generics.CreateAPIView):
perm_model = Asset
model = Node model = Node
serializer_class = serializers.NodeTaskSerializer serializer_class = serializers.NodeTaskSerializer
def check_permissions(self, request):
action = request.data.get('action')
action_perm_require = {
'refresh': 'assets.refresh_assethardwareinfo',
'test': 'assets.test_assetconnectivity'
}
perm_required = action_perm_require.get(action)
has = self.request.user.has_perm(perm_required)
if not has:
self.permission_denied(request)
def get_object(self): def get_object(self):
node_id = self.kwargs.get('pk') node_id = self.kwargs.get('pk')
node = get_object_or_none(self.model, id=node_id) node = get_object_or_none(self.model, id=node_id)
@ -331,4 +344,3 @@ class NodeTaskCreateApi(generics.CreateAPIView):
else: else:
task = test_node_assets_connectivity_manual.delay(node) task = test_node_assets_connectivity_manual.delay(node)
self.set_serializer_data(serializer, task) self.set_serializer_data(serializer, task)