Commit ce3c70c4 by Sheng

Renamed get_pkey to get_pkey_obj

parent 24de6477
...@@ -60,7 +60,7 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler): ...@@ -60,7 +60,7 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler):
else: else:
return pkey return pkey
def get_pkey(self, privatekey, password): def get_pkey_obj(self, privatekey, password):
password = password.encode('utf-8') if password else None password = password.encode('utf-8') if password else None
pkey = self.get_specific_pkey(paramiko.RSAKey, privatekey, password)\ pkey = self.get_specific_pkey(paramiko.RSAKey, privatekey, password)\
...@@ -97,7 +97,7 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler): ...@@ -97,7 +97,7 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler):
username = self.get_value('username') username = self.get_value('username')
password = self.get_argument('password') password = self.get_argument('password')
privatekey = self.get_privatekey() privatekey = self.get_privatekey()
pkey = self.get_pkey(privatekey, password) if privatekey else None pkey = self.get_pkey_obj(privatekey, password) if privatekey else None
args = (hostname, port, username, password, pkey) args = (hostname, port, username, password, pkey)
logging.debug(args) logging.debug(args)
return args return args
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment