jinql
/
webssh
mirror of https://github.com/huashengdun/webssh
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactored handler.py

pull/58/head
Sheng 2019-02-21 16:03:23 +08:00
parent a82565bf2d
commit 4b27da5f38
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
webssh/handler.py
View File

@ -275,10 +275,10 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler):
if self.ssh_client._system_host_keys.lookup(key) is None: if self.ssh_client._system_host_keys.lookup(key) is None:
if self.ssh_client._host_keys.lookup(key) is None: if self.ssh_client._host_keys.lookup(key) is None:
raise ValueError( raise tornado.web.HTTPError(
'Connection to {}:{} is not allowed.'.format( 403, 'Connection to {}:{} is not allowed.'.format(
hostname, port) hostname, port)
) )
def get_args(self): def get_args(self):
hostname = self.get_hostname() hostname = self.get_hostname()
@ -309,15 +309,9 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler):
return result if result else 'utf-8' return result if result else 'utf-8'
def ssh_connect(self): def ssh_connect(self, args):
ssh = self.ssh_client ssh = self.ssh_client
dst_addr = args[:2]
try:
args = self.get_args()
except InvalidValueError as exc:
raise tornado.web.HTTPError(400, str(exc))
dst_addr = (args[0], args[1])
logging.info('Connecting to {}:{}'.format(*dst_addr)) logging.info('Connecting to {}:{}'.format(*dst_addr))
try: try:
@ -337,9 +331,9 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler):
worker.encoding = self.get_default_encoding(ssh) worker.encoding = self.get_default_encoding(ssh)
return worker return worker
def ssh_connect_wrapped(self, future): def ssh_connect_wrapped(self, future, args):
try: try:
worker = self.ssh_connect() worker = self.ssh_connect(args)
except Exception as exc: except Exception as exc:
logging.error(traceback.format_exc()) logging.error(traceback.format_exc())
future.set_exception(exc) future.set_exception(exc)
@ -378,9 +372,16 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler):
self.check_origin() self.check_origin()
try:
args = self.get_args()
except InvalidValueError as exc:
raise tornado.web.HTTPError(400, str(exc))
future = Future() future = Future()
t = threading.Thread(target=self.ssh_connect_wrapped, args=(future,)) t = threading.Thread(
t.setDaemon(True) target=self.ssh_connect_wrapped, args=(future, args)
)
t.daemon = True
t.start() t.start()
try: try: