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

fix: 账号模版创建带密码的密钥之后无法添加到主机 (#9927) 

Co-authored-by: feng <1304903146@qq.com>
pull/9932/head
fit2bot 2023-03-13 15:46:17 +08:00 committed by GitHub
parent 6a9e013f2f
commit ed70432016
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/accounts/serializers/account/base.py
View File

@ -33,7 +33,8 @@ class AuthValidateMixin(serializers.Serializer):
return secret return secret
elif secret_type == SecretType.SSH_KEY: elif secret_type == SecretType.SSH_KEY:
passphrase = passphrase if passphrase else None passphrase = passphrase if passphrase else None
return validate_ssh_key(secret, passphrase) secret = validate_ssh_key(secret, passphrase)
return secret
else: else:
return secret return secret
@ -41,8 +42,9 @@ class AuthValidateMixin(serializers.Serializer):
secret_type = validated_data.get('secret_type') secret_type = validated_data.get('secret_type')
passphrase = validated_data.get('passphrase') passphrase = validated_data.get('passphrase')
secret = validated_data.pop('secret', None) secret = validated_data.pop('secret', None)
self.handle_secret(secret, secret_type, passphrase) validated_data['secret'] = self.handle_secret(
validated_data['secret'] = secret secret, secret_type, passphrase
)
for field in ('secret',): for field in ('secret',):
value = validated_data.get(field) value = validated_data.get(field)
if not value: if not value: