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

fix: 账号创建ssh key 校验 (#10494) 

Co-authored-by: feng <1304903146@qq.com>
pull/10495/head
fit2bot 2023-05-18 18:00:58 +08:00 committed by GitHub
parent b368b6aef4
commit 0596b74fa1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,7 @@ class AccountCreateUpdateSerializerMixin(serializers.Serializer):
write_only=True, label=_('Exist policy') write_only=True, label=_('Exist policy')
) )
_template = None _template = None
clean_auth_fields: callable
class Meta: class Meta:
fields = ['template', 'push_now', 'params', 'on_invalid'] fields = ['template', 'push_now', 'params', 'on_invalid']
@ -159,6 +160,7 @@ class AccountCreateUpdateSerializerMixin(serializers.Serializer):
def create(self, validated_data): def create(self, validated_data):
push_now = validated_data.pop('push_now', None) push_now = validated_data.pop('push_now', None)
params = validated_data.pop('params', None) params = validated_data.pop('params', None)
self.clean_auth_fields(validated_data)
self.generate_source_data(validated_data) self.generate_source_data(validated_data)
instance, stat = self.do_create(validated_data) instance, stat = self.do_create(validated_data)
self.push_account_if_need(instance, push_now, params, stat) self.push_account_if_need(instance, push_now, params, stat)
@ -249,7 +251,7 @@ class AssetAccountBulkSerializer(
class Meta: class Meta:
model = Account model = Account
fields = [ fields = [
'name', 'username', 'secret', 'secret_type', 'name', 'username', 'secret', 'secret_type', 'passphrase',
'privileged', 'is_active', 'comment', 'template', 'privileged', 'is_active', 'comment', 'template',
'on_invalid', 'push_now', 'assets', 'su_from_username' 'on_invalid', 'push_now', 'assets', 'su_from_username'
] ]
@ -354,6 +356,7 @@ class AssetAccountBulkSerializer(
vd = vd.copy() vd = vd.copy()
vd['asset'] = asset vd['asset'] = asset
try: try:
self.clean_auth_fields(vd)
instance, changed, state = self.perform_create(vd, create_handler) instance, changed, state = self.perform_create(vd, create_handler)
_results[asset] = { _results[asset] = {
'changed': changed, 'instance': instance.id, 'state': state 'changed': changed, 'instance': instance.id, 'state': state