github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-20 11:00:35 +00:00
Code Issues Projects Releases Wiki Activity

perf: 优化 UserPermTreeUtil 逻辑(进行中)

Browse Source
This commit is contained in:
Bai
2022-12-08 19:30:16 +08:00
committed by Jiangjie.Bai
parent 8beb1b81cf
commit 4f5cc56b00
8 changed files with 210 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
apps/perms/utils/permission.py
View File

@@ -1,5 +1,8 @@
from django.db.models import QuerySet, Model
from collections.abc import Iterable
from assets.models import Node, Asset
from common.utils import get_logger
from perms.models import AssetPermission
logger = get_logger(__file__)
@@ -41,14 +44,16 @@ class AssetPermissionUtil(object):
perms = self.get_permissions(ids=group_perm_ids)
return perms
def get_permissions_for_asset(self, asset, with_node=True, flat=False):
def get_permissions_for_assets(self, assets, with_node=True, flat=False):
""" 获取资产的授权规则"""
perm_ids = set()
asset_perm_ids = AssetPermission.assets.through.objects.filter(asset_id=asset.id) \
.values_list('assetpermission_id', flat=True).distinct()
assets = self.transform_to_queryset(assets, Asset)
asset_ids = [str(a.id) for a in assets]
relations = AssetPermission.assets.through.objects.filter(asset_id__in=asset_ids)
asset_perm_ids = relations.values_list('assetpermission_id', flat=True).distinct()
perm_ids.update(asset_perm_ids)
if with_node:
nodes = asset.get_all_nodes()
nodes = Asset.get_all_nodes_for_assets(assets)
node_perm_ids = self.get_permissions_for_nodes(nodes, flat=True)
perm_ids.update(node_perm_ids)
if flat:
@@ -58,16 +63,12 @@ class AssetPermissionUtil(object):
def get_permissions_for_nodes(self, nodes, with_ancestor=False, flat=False):
""" 获取节点的授权规则 """
nodes = self.transform_to_queryset(nodes, Node)
if with_ancestor:
node_ids = set()
for node in nodes:
_nodes = node.get_ancestors(with_self=True)
_node_ids = _nodes.values_list('id', flat=True).distinct()
node_ids.update(_node_ids)
else:
node_ids = nodes.values_list('id', flat=True).distinct()
perm_ids = AssetPermission.nodes.through.objects.filter(node_id__in=node_ids) \
.values_list('assetpermission_id', flat=True).distinct()
nodes = Node.get_ancestor_queryset(nodes)
node_ids = nodes.values_list('id', flat=True).distinct()
relations = AssetPermission.nodes.through.objects.filter(node_id__in=node_ids)
perm_ids = relations.values_list('assetpermission_id', flat=True).distinct()
if flat:
return perm_ids
perms = self.get_permissions(ids=perm_ids)
@@ -76,14 +77,14 @@ class AssetPermissionUtil(object):
def get_permissions_for_user_asset(self, user, asset):
""" 获取同时包含用户、资产的授权规则 """
user_perm_ids = self.get_permissions_for_user(user, flat=True)
asset_perm_ids = self.get_permissions_for_asset(asset, flat=True)
asset_perm_ids = self.get_permissions_for_assets([asset], flat=True)
perm_ids = set(user_perm_ids) & set(asset_perm_ids)
perms = self.get_permissions(ids=perm_ids)
return perms
def get_permissions_for_user_group_asset(self, user_group, asset):
user_perm_ids = self.get_permissions_for_user_groups([user_group], flat=True)
asset_perm_ids = self.get_permissions_for_asset(asset, flat=True)
asset_perm_ids = self.get_permissions_for_assets([asset], flat=True)
perm_ids = set(user_perm_ids) & set(asset_perm_ids)
perms = self.get_permissions(ids=perm_ids)
return perms
@@ -92,3 +93,15 @@ class AssetPermissionUtil(object):
def get_permissions(ids):
perms = AssetPermission.objects.filter(id__in=ids).order_by('-date_expired')
return perms
@staticmethod
def transform_to_queryset(objs_or_ids, model):
if not objs_or_ids:
return objs_or_ids
if isinstance(objs_or_ids, QuerySet):
return objs_or_ids
ids = [str(o.id) if isinstance(o, model) else o for o in objs_or_ids]
return model.objects.filter(id__in=ids)