Commit f4c31d8e authored by ibuler's avatar ibuler

[Update] 修改权限判断

parent 1c56ba5a
...@@ -154,7 +154,7 @@ class Asset(models.Model): ...@@ -154,7 +154,7 @@ class Asset(models.Model):
return False, warning return False, warning
def is_unixlike(self): def is_unixlike(self):
if self.platform not in ("Windows",): if self.platform not in ("Windows", "Windows2016"):
return True return True
else: else:
return False return False
......
...@@ -73,10 +73,7 @@ class UserGrantedAssetsApi(ListAPIView): ...@@ -73,10 +73,7 @@ class UserGrantedAssetsApi(ListAPIView):
util = AssetPermissionUtil(user) util = AssetPermissionUtil(user)
for k, v in util.get_assets().items(): for k, v in util.get_assets().items():
if k.is_unixlike(): system_users_granted = [s for s in v if s.protocol == k.protocol]
system_users_granted = [s for s in v if s.protocol in ['ssh', 'telnet']]
else:
system_users_granted = [s for s in v if s.protocol in ['rdp', 'telnet']]
k.system_users_granted = system_users_granted k.system_users_granted = system_users_granted
queryset.append(k) queryset.append(k)
return queryset return queryset
...@@ -124,10 +121,7 @@ class UserGrantedNodesWithAssetsApi(ListAPIView): ...@@ -124,10 +121,7 @@ class UserGrantedNodesWithAssetsApi(ListAPIView):
for node, _assets in nodes.items(): for node, _assets in nodes.items():
assets = _assets.keys() assets = _assets.keys()
for k, v in _assets.items(): for k, v in _assets.items():
if k.is_unixlike(): system_users_granted = [s for s in v if s.protocol == k.protocol]
system_users_granted = [s for s in v if s.protocol in ['ssh', 'telnet']]
else:
system_users_granted = [s for s in v if s.protocol in ['rdp', 'telnet']]
k.system_users_granted = system_users_granted k.system_users_granted = system_users_granted
node.assets_granted = assets node.assets_granted = assets
queryset.append(node) queryset.append(node)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment