Generate clear error message for invalid unencrypted key

pull/75/head
Sheng 2019-06-27 13:40:58 +08:00
parent 2b8b978ca2
commit a274a88e7e
1 changed files with 5 additions and 4 deletions

View File

@ -81,10 +81,11 @@ class PrivateKey(object):
raise InvalidValueError('Need a password to decrypt the key.') raise InvalidValueError('Need a password to decrypt the key.')
except paramiko.SSHException as exc: except paramiko.SSHException as exc:
logging.error(str(exc)) logging.error(str(exc))
raise InvalidValueError( msg = 'Invalid key'
'Invalid key or wrong password "{}" for decrypting it.' if self.password:
.format(self.password) msg += ' or wrong password "{}" for decrypting it.'.format(
) self.password)
raise InvalidValueError(msg)
class MixinHandler(object): class MixinHandler(object):