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

Merge pull request #2960 from jumpserver/dev_bai 

[Update] 获取用户授权资产时只返回资产协议支持的系统用户
pull/2965/head
BaiJiangJie 2019-07-16 13:33:47 +08:00 committed by GitHub
parent 4d1da1d292 f19f28cf3e
commit 9455a1c3c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/perms/api/mixin.py
View File

@ -174,6 +174,8 @@ class GrantAssetsMixin(LabelFilterMixin):
system_user = system_users_map.get(sid) system_user = system_users_map.get(sid)
if not system_user: if not system_user:
continue continue
if not asset.has_protocol(system_user.protocol):
continue
system_user.actions = action system_user.actions = action
system_users_granted.append(system_user) system_users_granted.append(system_user)
asset.system_users_granted = system_users_granted asset.system_users_granted = system_users_granted

2
apps/perms/api/user_permission.py
View File

@ -256,6 +256,8 @@ class UserGrantedNodesWithAssetsApi(UserPermissionCacheMixin, NodesWithUngroupMi
system_user = _system_users_map.get(system_user_id) system_user = _system_users_map.get(system_user_id)
if not system_user: if not system_user:
continue continue
if not asset.has_protocol(system_user.protocol):
continue
system_user.actions = action system_user.actions = action
system_user_granted.append(system_user) system_user_granted.append(system_user)
asset.system_users_granted = system_user_granted asset.system_users_granted = system_user_granted