webssh

commit a274a88e7e9ccd5c0e09b140c48a01854715f9f9
parent 2b8b978ca20169e1fd75198b33ab83ee21878a16
Author: Sheng <webmaster0115@gmail.com>
Date:   Thu, 27 Jun 2019 13:40:58 +0800

Generate clear error message for invalid unencrypted key

Diffstat:
M
webssh/handler.py
 | 
9
+++++----

1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/webssh/handler.py b/webssh/handler.py
@@ -81,10 +81,11 @@ class PrivateKey(object):
             raise InvalidValueError('Need a password to decrypt the key.')
         except paramiko.SSHException as exc:
             logging.error(str(exc))
-            raise InvalidValueError(
-                'Invalid key or wrong password "{}" for decrypting it.'
-                .format(self.password)
-            )
+            msg = 'Invalid key'
+            if self.password:
+                msg += ' or wrong password "{}" for decrypting it.'.format(
+                        self.password)
+            raise InvalidValueError(msg)
 
 
 class MixinHandler(object):