github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-23 12:29:47 +00:00
Code Issues Projects Releases Wiki Activity

perf: account template secret (#9368)

Browse Source 
Co-authored-by: feng <1304903146@qq.com>
This commit is contained in:
fit2bot
2023-01-30 18:59:12 +08:00
committed by GitHub
parent 28d117bf3d
commit f18f2df4ab
2 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
apps/accounts/serializers/account/account.py
View File

@@ -10,7 +10,25 @@ from common.serializers import SecretReadableMixin, BulkModelSerializer
from .base import BaseAccountSerializer
class AccountSerializerCreateMixin(BulkModelSerializer):
class AccountSerializerCreateValidateMixin:
replace_attrs: callable
push_now: bool
def validate(self, attrs):
_id = attrs.pop('id', None)
if _id:
account_template = AccountTemplate.objects.get(id=_id)
attrs['secret'] = account_template.secret
account_template = attrs.pop('template', None)
if account_template:
self.replace_attrs(account_template, attrs)
self.push_now = attrs.pop('push_now', False)
return super().validate(attrs)
class AccountSerializerCreateMixin(
AccountSerializerCreateValidateMixin, BulkModelSerializer
):
template = serializers.UUIDField(
required=False, allow_null=True, write_only=True,
label=_('Account template')
@@ -40,13 +58,6 @@ class AccountSerializerCreateMixin(BulkModelSerializer):
for k, v in template_attrs.items():
attrs.setdefault(k, v)
def validate(self, attrs):
account_template = attrs.pop('template', None)
if account_template:
self.replace_attrs(account_template, attrs)
self.push_now = attrs.pop('push_now', False)
return super().validate(attrs)
def create(self, validated_data):
instance = super().create(validated_data)
if self.push_now: