From 0aa2c2016f3fd37cca7b99456e9abdaff976f25d Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Mon, 8 Mar 2021 10:08:51 +0800 Subject: [PATCH] =?UTF-8?q?perf(project):=20=E4=BC=98=E5=8C=96=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E7=9A=84=E9=A3=8E=E6=A0=BC=20(#5693)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit perf: 修改错误的地 perf: 优化写错的几个 Co-authored-by: ibuler --- apps/applications/api/mixin.py | 4 +- apps/assets/api/node.py | 4 +- apps/assets/api/system_user.py | 12 +-- apps/assets/backends/base.py | 2 +- apps/assets/backends/db.py | 6 +- apps/assets/models/favorite_asset.py | 2 +- apps/assets/models/node.py | 78 +++++++++---------- apps/assets/models/user.py | 8 +- apps/assets/signals_handler/common.py | 12 +-- .../signals_handler/node_assets_mapping.py | 6 +- apps/assets/tasks/push_system_user.py | 10 +-- apps/authentication/api/connection_token.py | 4 +- apps/common/api.py | 4 +- apps/common/const/__init__.py | 2 +- apps/common/drf/filters.py | 8 +- apps/orgs/signals_handler/common.py | 10 +-- .../api/application/user_permission/common.py | 10 +-- apps/perms/api/asset/user_group_permission.py | 24 +++--- .../perms/api/asset/user_permission/common.py | 16 ++-- .../user_permission_nodes_with_assets.py | 16 ++-- apps/perms/api/system_user_permission.py | 4 +- apps/perms/models/application_permission.py | 6 +- apps/perms/models/asset_permission.py | 8 +- apps/perms/models/base.py | 12 +-- apps/perms/signals_handler/common.py | 34 ++++---- apps/perms/utils/application/permission.py | 6 +- .../utils/application/user_permission.py | 6 +- apps/perms/utils/asset/permission.py | 13 ++-- apps/perms/utils/asset/user_permission.py | 52 ++++++------- apps/terminal/api/terminal.py | 10 +-- apps/terminal/models/session.py | 4 +- apps/tickets/handler/apply_application.py | 16 ++-- apps/tickets/handler/apply_asset.py | 16 ++-- .../meta/ticket_type/apply_application.py | 28 +++---- .../ticket/meta/ticket_type/apply_asset.py | 28 +++---- apps/users/api/user.py | 4 +- apps/users/models/user.py | 8 +- utils/generate_fake_data/resources/assets.py | 12 +-- utils/generate_fake_data/resources/perms.py | 34 ++++---- utils/generate_fake_data/resources/users.py | 6 +- 40 files changed, 272 insertions(+), 273 deletions(-) diff --git a/apps/applications/api/mixin.py b/apps/applications/api/mixin.py index dd8bc64c2..f79902b72 100644 --- a/apps/applications/api/mixin.py +++ b/apps/applications/api/mixin.py @@ -77,8 +77,8 @@ class SerializeApplicationToTreeNodeMixin: @staticmethod def filter_organizations(applications): - organizations_id = set(applications.values_list('org_id', flat=True)) - organizations = [Organization.get_instance(org_id) for org_id in organizations_id] + organization_ids = set(applications.values_list('org_id', flat=True)) + organizations = [Organization.get_instance(org_id) for org_id in organization_ids] return organizations def serialize_applications_with_org(self, applications): diff --git a/apps/assets/api/node.py b/apps/assets/api/node.py index f964b7704..09508e6e3 100644 --- a/apps/assets/api/node.py +++ b/apps/assets/api/node.py @@ -223,8 +223,8 @@ class NodeAddChildrenApi(generics.UpdateAPIView): def put(self, request, *args, **kwargs): instance = self.get_object() - nodes_id = request.data.get("nodes") - children = Node.objects.filter(id__in=nodes_id) + node_ids = request.data.get("nodes") + children = Node.objects.filter(id__in=node_ids) for node in children: node.parent = instance return Response("OK") diff --git a/apps/assets/api/system_user.py b/apps/assets/api/system_user.py index af7590579..27baaa017 100644 --- a/apps/assets/api/system_user.py +++ b/apps/assets/api/system_user.py @@ -87,13 +87,13 @@ class SystemUserTaskApi(generics.CreateAPIView): permission_classes = (IsOrgAdmin,) serializer_class = serializers.SystemUserTaskSerializer - def do_push(self, system_user, assets_id=None): - if assets_id is None: + def do_push(self, system_user, asset_ids=None): + if asset_ids is None: task = push_system_user_to_assets_manual.delay(system_user) else: username = self.request.query_params.get('username') task = push_system_user_to_assets.delay( - system_user.id, assets_id, username=username + system_user.id, asset_ids, username=username ) return task @@ -114,9 +114,9 @@ class SystemUserTaskApi(generics.CreateAPIView): system_user = self.get_object() if action == 'push': assets = [asset] if asset else assets - assets_id = [asset.id for asset in assets] - assets_id = assets_id if assets_id else None - task = self.do_push(system_user, assets_id) + asset_ids = [asset.id for asset in assets] + asset_ids = asset_ids if asset_ids else None + task = self.do_push(system_user, asset_ids) else: task = self.do_test(system_user) data = getattr(serializer, '_data', {}) diff --git a/apps/assets/backends/base.py b/apps/assets/backends/base.py index d5ce1f903..3b27a57af 100644 --- a/apps/assets/backends/base.py +++ b/apps/assets/backends/base.py @@ -40,7 +40,7 @@ class BaseBackend: return values @staticmethod - def make_assets_as_id(assets): + def make_assets_as_ids(assets): if not assets: return [] if isinstance(assets[0], Asset): diff --git a/apps/assets/backends/db.py b/apps/assets/backends/db.py index 35be8b9fd..bf31e04c8 100644 --- a/apps/assets/backends/db.py +++ b/apps/assets/backends/db.py @@ -69,9 +69,9 @@ class DBBackend(BaseBackend): self.queryset = self.queryset.filter(union_id=union_id) def _filter_assets(self, assets): - assets_id = self.make_assets_as_id(assets) - if assets_id: - self.queryset = self.queryset.filter(asset_id__in=assets_id) + asset_ids = self.make_assets_as_ids(assets) + if asset_ids: + self.queryset = self.queryset.filter(asset_id__in=asset_ids) def _filter_node(self, node): pass diff --git a/apps/assets/models/favorite_asset.py b/apps/assets/models/favorite_asset.py index 3abc69c8c..c5e6db484 100644 --- a/apps/assets/models/favorite_asset.py +++ b/apps/assets/models/favorite_asset.py @@ -16,5 +16,5 @@ class FavoriteAsset(CommonModelMixin): unique_together = ('user', 'asset') @classmethod - def get_user_favorite_assets_id(cls, user): + def get_user_favorite_asset_ids(cls, user): return cls.objects.filter(user=user).values_list('asset', flat=True) diff --git a/apps/assets/models/node.py b/apps/assets/models/node.py index 68aa300d3..9ff9c03bf 100644 --- a/apps/assets/models/node.py +++ b/apps/assets/models/node.py @@ -263,38 +263,38 @@ class NodeAllAssetsMappingMixin: orgid_nodekey_assetsid_mapping = defaultdict(dict) @classmethod - def get_node_all_assets_id_mapping(cls, org_id): - _mapping = cls.get_node_all_assets_id_mapping_from_memory(org_id) + def get_node_all_asset_ids_mapping(cls, org_id): + _mapping = cls.get_node_all_asset_ids_mapping_from_memory(org_id) if _mapping: return _mapping - _mapping = cls.get_node_all_assets_id_mapping_from_cache_or_generate_to_cache(org_id) - cls.set_node_all_assets_id_mapping_to_memory(org_id, mapping=_mapping) + _mapping = cls.get_node_all_asset_ids_mapping_from_cache_or_generate_to_cache(org_id) + cls.set_node_all_asset_ids_mapping_to_memory(org_id, mapping=_mapping) return _mapping # from memory @classmethod - def get_node_all_assets_id_mapping_from_memory(cls, org_id): + def get_node_all_asset_ids_mapping_from_memory(cls, org_id): mapping = cls.orgid_nodekey_assetsid_mapping.get(org_id, {}) return mapping @classmethod - def set_node_all_assets_id_mapping_to_memory(cls, org_id, mapping): + def set_node_all_asset_ids_mapping_to_memory(cls, org_id, mapping): cls.orgid_nodekey_assetsid_mapping[org_id] = mapping @classmethod - def expire_node_all_assets_id_mapping_from_memory(cls, org_id): + def expire_node_all_asset_ids_mapping_from_memory(cls, org_id): org_id = str(org_id) cls.orgid_nodekey_assetsid_mapping.pop(org_id, None) # get order: from memory -> (from cache -> to generate) @classmethod - def get_node_all_assets_id_mapping_from_cache_or_generate_to_cache(cls, org_id): - mapping = cls.get_node_all_assets_id_mapping_from_cache(org_id) + def get_node_all_asset_ids_mapping_from_cache_or_generate_to_cache(cls, org_id): + mapping = cls.get_node_all_asset_ids_mapping_from_cache(org_id) if mapping: return mapping - lock_key = f'KEY_LOCK_GENERATE_ORG_{org_id}_NODE_ALL_ASSETS_ID_MAPPING' + lock_key = f'KEY_LOCK_GENERATE_ORG_{org_id}_NODE_ALL_ASSET_ids_MAPPING' logger.info(f'Thread[{threading.get_ident()}] acquiring lock[{lock_key}] ...') with DistributedLock(lock_key): logger.info(f'Thread[{threading.get_ident()}] acquire lock[{lock_key}] ok') @@ -303,67 +303,67 @@ class NodeAllAssetsMappingMixin: # 这里最好先判断内存中有没有，防止同一进程的多个线程重复从 cache 中获取数据， # 但逻辑过于繁琐，直接判断 cache 吧 - _mapping = cls.get_node_all_assets_id_mapping_from_cache(org_id) + _mapping = cls.get_node_all_asset_ids_mapping_from_cache(org_id) if _mapping: return _mapping - _mapping = cls.generate_node_all_assets_id_mapping(org_id) - cls.set_node_all_assets_id_mapping_to_cache(org_id=org_id, mapping=_mapping) + _mapping = cls.generate_node_all_asset_ids_mapping(org_id) + cls.set_node_all_asset_ids_mapping_to_cache(org_id=org_id, mapping=_mapping) return _mapping @classmethod - def get_node_all_assets_id_mapping_from_cache(cls, org_id): - cache_key = cls._get_cache_key_for_node_all_assets_id_mapping(org_id) + def get_node_all_asset_ids_mapping_from_cache(cls, org_id): + cache_key = cls._get_cache_key_for_node_all_asset_ids_mapping(org_id) mapping = cache.get(cache_key) return mapping @classmethod - def set_node_all_assets_id_mapping_to_cache(cls, org_id, mapping): - cache_key = cls._get_cache_key_for_node_all_assets_id_mapping(org_id) + def set_node_all_asset_ids_mapping_to_cache(cls, org_id, mapping): + cache_key = cls._get_cache_key_for_node_all_asset_ids_mapping(org_id) cache.set(cache_key, mapping, timeout=None) @classmethod - def expire_node_all_assets_id_mapping_from_cache(cls, org_id): - cache_key = cls._get_cache_key_for_node_all_assets_id_mapping(org_id) + def expire_node_all_asset_ids_mapping_from_cache(cls, org_id): + cache_key = cls._get_cache_key_for_node_all_asset_ids_mapping(org_id) cache.delete(cache_key) @staticmethod - def _get_cache_key_for_node_all_assets_id_mapping(org_id): - return 'ASSETS_ORG_NODE_ALL_ASSETS_ID_MAPPING_{}'.format(org_id) + def _get_cache_key_for_node_all_asset_ids_mapping(org_id): + return 'ASSETS_ORG_NODE_ALL_ASSET_ids_MAPPING_{}'.format(org_id) @classmethod - def generate_node_all_assets_id_mapping(cls, org_id): + def generate_node_all_asset_ids_mapping(cls, org_id): from .asset import Asset t1 = time.time() with tmp_to_org(org_id): - nodes_id_key = Node.objects.annotate( + node_ids_key = Node.objects.annotate( char_id=output_as_string('id') ).values_list('char_id', 'key') # * 直接取出全部. filter(node__org_id=org_id)(大规模下会更慢) - nodes_assets_id = Asset.nodes.through.objects.all() \ + nodes_asset_ids = Asset.nodes.through.objects.all() \ .annotate(char_node_id=output_as_string('node_id')) \ .annotate(char_asset_id=output_as_string('asset_id')) \ .values_list('char_node_id', 'char_asset_id') node_id_ancestor_keys_mapping = { node_id: cls.get_node_ancestor_keys(node_key, with_self=True) - for node_id, node_key in nodes_id_key + for node_id, node_key in node_ids_key } nodeid_assetsid_mapping = defaultdict(set) - for node_id, asset_id in nodes_assets_id: + for node_id, asset_id in nodes_asset_ids: nodeid_assetsid_mapping[node_id].add(asset_id) t2 = time.time() mapping = defaultdict(set) - for node_id, node_key in nodes_id_key: - assets_id = nodeid_assetsid_mapping[node_id] + for node_id, node_key in node_ids_key: + asset_ids = nodeid_assetsid_mapping[node_id] node_ancestor_keys = node_id_ancestor_keys_mapping[node_id] for ancestor_key in node_ancestor_keys: - mapping[ancestor_key].update(assets_id) + mapping[ancestor_key].update(asset_ids) t3 = time.time() logger.debug('t1-t2(DB Query): {} s, t3-t2(Generate mapping): {} s'.format(t2-t1, t3-t2)) @@ -407,10 +407,10 @@ class NodeAssetsMixin(NodeAllAssetsMappingMixin): return self.get_all_assets().valid() @classmethod - def get_nodes_all_assets_ids_by_keys(cls, nodes_keys): + def get_nodes_all_asset_ids_by_keys(cls, nodes_keys): nodes = Node.objects.filter(key__in=nodes_keys) - assets_ids = cls.get_nodes_all_assets(*nodes).values_list('id', flat=True) - return assets_ids + asset_ids = cls.get_nodes_all_assets(*nodes).values_list('id', flat=True) + return asset_ids @classmethod def get_nodes_all_assets(cls, *nodes): @@ -425,16 +425,16 @@ class NodeAssetsMixin(NodeAllAssetsMappingMixin): node_ids.update(_ids) return Asset.objects.order_by().filter(nodes__id__in=node_ids).distinct() - def get_all_assets_id(self): - assets_id = self.get_all_assets_id_by_node_key(org_id=self.org_id, node_key=self.key) - return set(assets_id) + def get_all_asset_ids(self): + asset_ids = self.get_all_asset_ids_by_node_key(org_id=self.org_id, node_key=self.key) + return set(asset_ids) @classmethod - def get_all_assets_id_by_node_key(cls, org_id, node_key): + def get_all_asset_ids_by_node_key(cls, org_id, node_key): org_id = str(org_id) - nodekey_assetsid_mapping = cls.get_node_all_assets_id_mapping(org_id) - assets_id = nodekey_assetsid_mapping.get(node_key, []) - return set(assets_id) + nodekey_assetsid_mapping = cls.get_node_all_asset_ids_mapping(org_id) + asset_ids = nodekey_assetsid_mapping.get(node_key, []) + return set(asset_ids) class SomeNodesMixin: diff --git a/apps/assets/models/user.py b/apps/assets/models/user.py index 885543796..dd576b077 100644 --- a/apps/assets/models/user.py +++ b/apps/assets/models/user.py @@ -198,10 +198,10 @@ class SystemUser(BaseUser): def get_all_assets(self): from assets.models import Node nodes_keys = self.nodes.all().values_list('key', flat=True) - assets_ids = set(self.assets.all().values_list('id', flat=True)) - nodes_assets_ids = Node.get_nodes_all_assets_ids_by_keys(nodes_keys) - assets_ids.update(nodes_assets_ids) - assets = Asset.objects.filter(id__in=assets_ids) + asset_ids = set(self.assets.all().values_list('id', flat=True)) + nodes_asset_ids = Node.get_nodes_all_asset_ids_by_keys(nodes_keys) + asset_ids.update(nodes_asset_ids) + assets = Asset.objects.filter(id__in=asset_ids) return assets @classmethod diff --git a/apps/assets/signals_handler/common.py b/apps/assets/signals_handler/common.py index 6625e493e..af6a7895c 100644 --- a/apps/assets/signals_handler/common.py +++ b/apps/assets/signals_handler/common.py @@ -82,13 +82,13 @@ def on_system_user_assets_change(instance, action, model, pk_set, **kwargs): return logger.debug("System user assets change signal recv: {}".format(instance)) if model == Asset: - system_users_id = [instance.id] - assets_id = pk_set + system_user_ids = [instance.id] + asset_ids = pk_set else: - system_users_id = pk_set - assets_id = [instance.id] - for system_user_id in system_users_id: - push_system_user_to_assets.delay(system_user_id, assets_id) + system_user_ids = pk_set + asset_ids = [instance.id] + for system_user_id in system_user_ids: + push_system_user_to_assets.delay(system_user_id, asset_ids) @receiver(m2m_changed, sender=SystemUser.users.through) diff --git a/apps/assets/signals_handler/node_assets_mapping.py b/apps/assets/signals_handler/node_assets_mapping.py index d6615c885..4e2b0d07b 100644 --- a/apps/assets/signals_handler/node_assets_mapping.py +++ b/apps/assets/signals_handler/node_assets_mapping.py @@ -22,7 +22,7 @@ logger = get_logger(__file__) def get_node_assets_mapping_for_memory_pub_sub(): - return RedisPubSub('fm.node_all_assets_id_memory_mapping') + return RedisPubSub('fm.node_all_asset_ids_memory_mapping') class NodeAssetsMappingForMemoryPubSub(LazyObject): @@ -42,7 +42,7 @@ def expire_node_assets_mapping_for_memory(org_id): "Expire node assets id mapping from cache of org={}, pid={}" "".format(org_id, os.getpid()) ) - Node.expire_node_all_assets_id_mapping_from_cache(org_id) + Node.expire_node_all_asset_ids_mapping_from_cache(org_id) @receiver(post_save, sender=Node) @@ -78,7 +78,7 @@ def subscribe_node_assets_mapping_expire(sender, **kwargs): if message["type"] != "message": continue org_id = message['data'].decode() - Node.expire_node_all_assets_id_mapping_from_memory(org_id) + Node.expire_node_all_asset_ids_mapping_from_memory(org_id) logger.debug( "Expire node assets id mapping from memory of org={}, pid={}" "".format(str(org_id), os.getpid()) diff --git a/apps/assets/tasks/push_system_user.py b/apps/assets/tasks/push_system_user.py index be337baea..b56cfcdd8 100644 --- a/apps/assets/tasks/push_system_user.py +++ b/apps/assets/tasks/push_system_user.py @@ -233,18 +233,18 @@ def push_system_user_util(system_user, assets, task_name, username=None): print(_("Hosts count: {}").format(len(_assets))) id_asset_map = {_asset.id: _asset for _asset in _assets} - assets_id = id_asset_map.keys() + asset_ids = id_asset_map.keys() no_special_auth = [] special_auth_set = set() - auth_books = AuthBook.objects.filter(username__in=usernames, asset_id__in=assets_id) + auth_books = AuthBook.objects.filter(username__in=usernames, asset_id__in=asset_ids) for auth_book in auth_books: special_auth_set.add((auth_book.username, auth_book.asset_id)) for _username in usernames: no_special_assets = [] - for asset_id in assets_id: + for asset_id in asset_ids: if (_username, asset_id) not in special_auth_set: no_special_assets.append(id_asset_map[asset_id]) if no_special_assets: @@ -289,12 +289,12 @@ def push_system_user_a_asset_manual(system_user, asset, username=None): @shared_task(queue="ansible") @tmp_to_root_org() -def push_system_user_to_assets(system_user_id, assets_id, username=None): +def push_system_user_to_assets(system_user_id, asset_ids, username=None): """ 推送系统用户到指定的若干资产上 """ system_user = SystemUser.objects.get(id=system_user_id) - assets = get_objects(Asset, assets_id) + assets = get_objects(Asset, asset_ids) task_name = _("Push system users to assets: {}").format(system_user.name) return push_system_user_util(system_user, assets, task_name, username=username) diff --git a/apps/authentication/api/connection_token.py b/apps/authentication/api/connection_token.py index 16f8907be..ae9e4a2de 100644 --- a/apps/authentication/api/connection_token.py +++ b/apps/authentication/api/connection_token.py @@ -183,9 +183,9 @@ class UserConnectionTokenViewSet(RootOrgViewMixin, SerializerMixin2, GenericView @staticmethod def _get_asset_secret_detail(value, user, system_user): from assets.models import Asset - from perms.utils.asset import get_asset_system_users_id_with_actions_by_user + from perms.utils.asset import get_asset_system_user_ids_with_actions_by_user asset = get_object_or_404(Asset, id=value.get('asset')) - systemuserid_actions_mapper = get_asset_system_users_id_with_actions_by_user(user, asset) + systemuserid_actions_mapper = get_asset_system_user_ids_with_actions_by_user(user, asset) actions = systemuserid_actions_mapper.get(system_user.id, []) gateway = None if asset and asset.domain and asset.domain.has_gateway(): diff --git a/apps/common/api.py b/apps/common/api.py index 06c162539..5bf20f027 100644 --- a/apps/common/api.py +++ b/apps/common/api.py @@ -13,7 +13,7 @@ from rest_framework.viewsets import GenericViewSet from common.permissions import IsValidUser from .http import HttpResponseTemporaryRedirect -from .const import KEY_CACHE_RESOURCES_ID +from .const import KEY_CACHE_RESOURCE_IDS from .utils import get_logger from .mixins import CommonApiMixin @@ -93,7 +93,7 @@ class ResourcesIDCacheApi(APIView): spm = str(uuid.uuid4()) resources = request.data.get('resources') if resources is not None: - cache_key = KEY_CACHE_RESOURCES_ID.format(spm) + cache_key = KEY_CACHE_RESOURCE_IDS.format(spm) cache.set(cache_key, resources, 300) return Response({'spm': spm}) diff --git a/apps/common/const/__init__.py b/apps/common/const/__init__.py index 65d445eec..84a07a11a 100644 --- a/apps/common/const/__init__.py +++ b/apps/common/const/__init__.py @@ -7,7 +7,7 @@ create_success_msg = _("%(name)s was created successfully") update_success_msg = _("%(name)s was updated successfully") FILE_END_GUARD = ">>> Content End <<<" celery_task_pre_key = "CELERY_" -KEY_CACHE_RESOURCES_ID = "RESOURCES_ID_{}" +KEY_CACHE_RESOURCE_IDS = "RESOURCE_IDS_{}" # AD User AccountDisable # https://blog.csdn.net/bytxl/article/details/17763975 diff --git a/apps/common/drf/filters.py b/apps/common/drf/filters.py index f130af3b7..609cb5ab0 100644 --- a/apps/common/drf/filters.py +++ b/apps/common/drf/filters.py @@ -108,11 +108,11 @@ class IDSpmFilter(filters.BaseFilterBackend): spm = request.query_params.get('spm') if not spm: return queryset - cache_key = const.KEY_CACHE_RESOURCES_ID.format(spm) - resources_id = cache.get(cache_key) - if resources_id is None or not isinstance(resources_id, list): + cache_key = const.KEY_CACHE_RESOURCE_IDS.format(spm) + resource_ids = cache.get(cache_key) + if resource_ids is None or not isinstance(resource_ids, list): return queryset - queryset = queryset.filter(id__in=resources_id) + queryset = queryset.filter(id__in=resource_ids) return queryset diff --git a/apps/orgs/signals_handler/common.py b/apps/orgs/signals_handler/common.py index f7b6f8e78..419bccdeb 100644 --- a/apps/orgs/signals_handler/common.py +++ b/apps/orgs/signals_handler/common.py @@ -91,14 +91,14 @@ def _remove_users(model, users, org): f'{m2m_field_name}__org_id': org.id }) - object_id_users_id_map = defaultdict(set) + object_id_user_ids_map = defaultdict(set) m2m_field_attr_name = f'{m2m_field_name}_id' for relation in relations: object_id = getattr(relation, m2m_field_attr_name) - object_id_users_id_map[object_id].add(relation.user_id) + object_id_user_ids_map[object_id].add(relation.user_id) - objects = model.objects.filter(id__in=object_id_users_id_map.keys()) + objects = model.objects.filter(id__in=object_id_user_ids_map.keys()) send_m2m_change_signal = partial( m2m_changed.send, sender=m2m_model, reverse=reverse, model=User, using=model.objects.db @@ -107,7 +107,7 @@ def _remove_users(model, users, org): for obj in objects: send_m2m_change_signal( instance=obj, - pk_set=object_id_users_id_map[obj.id], + pk_set=object_id_user_ids_map[obj.id], action=PRE_REMOVE ) @@ -116,7 +116,7 @@ def _remove_users(model, users, org): for obj in objects: send_m2m_change_signal( instance=obj, - pk_set=object_id_users_id_map[obj.id], + pk_set=object_id_user_ids_map[obj.id], action=POST_REMOVE ) diff --git a/apps/perms/api/application/user_permission/common.py b/apps/perms/api/application/user_permission/common.py index 999a09087..4e7d0b5f2 100644 --- a/apps/perms/api/application/user_permission/common.py +++ b/apps/perms/api/application/user_permission/common.py @@ -12,7 +12,7 @@ from orgs.utils import tmp_to_root_org from applications.models import Application from perms.utils.application.permission import ( has_application_system_permission, - get_application_system_users_id + get_application_system_user_ids ) from perms.api.asset.user_permission.mixin import RoleAdminMixin, RoleUserMixin from common.permissions import IsOrgAdminOrAppUser @@ -32,14 +32,14 @@ class GrantedApplicationSystemUsersMixin(ListAPIView): only_fields = serializers.ApplicationSystemUserSerializer.Meta.only_fields user: None - def get_application_system_users_id(self, application): - return get_application_system_users_id(self.user, application) + def get_application_system_user_ids(self, application): + return get_application_system_user_ids(self.user, application) def get_queryset(self): application_id = self.kwargs.get('application_id') application = get_object_or_404(Application, id=application_id) - system_users_id = self.get_application_system_users_id(application) - system_users = SystemUser.objects.filter(id__in=system_users_id)\ + system_user_ids = self.get_application_system_user_ids(application) + system_users = SystemUser.objects.filter(id__in=system_user_ids)\ .only(*self.only_fields).order_by('priority') return system_users diff --git a/apps/perms/api/asset/user_group_permission.py b/apps/perms/api/asset/user_group_permission.py index c1b025cb3..e8cea21b5 100644 --- a/apps/perms/api/asset/user_group_permission.py +++ b/apps/perms/api/asset/user_group_permission.py @@ -12,7 +12,7 @@ from perms.models import AssetPermission from assets.models import Asset, Node from perms.api.asset import user_permission as uapi from perms import serializers -from perms.utils.asset.permission import get_asset_system_users_id_with_actions_by_group +from perms.utils.asset.permission import get_asset_system_user_ids_with_actions_by_group from assets.api.mixin import SerializeToTreeNodeMixin from users.models import UserGroup @@ -41,12 +41,12 @@ class UserGroupGrantedAssetsApi(ListAPIView): def get_queryset(self): user_group_id = self.kwargs.get('pk', '') - asset_perms_id = list(AssetPermission.objects.valid().filter( + asset_perm_ids = list(AssetPermission.objects.valid().filter( user_groups__id=user_group_id ).distinct().values_list('id', flat=True)) granted_node_keys = Node.objects.filter( - granted_by_permissions__id__in=asset_perms_id, + granted_by_permissions__id__in=asset_perm_ids, ).distinct().values_list('key', flat=True) granted_q = Q() @@ -54,7 +54,7 @@ class UserGroupGrantedAssetsApi(ListAPIView): granted_q |= Q(nodes__key__startswith=f'{_key}:') granted_q |= Q(nodes__key=_key) - granted_q |= Q(granted_by_permissions__id__in=asset_perms_id) + granted_q |= Q(granted_by_permissions__id__in=asset_perm_ids) assets = Asset.objects.filter( granted_q @@ -89,12 +89,12 @@ class UserGroupGrantedNodeAssetsApi(ListAPIView): ) return assets else: - asset_perms_id = list(AssetPermission.objects.valid().filter( + asset_perm_ids = list(AssetPermission.objects.valid().filter( user_groups__id=user_group_id ).distinct().values_list('id', flat=True)) granted_node_keys = Node.objects.filter( - granted_by_permissions__id__in=asset_perms_id, + granted_by_permissions__id__in=asset_perm_ids, key__startswith=f'{node.key}:' ).distinct().values_list('key', flat=True) @@ -104,7 +104,7 @@ class UserGroupGrantedNodeAssetsApi(ListAPIView): granted_node_q |= Q(nodes__key=_key) granted_asset_q = ( - Q(granted_by_permissions__id__in=asset_perms_id) & + Q(granted_by_permissions__id__in=asset_perm_ids) & ( Q(nodes__key__startswith=f'{node.key}:') | Q(nodes__key=node.key) @@ -148,16 +148,16 @@ class UserGroupGrantedNodeChildrenAsTreeApi(SerializeToTreeNodeMixin, ListAPIVie group_id = self.kwargs.get('pk') node_key = self.request.query_params.get('key', None) - asset_perms_id = list(AssetPermission.objects.valid().filter( + asset_perm_ids = list(AssetPermission.objects.valid().filter( user_groups__id=group_id ).distinct().values_list('id', flat=True)) granted_keys = Node.objects.filter( - granted_by_permissions__id__in=asset_perms_id + granted_by_permissions__id__in=asset_perm_ids ).values_list('key', flat=True) asset_granted_keys = Node.objects.filter( - assets__granted_by_permissions__id__in=asset_perms_id + assets__granted_by_permissions__id__in=asset_perm_ids ).values_list('key', flat=True) if node_key is None: @@ -188,5 +188,5 @@ class UserGroupGrantedNodeChildrenAsTreeApi(SerializeToTreeNodeMixin, ListAPIVie class UserGroupGrantedAssetSystemUsersApi(UserGroupMixin, uapi.UserGrantedAssetSystemUsersForAdminApi): - def get_asset_system_users_id_with_actions(self, asset): - return get_asset_system_users_id_with_actions_by_group(self.group, asset) + def get_asset_system_user_ids_with_actions(self, asset): + return get_asset_system_user_ids_with_actions_by_group(self.group, asset) diff --git a/apps/perms/api/asset/user_permission/common.py b/apps/perms/api/asset/user_permission/common.py index 8746beb2a..88e4f069e 100644 --- a/apps/perms/api/asset/user_permission/common.py +++ b/apps/perms/api/asset/user_permission/common.py @@ -10,7 +10,7 @@ from rest_framework.generics import ( ) from orgs.utils import tmp_to_root_org -from perms.utils.asset.permission import get_asset_system_users_id_with_actions_by_user +from perms.utils.asset.permission import get_asset_system_user_ids_with_actions_by_user from common.permissions import IsOrgAdminOrAppUser, IsOrgAdmin, IsValidUser from common.utils import get_logger, lazyproperty @@ -53,7 +53,7 @@ class GetUserAssetPermissionActionsApi(RetrieveAPIView): asset = get_object_or_404(Asset, id=asset_id) system_user = get_object_or_404(SystemUser, id=system_id) - system_users_actions = get_asset_system_users_id_with_actions_by_user(self.get_user(), asset) + system_users_actions = get_asset_system_user_ids_with_actions_by_user(self.get_user(), asset) actions = system_users_actions.get(system_user.id) return {"actions": actions} @@ -84,7 +84,7 @@ class ValidateUserAssetPermissionApi(APIView): asset = get_object_or_404(Asset, id=asset_id) system_user = get_object_or_404(SystemUser, id=system_id) - system_users_actions = get_asset_system_users_id_with_actions_by_user(self.get_user(), asset) + system_users_actions = get_asset_system_user_ids_with_actions_by_user(self.get_user(), asset) actions = system_users_actions.get(system_user.id) if actions is None: return Response({'msg': False}, status=403) @@ -111,15 +111,15 @@ class UserGrantedAssetSystemUsersForAdminApi(ListAPIView): user_id = self.kwargs.get('pk') return User.objects.get(id=user_id) - def get_asset_system_users_id_with_actions(self, asset): - return get_asset_system_users_id_with_actions_by_user(self.user, asset) + def get_asset_system_user_ids_with_actions(self, asset): + return get_asset_system_user_ids_with_actions_by_user(self.user, asset) def get_queryset(self): asset_id = self.kwargs.get('asset_id') asset = get_object_or_404(Asset, id=asset_id) - system_users_with_actions = self.get_asset_system_users_id_with_actions(asset) - system_users_id = system_users_with_actions.keys() - system_users = SystemUser.objects.filter(id__in=system_users_id)\ + system_users_with_actions = self.get_asset_system_user_ids_with_actions(asset) + system_user_ids = system_users_with_actions.keys() + system_users = SystemUser.objects.filter(id__in=system_user_ids)\ .only(*self.serializer_class.Meta.only_fields) \ .order_by('priority') system_users = list(system_users) diff --git a/apps/perms/api/asset/user_permission/user_permission_nodes_with_assets.py b/apps/perms/api/asset/user_permission/user_permission_nodes_with_assets.py index 63619e9c1..f66ed3c3f 100644 --- a/apps/perms/api/asset/user_permission/user_permission_nodes_with_assets.py +++ b/apps/perms/api/asset/user_permission/user_permission_nodes_with_assets.py @@ -52,8 +52,8 @@ class MyGrantedNodesWithAssetsAsTreeApi(SerializeToTreeNodeMixin, ListAPIView): data.extend(self.serialize_assets(favorite_assets)) @timeit - def add_node_filtered_by_system_user(self, data: list, user, asset_perms_id): - utils = UserGrantedTreeBuildUtils(user, asset_perms_id) + def add_node_filtered_by_system_user(self, data: list, user, asset_perm_ids): + utils = UserGrantedTreeBuildUtils(user, asset_perm_ids) nodes = utils.get_whole_tree_nodes() data.extend(self.serialize_nodes(nodes, with_asset_amount=True)) @@ -77,23 +77,23 @@ class MyGrantedNodesWithAssetsAsTreeApi(SerializeToTreeNodeMixin, ListAPIView): user = request.user data = [] - asset_perms_id = get_user_all_asset_perm_ids(user) + asset_perm_ids = get_user_all_asset_perm_ids(user) system_user_id = request.query_params.get('system_user') if system_user_id: - asset_perms_id = list(AssetPermission.objects.valid().filter( - id__in=asset_perms_id, system_users__id=system_user_id, actions__gt=0 + asset_perm_ids = list(AssetPermission.objects.valid().filter( + id__in=asset_perm_ids, system_users__id=system_user_id, actions__gt=0 ).values_list('id', flat=True).distinct()) - nodes_query_utils = UserGrantedNodesQueryUtils(user, asset_perms_id) - assets_query_utils = UserGrantedAssetsQueryUtils(user, asset_perms_id) + nodes_query_utils = UserGrantedNodesQueryUtils(user, asset_perm_ids) + assets_query_utils = UserGrantedAssetsQueryUtils(user, asset_perm_ids) self.add_ungrouped_resource(data, nodes_query_utils, assets_query_utils) self.add_favorite_resource(data, nodes_query_utils, assets_query_utils) if system_user_id: # 有系统用户筛选的需要重新计算树结构 - self.add_node_filtered_by_system_user(data, user, asset_perms_id) + self.add_node_filtered_by_system_user(data, user, asset_perm_ids) else: all_nodes = nodes_query_utils.get_whole_tree_nodes(with_special=False) data.extend(self.serialize_nodes(all_nodes, with_asset_amount=True)) diff --git a/apps/perms/api/system_user_permission.py b/apps/perms/api/system_user_permission.py index 17ddfc786..48d440baa 100644 --- a/apps/perms/api/system_user_permission.py +++ b/apps/perms/api/system_user_permission.py @@ -16,9 +16,9 @@ class SystemUserPermission(generics.ListAPIView): def get_queryset(self): user = self.request.user - asset_perms_id = get_user_all_asset_perm_ids(user) + asset_perm_ids = get_user_all_asset_perm_ids(user) queryset = SystemUser.objects.filter( - granted_by_permissions__id__in=asset_perms_id + granted_by_permissions__id__in=asset_perm_ids ).distinct() return queryset diff --git a/apps/perms/models/application_permission.py b/apps/perms/models/application_permission.py index 44cb38323..d16b154ae 100644 --- a/apps/perms/models/application_permission.py +++ b/apps/perms/models/application_permission.py @@ -65,9 +65,9 @@ class ApplicationPermission(BasePermission): return self.system_users.count() def get_all_users(self): - users_id = self.users.all().values_list('id', flat=True) - user_groups_id = self.user_groups.all().values_list('id', flat=True) + user_ids = self.users.all().values_list('id', flat=True) + user_group_ids = self.user_groups.all().values_list('id', flat=True) users = User.objects.filter( - Q(id__in=users_id) | Q(groups__id__in=user_groups_id) + Q(id__in=user_ids) | Q(groups__id__in=user_group_ids) ) return users diff --git a/apps/perms/models/asset_permission.py b/apps/perms/models/asset_permission.py index fb54ad1a6..f7551306e 100644 --- a/apps/perms/models/asset_permission.py +++ b/apps/perms/models/asset_permission.py @@ -137,10 +137,10 @@ class AssetPermission(BasePermission): def get_all_assets(self): from assets.models import Node nodes_keys = self.nodes.all().values_list('key', flat=True) - assets_ids = set(self.assets.all().values_list('id', flat=True)) - nodes_assets_ids = Node.get_nodes_all_assets_ids_by_keys(nodes_keys) - assets_ids.update(nodes_assets_ids) - assets = Asset.objects.filter(id__in=assets_ids) + asset_ids = set(self.assets.all().values_list('id', flat=True)) + nodes_asset_ids = Node.get_nodes_all_asset_ids_by_keys(nodes_keys) + asset_ids.update(nodes_asset_ids) + assets = Asset.objects.filter(id__in=asset_ids) return assets diff --git a/apps/perms/models/base.py b/apps/perms/models/base.py index 7651a06e8..05f780e8f 100644 --- a/apps/perms/models/base.py +++ b/apps/perms/models/base.py @@ -99,14 +99,14 @@ class BasePermission(OrgModelMixin): def get_all_users(self): from users.models import User - users_id = self.users.all().values_list('id', flat=True) - groups_id = self.user_groups.all().values_list('id', flat=True) + user_ids = self.users.all().values_list('id', flat=True) + group_ids = self.user_groups.all().values_list('id', flat=True) - users_id = list(users_id) - groups_id = list(groups_id) + user_ids = list(user_ids) + group_ids = list(group_ids) - qs1 = User.objects.filter(id__in=users_id).distinct() - qs2 = User.objects.filter(groups__id__in=groups_id).distinct() + qs1 = User.objects.filter(id__in=user_ids).distinct() + qs2 = User.objects.filter(groups__id__in=group_ids).distinct() qs = UnionQuerySet(qs1, qs2) return qs diff --git a/apps/perms/signals_handler/common.py b/apps/perms/signals_handler/common.py index 804d5beaf..7399346db 100644 --- a/apps/perms/signals_handler/common.py +++ b/apps/perms/signals_handler/common.py @@ -27,15 +27,15 @@ def on_user_groups_change(sender, instance, action, reverse, pk_set, **kwargs): if not reverse: # 一个用户添加了多个用户组 - users_id = [instance.id] + user_ids = [instance.id] system_users = SystemUser.objects.filter(groups__id__in=pk_set).distinct() else: # 一个用户组添加了多个用户 - users_id = pk_set + user_ids = pk_set system_users = SystemUser.objects.filter(groups__id=instance.pk).distinct() for system_user in system_users: - system_user.users.add(*users_id) + system_user.users.add(*user_ids) @receiver(m2m_changed, sender=AssetPermission.nodes.through) @@ -139,17 +139,17 @@ def on_application_permission_system_users_changed(sender, instance: Application logger.debug("Application permission system_users change signal received") attrs = instance.applications.all().values_list('attrs', flat=True) - assets_id = [attr['asset'] for attr in attrs if attr.get('asset')] - if not assets_id: + asset_ids = [attr['asset'] for attr in attrs if attr.get('asset')] + if not asset_ids: return for system_user in system_users: - system_user.assets.add(*assets_id) + system_user.assets.add(*asset_ids) if system_user.username_same_with_user: - users_id = instance.users.all().values_list('id', flat=True) - groups_id = instance.user_groups.all().values_list('id', flat=True) - system_user.groups.add(*groups_id) - system_user.users.add(*users_id) + user_ids = instance.users.all().values_list('id', flat=True) + group_ids = instance.user_groups.all().values_list('id', flat=True) + system_user.groups.add(*group_ids) + system_user.users.add(*user_ids) @receiver(m2m_changed, sender=ApplicationPermission.users.through) @@ -164,12 +164,12 @@ def on_application_permission_users_changed(sender, instance, action, reverse, p return logger.debug("Application permission users change signal received") - users_id = User.objects.filter(pk__in=pk_set).values_list('id', flat=True) + user_ids = User.objects.filter(pk__in=pk_set).values_list('id', flat=True) system_users = instance.system_users.all() for system_user in system_users: if system_user.username_same_with_user: - system_user.users.add(*users_id) + system_user.users.add(*user_ids) @receiver(m2m_changed, sender=ApplicationPermission.user_groups.through) @@ -182,12 +182,12 @@ def on_application_permission_user_groups_changed(sender, instance, action, reve return logger.debug("Application permission user groups change signal received") - groups_id = UserGroup.objects.filter(pk__in=pk_set).values_list('id', flat=True) + group_ids = UserGroup.objects.filter(pk__in=pk_set).values_list('id', flat=True) system_users = instance.system_users.all() for system_user in system_users: if system_user.username_same_with_user: - system_user.groups.add(*groups_id) + system_user.groups.add(*group_ids) @receiver(m2m_changed, sender=ApplicationPermission.applications.through) @@ -202,11 +202,11 @@ def on_application_permission_applications_changed(sender, instance, action, rev return attrs = Application.objects.filter(id__in=pk_set).values_list('attrs', flat=True) - assets_id = [attr['asset'] for attr in attrs if attr.get('asset')] - if not assets_id: + asset_ids = [attr['asset'] for attr in attrs if attr.get('asset')] + if not asset_ids: return system_users = instance.system_users.all() for system_user in system_users: - system_user.assets.add(*assets_id) + system_user.assets.add(*asset_ids) diff --git a/apps/perms/utils/application/permission.py b/apps/perms/utils/application/permission.py index 2c92e5bee..4e4c8113d 100644 --- a/apps/perms/utils/application/permission.py +++ b/apps/perms/utils/application/permission.py @@ -6,7 +6,7 @@ from perms.models import ApplicationPermission logger = get_logger(__file__) -def get_application_system_users_id(user, application): +def get_application_system_user_ids(user, application): queryset = ApplicationPermission.objects.valid()\ .filter( Q(users=user) | Q(user_groups__users=user), @@ -16,5 +16,5 @@ def get_application_system_users_id(user, application): def has_application_system_permission(user, application, system_user): - system_users_id = get_application_system_users_id(user, application) - return system_user.id in system_users_id + system_user_ids = get_application_system_user_ids(user, application) + return system_user.id in system_user_ids diff --git a/apps/perms/utils/application/user_permission.py b/apps/perms/utils/application/user_permission.py index 4308b474b..524d5cd42 100644 --- a/apps/perms/utils/application/user_permission.py +++ b/apps/perms/utils/application/user_permission.py @@ -3,7 +3,7 @@ from perms.models import ApplicationPermission from applications.models import Application -def get_user_all_applicationpermissions_id(user): +def get_user_all_applicationpermission_ids(user): application_perm_ids = ApplicationPermission.objects.valid().filter( Q(users=user) | Q(user_groups__users=user) ).distinct().values_list('id', flat=True) @@ -11,8 +11,8 @@ def get_user_all_applicationpermissions_id(user): def get_user_granted_all_applications(user): - application_perms_id = get_user_all_applicationpermissions_id(user) + application_perm_ids = get_user_all_applicationpermission_ids(user) applications = Application.objects.filter( - granted_by_permissions__id__in=application_perms_id + granted_by_permissions__id__in=application_perm_ids ).distinct() return applications diff --git a/apps/perms/utils/asset/permission.py b/apps/perms/utils/asset/permission.py index c9b1bf51e..197abc9d9 100644 --- a/apps/perms/utils/asset/permission.py +++ b/apps/perms/utils/asset/permission.py @@ -5,13 +5,12 @@ from django.db.models import Q from common.utils import get_logger from perms.models import AssetPermission from perms.hands import Asset, User, UserGroup, SystemUser -from perms.models.base import BasePermissionQuerySet from perms.utils.asset.user_permission import get_user_all_asset_perm_ids logger = get_logger(__file__) -def get_asset_system_users_id_with_actions(asset_perm_ids, asset: Asset): +def get_asset_system_user_ids_with_actions(asset_perm_ids, asset: Asset): nodes = asset.get_nodes() node_keys = set() for node in nodes: @@ -34,21 +33,21 @@ def get_asset_system_users_id_with_actions(asset_perm_ids, asset: Asset): return system_users_actions -def get_asset_system_users_id_with_actions_by_user(user: User, asset: Asset): +def get_asset_system_user_ids_with_actions_by_user(user: User, asset: Asset): asset_perm_ids = get_user_all_asset_perm_ids(user) - return get_asset_system_users_id_with_actions(asset_perm_ids, asset) + return get_asset_system_user_ids_with_actions(asset_perm_ids, asset) def has_asset_system_permission(user: User, asset: Asset, system_user: SystemUser): - systemuser_actions_mapper = get_asset_system_users_id_with_actions_by_user(user, asset) + systemuser_actions_mapper = get_asset_system_user_ids_with_actions_by_user(user, asset) actions = systemuser_actions_mapper.get(system_user.id, []) if actions: return True return False -def get_asset_system_users_id_with_actions_by_group(group: UserGroup, asset: Asset): +def get_asset_system_user_ids_with_actions_by_group(group: UserGroup, asset: Asset): asset_perm_ids = AssetPermission.objects.filter( user_groups=group ).valid().values_list('id', flat=True).distinct() - return get_asset_system_users_id_with_actions(asset_perm_ids, asset) + return get_asset_system_user_ids_with_actions(asset_perm_ids, asset) diff --git a/apps/perms/utils/asset/user_permission.py b/apps/perms/utils/asset/user_permission.py index 0741f42e0..e638c7d64 100644 --- a/apps/perms/utils/asset/user_permission.py +++ b/apps/perms/utils/asset/user_permission.py @@ -70,43 +70,43 @@ class UserGrantedTreeRefreshController: return {org_id.decode() for org_id in org_ids} def set_all_orgs_as_builed(self): - self.client.sadd(self.key, *self.orgs_id) + self.client.sadd(self.key, *self.org_ids) def have_need_refresh_orgs(self): builded_org_ids = self.client.smembers(self.key) builded_org_ids = {org_id.decode() for org_id in builded_org_ids} - have = self.orgs_id - builded_org_ids + have = self.org_ids - builded_org_ids return have def get_need_refresh_orgs_and_fill_up(self): - orgs_id = self.orgs_id + org_ids = self.org_ids with self.client.pipeline() as p: p.smembers(self.key) - p.sadd(self.key, *orgs_id) + p.sadd(self.key, *org_ids) ret = p.execute() - builded_orgs_id = {org_id.decode() for org_id in ret[0]} - ids = orgs_id - builded_orgs_id + builded_org_ids = {org_id.decode() for org_id in ret[0]} + ids = org_ids - builded_org_ids orgs = {*Organization.objects.filter(id__in=ids)} - logger.info(f'Need rebuild orgs are {orgs}, builed orgs are {ret[0]}, all orgs are {orgs_id}') + logger.info(f'Need rebuild orgs are {orgs}, builed orgs are {ret[0]}, all orgs are {org_ids}') return orgs @classmethod @on_transaction_commit - def remove_builed_orgs_from_users(cls, orgs_id, users_id): + def remove_builed_orgs_from_users(cls, org_ids, user_ids): client = cls.get_redis_client() - org_ids = [str(org_id) for org_id in orgs_id] + org_ids = [str(org_id) for org_id in org_ids] with client.pipeline() as p: - for user_id in users_id: + for user_id in user_ids: key = cls.key_template.format(user_id=user_id) p.srem(key, *org_ids) p.execute() - logger.info(f'Remove orgs from users builded tree: users:{users_id} orgs:{orgs_id}') + logger.info(f'Remove orgs from users builded tree: users:{user_ids} orgs:{org_ids}') @classmethod - def add_need_refresh_orgs_for_users(cls, orgs_id, users_id): - cls.remove_builed_orgs_from_users(orgs_id, users_id) + def add_need_refresh_orgs_for_users(cls, org_ids, user_ids): + cls.remove_builed_orgs_from_users(org_ids, user_ids) @classmethod @ensure_in_real_or_default_org @@ -127,15 +127,15 @@ class UserGrantedTreeRefreshController: ancestor_id = PermNode.objects.filter(key__in=ancestor_node_keys).values_list('id', flat=True) node_ids.update(ancestor_id) - assets_related_perms_id = AssetPermission.nodes.through.objects.filter( + assets_related_perm_ids = AssetPermission.nodes.through.objects.filter( node_id__in=node_ids ).values_list('assetpermission_id', flat=True) - asset_perm_ids.update(assets_related_perms_id) + asset_perm_ids.update(assets_related_perm_ids) - nodes_related_perms_id = AssetPermission.assets.through.objects.filter( + nodes_related_perm_ids = AssetPermission.assets.through.objects.filter( asset_id__in=asset_ids ).values_list('assetpermission_id', flat=True) - asset_perm_ids.update(nodes_related_perms_id) + asset_perm_ids.update(nodes_related_perm_ids) cls.add_need_refresh_by_asset_perm_ids(asset_perm_ids) @@ -173,7 +173,7 @@ class UserGrantedTreeRefreshController: ) @lazyproperty - def orgs_id(self): + def org_ids(self): ret = {str(org.id) for org in self.orgs} return ret @@ -187,7 +187,7 @@ class UserGrantedTreeRefreshController: user = self.user with tmp_to_root_org(): - UserAssetGrantedTreeNodeRelation.objects.filter(user=user).exclude(org_id__in=self.orgs_id).delete() + UserAssetGrantedTreeNodeRelation.objects.filter(user=user).exclude(org_id__in=self.org_ids).delete() if force or self.have_need_refresh_orgs(): with UserGrantedTreeRebuildLock(user_id=user.id): @@ -295,10 +295,10 @@ class UserGrantedTreeBuildUtils(UserGrantedUtilsBase): # 查询授权资产关联的节点设置 def process_direct_granted_assets(): # 查询直接授权资产 - nodes_id = {node_id_str for node_id_str, _ in self.direct_granted_asset_id_node_id_str_pairs} + node_ids = {node_id_str for node_id_str, _ in self.direct_granted_asset_id_node_id_str_pairs} # 查询授权资产关联的节点设置 2.80 granted_asset_nodes = PermNode.objects.filter( - id__in=nodes_id + id__in=node_ids ).distinct().only(*node_only_fields) granted_asset_nodes = list(granted_asset_nodes) @@ -350,11 +350,11 @@ class UserGrantedTreeBuildUtils(UserGrantedUtilsBase): UserAssetGrantedTreeNodeRelation.objects.bulk_create(to_create) @timeit - def _fill_direct_granted_node_assets_id_from_mem(self, nodes_key, mapper): + def _fill_direct_granted_node_asset_ids_from_mem(self, nodes_key, mapper): org_id = current_org.id for key in nodes_key: - assets_id = PermNode.get_all_assets_id_by_node_key(org_id, key) - mapper[key].update(assets_id) + asset_ids = PermNode.get_all_asset_ids_by_node_key(org_id, key) + mapper[key].update(asset_ids) @lazyproperty def direct_granted_asset_id_node_id_str_pairs(self): @@ -379,7 +379,7 @@ class UserGrantedTreeBuildUtils(UserGrantedUtilsBase): node = nodes[0] if node.node_from == NodeFrom.granted and node.key.isdigit(): with tmp_to_org(node.org): - node.granted_assets_amount = len(node.get_all_assets_id()) + node.granted_assets_amount = len(node.get_all_asset_ids()) return direct_granted_nodes_key = [] @@ -392,7 +392,7 @@ class UserGrantedTreeBuildUtils(UserGrantedUtilsBase): # 授权的节点和直接资产的映射 nodekey_assetsid_mapper = defaultdict(set) # 直接授权的节点，资产从完整树过来 - self._fill_direct_granted_node_assets_id_from_mem( + self._fill_direct_granted_node_asset_ids_from_mem( direct_granted_nodes_key, nodekey_assetsid_mapper ) diff --git a/apps/terminal/api/terminal.py b/apps/terminal/api/terminal.py index 444061035..91e9d4d07 100644 --- a/apps/terminal/api/terminal.py +++ b/apps/terminal/api/terminal.py @@ -86,13 +86,13 @@ class StatusViewSet(viewsets.ModelViewSet): return Response(serializer.data, status=201) def handle_sessions(self): - sessions_id = self.request.data.get('sessions', []) + session_ids = self.request.data.get('sessions', []) # guacamole 上报的 session 是字符串 # "[53cd3e47-210f-41d8-b3c6-a184f3, 53cd3e47-210f-41d8-b3c6-a184f4]" - if isinstance(sessions_id, str): - sessions_id = sessions_id[1:-1].split(',') - sessions_id = [sid.strip() for sid in sessions_id if sid.strip()] - Session.set_sessions_active(sessions_id) + if isinstance(session_ids, str): + session_ids = session_ids[1:-1].split(',') + session_ids = [sid.strip() for sid in session_ids if sid.strip()] + Session.set_sessions_active(session_ids) def get_queryset(self): terminal_id = self.kwargs.get("terminal", None) diff --git a/apps/terminal/models/session.py b/apps/terminal/models/session.py index b440d2f1e..8c759a74d 100644 --- a/apps/terminal/models/session.py +++ b/apps/terminal/models/session.py @@ -137,8 +137,8 @@ class Session(OrgModelMixin): return name, None @classmethod - def set_sessions_active(cls, sessions_id): - data = {cls.ACTIVE_CACHE_KEY_PREFIX.format(i): i for i in sessions_id} + def set_sessions_active(cls, session_ids): + data = {cls.ACTIVE_CACHE_KEY_PREFIX.format(i): i for i in session_ids} cache.set_many(data, timeout=5*60) @classmethod diff --git a/apps/tickets/handler/apply_application.py b/apps/tickets/handler/apply_application.py index 83f62b417..311fca3e3 100644 --- a/apps/tickets/handler/apply_application.py +++ b/apps/tickets/handler/apply_application.py @@ -26,11 +26,11 @@ class Handler(BaseHandler): def _construct_meta_display_of_approve(self): meta_display_fields = ['approve_applications_display', 'approve_system_users_display'] - approve_applications_id = self.ticket.meta.get('approve_applications', []) - approve_system_users_id = self.ticket.meta.get('approve_system_users', []) + approve_application_ids = self.ticket.meta.get('approve_applications', []) + approve_system_user_ids = self.ticket.meta.get('approve_system_users', []) with tmp_to_org(self.ticket.org_id): - approve_applications = Application.objects.filter(id__in=approve_applications_id) - system_users = SystemUser.objects.filter(id__in=approve_system_users_id) + approve_applications = Application.objects.filter(id__in=approve_application_ids) + system_users = SystemUser.objects.filter(id__in=approve_system_user_ids) approve_applications_display = [str(application) for application in approve_applications] approve_system_users_display = [str(system_user) for system_user in system_users] meta_display_values = [approve_applications_display, approve_system_users_display] @@ -89,8 +89,8 @@ class Handler(BaseHandler): apply_category = self.ticket.meta.get('apply_category') apply_type = self.ticket.meta.get('apply_type') approve_permission_name = self.ticket.meta.get('approve_permission_name', '') - approved_applications_id = self.ticket.meta.get('approve_applications', []) - approve_system_users_id = self.ticket.meta.get('approve_system_users', []) + approved_application_ids = self.ticket.meta.get('approve_applications', []) + approve_system_user_ids = self.ticket.meta.get('approve_system_users', []) approve_date_start = self.ticket.meta.get('approve_date_start') approve_date_expired = self.ticket.meta.get('approve_date_expired') permission_created_by = '{}:{}'.format( @@ -121,7 +121,7 @@ class Handler(BaseHandler): with tmp_to_org(self.ticket.org_id): application_permission = ApplicationPermission.objects.create(**permissions_data) application_permission.users.add(self.ticket.applicant) - application_permission.applications.set(approved_applications_id) - application_permission.system_users.set(approve_system_users_id) + application_permission.applications.set(approved_application_ids) + application_permission.system_users.set(approve_system_user_ids) return application_permission diff --git a/apps/tickets/handler/apply_asset.py b/apps/tickets/handler/apply_asset.py index 71507e7ae..9af310294 100644 --- a/apps/tickets/handler/apply_asset.py +++ b/apps/tickets/handler/apply_asset.py @@ -27,11 +27,11 @@ class Handler(BaseHandler): ] approve_actions = self.ticket.meta.get('approve_actions', Action.NONE) approve_actions_display = Action.value_to_choices_display(approve_actions) - approve_assets_id = self.ticket.meta.get('approve_assets', []) - approve_system_users_id = self.ticket.meta.get('approve_system_users', []) + approve_asset_ids = self.ticket.meta.get('approve_assets', []) + approve_system_user_ids = self.ticket.meta.get('approve_system_users', []) with tmp_to_org(self.ticket.org_id): - assets = Asset.objects.filter(id__in=approve_assets_id) - system_users = SystemUser.objects.filter(id__in=approve_system_users_id) + assets = Asset.objects.filter(id__in=approve_asset_ids) + system_users = SystemUser.objects.filter(id__in=approve_system_user_ids) approve_assets_display = [str(asset) for asset in assets] approve_system_users_display = [str(system_user) for system_user in system_users] meta_display_values = [ @@ -91,8 +91,8 @@ class Handler(BaseHandler): return asset_permission approve_permission_name = self.ticket.meta.get('approve_permission_name', ) - approve_assets_id = self.ticket.meta.get('approve_assets', []) - approve_system_users_id = self.ticket.meta.get('approve_system_users', []) + approve_asset_ids = self.ticket.meta.get('approve_assets', []) + approve_system_user_ids = self.ticket.meta.get('approve_system_users', []) approve_actions = self.ticket.meta.get('approve_actions', Action.NONE) approve_date_start = self.ticket.meta.get('approve_date_start') approve_date_expired = self.ticket.meta.get('approve_date_expired') @@ -124,7 +124,7 @@ class Handler(BaseHandler): with tmp_to_org(self.ticket.org_id): asset_permission = AssetPermission.objects.create(**permission_data) asset_permission.users.add(self.ticket.applicant) - asset_permission.assets.set(approve_assets_id) - asset_permission.system_users.set(approve_system_users_id) + asset_permission.assets.set(approve_asset_ids) + asset_permission.system_users.set(approve_system_user_ids) return asset_permission diff --git a/apps/tickets/serializers/ticket/meta/ticket_type/apply_application.py b/apps/tickets/serializers/ticket/meta/ticket_type/apply_application.py index 4b5bb00e2..3a047d980 100644 --- a/apps/tickets/serializers/ticket/meta/ticket_type/apply_application.py +++ b/apps/tickets/serializers/ticket/meta/ticket_type/apply_application.py @@ -98,10 +98,10 @@ class ApproveSerializer(serializers.Serializer): apply_type = self.root.instance.meta.get('apply_type') queries = Q(type=apply_type) queries &= Q(id__in=approve_applications) - applications_id = Application.objects.filter(queries).values_list('id', flat=True) - applications_id = [str(application_id) for application_id in applications_id] - if applications_id: - return applications_id + application_ids = Application.objects.filter(queries).values_list('id', flat=True) + application_ids = [str(application_id) for application_id in application_ids] + if application_ids: + return application_ids raise serializers.ValidationError(_( 'No `Application` are found under Organization `{}`'.format(self.root.instance.org_name) @@ -116,10 +116,10 @@ class ApproveSerializer(serializers.Serializer): protocol = SystemUser.get_protocol_by_application_type(apply_type) queries = Q(protocol=protocol) queries &= Q(id__in=approve_system_users) - system_users_id = SystemUser.objects.filter(queries).values_list('id', flat=True) - system_users_id = [str(system_user_id) for system_user_id in system_users_id] - if system_users_id: - return system_users_id + system_user_ids = SystemUser.objects.filter(queries).values_list('id', flat=True) + system_user_ids = [str(system_user_id) for system_user_id in system_user_ids] + if system_user_ids: + return system_user_ids raise serializers.ValidationError(_( 'No `SystemUser` are found under Organization `{}`'.format(self.root.instance.org_name) @@ -146,9 +146,9 @@ class ApplyApplicationSerializer(ApplySerializer, ApproveSerializer): queries &= Q(type=apply_type) with tmp_to_org(self.root.instance.org_id): - applications_id = Application.objects.filter(queries).values_list('id', flat=True)[:5] - applications_id = [str(application_id) for application_id in applications_id] - return applications_id + application_ids = Application.objects.filter(queries).values_list('id', flat=True)[:5] + application_ids = [str(application_id) for application_id in application_ids] + return application_ids def get_recommend_system_users(self, value): if not isinstance(self.root.instance, Ticket): @@ -167,6 +167,6 @@ class ApplyApplicationSerializer(ApplySerializer, ApproveSerializer): queries &= Q(protocol=protocol) with tmp_to_org(self.root.instance.org_id): - system_users_id = SystemUser.objects.filter(queries).values_list('id', flat=True)[:5] - system_users_id = [str(system_user_id) for system_user_id in system_users_id] - return system_users_id + system_user_ids = SystemUser.objects.filter(queries).values_list('id', flat=True)[:5] + system_user_ids = [str(system_user_id) for system_user_id in system_user_ids] + return system_user_ids diff --git a/apps/tickets/serializers/ticket/meta/ticket_type/apply_asset.py b/apps/tickets/serializers/ticket/meta/ticket_type/apply_asset.py index acdd217e1..e6bc65c29 100644 --- a/apps/tickets/serializers/ticket/meta/ticket_type/apply_asset.py +++ b/apps/tickets/serializers/ticket/meta/ticket_type/apply_asset.py @@ -99,10 +99,10 @@ class ApproveSerializer(serializers.Serializer): return [] with tmp_to_org(self.root.instance.org_id): - assets_id = Asset.objects.filter(id__in=approve_assets).values_list('id', flat=True) - assets_id = [str(asset_id) for asset_id in assets_id] - if assets_id: - return assets_id + asset_ids = Asset.objects.filter(id__in=approve_assets).values_list('id', flat=True) + asset_ids = [str(asset_id) for asset_id in asset_ids] + if asset_ids: + return asset_ids raise serializers.ValidationError(_( 'No `Asset` are found under Organization `{}`'.format(self.root.instance.org_name) @@ -115,10 +115,10 @@ class ApproveSerializer(serializers.Serializer): with tmp_to_org(self.root.instance.org_id): queries = Q(protocol__in=SystemUser.ASSET_CATEGORY_PROTOCOLS) queries &= Q(id__in=approve_system_users) - system_users_id = SystemUser.objects.filter(queries).values_list('id', flat=True) - system_users_id = [str(system_user_id) for system_user_id in system_users_id] - if system_users_id: - return system_users_id + system_user_ids = SystemUser.objects.filter(queries).values_list('id', flat=True) + system_user_ids = [str(system_user_id) for system_user_id in system_user_ids] + if system_user_ids: + return system_user_ids raise serializers.ValidationError(_( 'No `SystemUser` are found under Organization `{}`'.format(self.root.instance.org_name) @@ -144,9 +144,9 @@ class ApplyAssetSerializer(ApplySerializer, ApproveSerializer): if not queries: return [] with tmp_to_org(self.root.instance.org_id): - assets_id = Asset.objects.filter(queries).values_list('id', flat=True)[:5] - assets_id = [str(asset_id) for asset_id in assets_id] - return assets_id + asset_ids = Asset.objects.filter(queries).values_list('id', flat=True)[:5] + asset_ids = [str(asset_id) for asset_id in asset_ids] + return asset_ids def get_recommend_system_users(self, value): if not isinstance(self.root.instance, Ticket): @@ -163,6 +163,6 @@ class ApplyAssetSerializer(ApplySerializer, ApproveSerializer): queries &= Q(protocol__in=SystemUser.ASSET_CATEGORY_PROTOCOLS) with tmp_to_org(self.root.instance.org_id): - system_users_id = SystemUser.objects.filter(queries).values_list('id', flat=True)[:5] - system_users_id = [str(system_user_id) for system_user_id in system_users_id] - return system_users_id + system_user_ids = SystemUser.objects.filter(queries).values_list('id', flat=True)[:5] + system_user_ids = [str(system_user_id) for system_user_id in system_user_ids] + return system_user_ids diff --git a/apps/users/api/user.py b/apps/users/api/user.py index 488c699c3..7f7d91deb 100644 --- a/apps/users/api/user.py +++ b/apps/users/api/user.py @@ -123,10 +123,10 @@ class UserViewSet(CommonApiMixin, UserQuerysetMixin, BulkModelViewSet): def perform_bulk_update(self, serializer): # TODO: 需要测试 - users_ids = [ + user_ids = [ d.get("id") or d.get("pk") for d in serializer.validated_data ] - users = current_org.get_members().filter(id__in=users_ids) + users = current_org.get_members().filter(id__in=user_ids) for user in users: self.check_object_permissions(self.request, user) return super().perform_bulk_update(serializer) diff --git a/apps/users/models/user.py b/apps/users/models/user.py index bbacd998b..c7f52a02c 100644 --- a/apps/users/models/user.py +++ b/apps/users/models/user.py @@ -346,11 +346,11 @@ class RoleMixin: @classmethod def get_super_and_org_admins(cls, org=None): super_admins = cls.get_super_admins() - super_admins_id = list(super_admins.values_list('id', flat=True)) + super_admin_ids = list(super_admins.values_list('id', flat=True)) org_admins = cls.get_org_admins(org) - org_admins_id = list(org_admins.values_list('id', flat=True)) - admins_id = set(org_admins_id + super_admins_id) - admins = User.objects.filter(id__in=admins_id) + org_admin_ids = list(org_admins.values_list('id', flat=True)) + admin_ids = set(org_admin_ids + super_admin_ids) + admins = User.objects.filter(id__in=admin_ids) return admins diff --git a/utils/generate_fake_data/resources/assets.py b/utils/generate_fake_data/resources/assets.py index 4279e6c5a..c6817e440 100644 --- a/utils/generate_fake_data/resources/assets.py +++ b/utils/generate_fake_data/resources/assets.py @@ -57,16 +57,16 @@ class NodesGenerator(FakeDataGenerator): class AssetsGenerator(FakeDataGenerator): resource = 'asset' - admin_users_id: list - nodes_id: list + admin_user_ids: list + node_ids: list def pre_generate(self): - self.admin_users_id = list(AdminUser.objects.all().values_list('id', flat=True)) - self.nodes_id = list(Node.objects.all().values_list('id', flat=True)) + self.admin_user_ids = list(AdminUser.objects.all().values_list('id', flat=True)) + self.node_ids = list(Node.objects.all().values_list('id', flat=True)) def set_assets_nodes(self, assets): for asset in assets: - nodes_id_add_to = random.sample(self.nodes_id, 3) + nodes_id_add_to = random.sample(self.node_ids, 3) asset.nodes.add(*nodes_id_add_to) def do_generate(self, batch, batch_size): @@ -79,7 +79,7 @@ class AssetsGenerator(FakeDataGenerator): data = dict( ip=ip, hostname=hostname, - admin_user_id=choice(self.admin_users_id), + admin_user_id=choice(self.admin_user_ids), created_by='Fake', org_id=self.org.id ) diff --git a/utils/generate_fake_data/resources/perms.py b/utils/generate_fake_data/resources/perms.py index e76e3618f..953712a5d 100644 --- a/utils/generate_fake_data/resources/perms.py +++ b/utils/generate_fake_data/resources/perms.py @@ -10,46 +10,46 @@ from perms.models import * class AssetPermissionGenerator(FakeDataGenerator): resource = 'asset_permission' - users_id: list - user_groups_id: list - assets_id: list - nodes_id: list - system_users_id: list + user_ids: list + user_group_ids: list + asset_ids: list + node_ids: list + system_user_ids: list def pre_generate(self): - self.nodes_id = list(Node.objects.all().values_list('id', flat=True)) - self.assets_id = list(Asset.objects.all().values_list('id', flat=True)) - self.system_users_id = list(SystemUser.objects.all().values_list('id', flat=True)) - self.users_id = list(User.objects.all().values_list('id', flat=True)) - self.user_groups_id = list(UserGroup.objects.all().values_list('id', flat=True)) + self.node_ids = list(Node.objects.all().values_list('id', flat=True)) + self.asset_ids = list(Asset.objects.all().values_list('id', flat=True)) + self.system_user_ids = list(SystemUser.objects.all().values_list('id', flat=True)) + self.user_ids = list(User.objects.all().values_list('id', flat=True)) + self.user_group_ids = list(UserGroup.objects.all().values_list('id', flat=True)) def set_users(self, perms): through = AssetPermission.users.through - choices = self.users_id + choices = self.user_ids relation_name = 'user_id' self.set_relations(perms, through, relation_name, choices) def set_user_groups(self, perms): through = AssetPermission.user_groups.through - choices = self.user_groups_id + choices = self.user_group_ids relation_name = 'usergroup_id' self.set_relations(perms, through, relation_name, choices) def set_assets(self, perms): through = AssetPermission.assets.through - choices = self.assets_id + choices = self.asset_ids relation_name = 'asset_id' self.set_relations(perms, through, relation_name, choices) def set_nodes(self, perms): through = AssetPermission.nodes.through - choices = self.nodes_id + choices = self.node_ids relation_name = 'node_id' self.set_relations(perms, through, relation_name, choices) def set_system_users(self, perms): through = AssetPermission.system_users.through - choices = self.system_users_id + choices = self.system_user_ids relation_name = 'systemuser_id' self.set_relations(perms, through, relation_name, choices) @@ -59,8 +59,8 @@ class AssetPermissionGenerator(FakeDataGenerator): for perm in perms: if choice_count is None: choice_count = choice(range(8)) - resources_id = sample(choices, choice_count) - for rid in resources_id: + resource_ids = sample(choices, choice_count) + for rid in resource_ids: data = {'assetpermission_id': perm.id} data[relation_name] = rid relations.append(through(**data)) diff --git a/utils/generate_fake_data/resources/users.py b/utils/generate_fake_data/resources/users.py index 0d8cbab9a..887c7240c 100644 --- a/utils/generate_fake_data/resources/users.py +++ b/utils/generate_fake_data/resources/users.py @@ -21,11 +21,11 @@ class UserGroupGenerator(FakeDataGenerator): class UserGenerator(FakeDataGenerator): resource = 'user' roles: list - groups_id: list + group_ids: list def pre_generate(self): self.roles = list(dict(User.ROLE.choices).keys()) - self.groups_id = list(UserGroup.objects.all().values_list('id', flat=True)) + self.group_ids = list(UserGroup.objects.all().values_list('id', flat=True)) def set_org(self, users): relations = [] @@ -39,7 +39,7 @@ class UserGenerator(FakeDataGenerator): def set_groups(self, users): relations = [] for i in users: - groups_to_join = sample(self.groups_id, 3) + groups_to_join = sample(self.group_ids, 3) _relations = [User.groups.through(user_id=i.id, usergroup_id=gid) for gid in groups_to_join] relations.extend(_relations) User.groups.through.objects.bulk_create(relations, ignore_conflicts=True)