mirror of https://github.com/huashengdun/webssh
Pass None for empty password
parent
21d3f9bd7f
commit
b372fcbbb2
|
@ -83,3 +83,5 @@ class TestIndexHandler(unittest.TestCase):
|
|||
with self.assertRaises(InvalidValueError) as exc:
|
||||
pkey = IndexHandler.get_pkey_obj('x'+key, password, fname)
|
||||
self.assertIn('Invalid private key', str(exc))
|
||||
with self.assertRaises(paramiko.PasswordRequiredException):
|
||||
pkey = IndexHandler.get_pkey_obj(key, '', fname)
|
||||
|
|
|
@ -118,7 +118,7 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler):
|
|||
|
||||
@classmethod
|
||||
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)\
|
||||
or cls.get_specific_pkey(paramiko.DSSKey, privatekey, bpass)\
|
||||
|
|
Loading…
Reference in New Issue