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

perf: 授权创建时 通过模版创建账号 给账号添加来源 (#12345) 

Co-authored-by: feng <1304903146@qq.com>
pull/12348/head
fit2bot 2023-12-15 18:28:48 +08:00 committed by GitHub
parent 84b316e2c1
commit 714c44fbf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/perms/serializers/permission.py
View File

@ -4,6 +4,7 @@ from django.db.models import Q
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from rest_framework import serializers from rest_framework import serializers
from accounts.const import Source
from accounts.models import AccountTemplate, Account from accounts.models import AccountTemplate, Account
from accounts.tasks import push_accounts_to_assets_task from accounts.tasks import push_accounts_to_assets_task
from assets.models import Asset, Node from assets.models import Asset, Node
@ -85,6 +86,7 @@ class AssetPermissionSerializer(ResourceLabelsMixin, BulkOrgResourceModelSeriali
] ]
for asset in assets: for asset in assets:
asset_exist_accounts = Account.objects.none() asset_exist_accounts = Account.objects.none()
asset_exist_account_names = asset.accounts.values_list('name', flat=True)
for template in self.template_accounts: for template in self.template_accounts:
asset_exist_accounts |= asset.accounts.filter( asset_exist_accounts |= asset.accounts.filter(
username=template.username, username=template.username,
@ -96,11 +98,13 @@ class AssetPermissionSerializer(ResourceLabelsMixin, BulkOrgResourceModelSeriali
'username': template.username, 'username': template.username,
'secret_type': template.secret_type 'secret_type': template.secret_type
} }
if condition in username_secret_type_dict: if condition in username_secret_type_dict or \
template.name in asset_exist_account_names:
continue continue
account_data = {key: getattr(template, key) for key in account_attribute} account_data = {key: getattr(template, key) for key in account_attribute}
account_data['su_from'] = template.get_su_from_account(asset) account_data['su_from'] = template.get_su_from_account(asset)
account_data['name'] = f"{account_data['name']}-{_('Account template')}" account_data['source'] = Source.TEMPLATE
account_data['source_id'] = str(template.id)
need_create_accounts.append(Account(**{'asset_id': asset.id, **account_data})) need_create_accounts.append(Account(**{'asset_id': asset.id, **account_data}))
return Account.objects.bulk_create(need_create_accounts) return Account.objects.bulk_create(need_create_accounts)