jocay/webssh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass None for empty password

Browse Source
This commit is contained in:
Sheng
2018-09-12 13:07:05 +08:00
parent 21d3f9bd7f
commit b372fcbbb2
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_handler.py
+2
View File
@@ -83,3 +83,5 @@ class TestIndexHandler(unittest.TestCase):
with self.assertRaises(InvalidValueError) as exc: with self.assertRaises(InvalidValueError) as exc:
pkey = IndexHandler.get_pkey_obj('x'+key, password, fname) pkey = IndexHandler.get_pkey_obj('x'+key, password, fname)
self.assertIn('Invalid private key', str(exc)) self.assertIn('Invalid private key', str(exc))
with self.assertRaises(paramiko.PasswordRequiredException):
pkey = IndexHandler.get_pkey_obj(key, '', fname)
webssh/handler.py
+1 -1
View File
@@ -118,7 +118,7 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler):
@classmethod @classmethod
def get_pkey_obj(cls, privatekey, password, filename): def get_pkey_obj(cls, privatekey, password, filename):
bpass = to_bytes(password) bpass = to_bytes(password) if password else None
pkey = cls.get_specific_pkey(paramiko.RSAKey, privatekey, bpass)\ pkey = cls.get_specific_pkey(paramiko.RSAKey, privatekey, bpass)\
or cls.get_specific_pkey(paramiko.DSSKey, privatekey, bpass)\ or cls.get_specific_pkey(paramiko.DSSKey, privatekey, bpass)\