don't allow private key passphrases for unencrypted private ssh keys

see: #5311
This commit is contained in:
Ryan Petrello 2017-02-15 12:22:52 -05:00
parent 6545869684
commit 4cbdeb0d30

View File

@ -345,6 +345,9 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique, ResourceMixin):
if self.has_encrypted_ssh_key_data and not self.ssh_key_unlock:
raise ValidationError(_('SSH key unlock must be set when SSH key '
'is encrypted.'))
if not self.has_encrypted_ssh_key_data and self.ssh_key_unlock:
raise ValidationError(_('SSH key unlock should not be set when '
'SSH key is not encrypted.'))
return self.ssh_key_unlock
def clean(self):