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

Added function clear_worker

pull/75/head
Sheng 2019-07-04 18:17:36 +08:00
parent 86abf6912d
commit 976b00ca85
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
webssh/handler.py
View File

@ -348,7 +348,7 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler):
chan = ssh.invoke_shell(term='xterm') chan = ssh.invoke_shell(term='xterm')
chan.setblocking(0) chan.setblocking(0)
worker = Worker(self.loop, ssh, chan, dst_addr, self.src_addr) worker = Worker(self.loop, ssh, chan, dst_addr)
worker.encoding = self.get_default_encoding(ssh) worker.encoding = self.get_default_encoding(ssh)
return worker return worker
@ -378,8 +378,9 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler):
# for testing purpose only # for testing purpose only
raise ValueError('Uncaught exception') raise ValueError('Uncaught exception')
self.src_addr = self.get_client_addr() ip, port = self.get_client_addr()
if len(clients.get(self.src_addr[0], {})) >= options.maxconn: workers = clients.get(ip, {})
if workers and len(workers) >= options.maxconn:
raise tornado.web.HTTPError(403, 'Too many live connections.') raise tornado.web.HTTPError(403, 'Too many live connections.')
self.check_origin() self.check_origin()
@ -397,7 +398,9 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler):
logging.error(traceback.format_exc()) logging.error(traceback.format_exc())
self.result.update(status=str(exc)) self.result.update(status=str(exc))
else: else:
workers = clients.setdefault(worker.src_addr[0], {}) if not workers:
clients[ip] = workers
worker.src_addr = (ip, port)
workers[worker.id] = worker workers[worker.id] = worker
self.loop.call_later(DELAY, recycle_worker, worker) self.loop.call_later(DELAY, recycle_worker, worker)
self.result.update(id=worker.id, encoding=worker.encoding) self.result.update(id=worker.id, encoding=worker.encoding)

22
webssh/worker.py
View File

@ -7,7 +7,22 @@ from tornado.util import errno_from_exception
BUF_SIZE = 32 * 1024 BUF_SIZE = 32 * 1024
clients = {} clients = {} # {ip: {id: worker}}
def clear_worker(worker, clients):
ip = worker.src_addr[0]
workers = clients.get(ip)
if workers:
try:
workers.pop(worker.id)
except KeyError:
pass
else:
if not workers:
clients.pop(ip)
if not clients:
clients.clear()
def recycle_worker(worker): def recycle_worker(worker):
@ -18,12 +33,11 @@ def recycle_worker(worker):
class Worker(object): class Worker(object):
def __init__(self, loop, ssh, chan, dst_addr, src_addr): def __init__(self, loop, ssh, chan, dst_addr):
self.loop = loop self.loop = loop
self.ssh = ssh self.ssh = ssh
self.chan = chan self.chan = chan
self.dst_addr = dst_addr self.dst_addr = dst_addr
self.src_addr = src_addr
self.fd = chan.fileno() self.fd = chan.fileno()
self.id = str(id(self)) self.id = str(id(self))
self.data_to_dst = [] self.data_to_dst = []
@ -110,5 +124,5 @@ class Worker(object):
self.ssh.close() self.ssh.close()
logging.info('Connection to {}:{} lost'.format(*self.dst_addr)) logging.info('Connection to {}:{} lost'.format(*self.dst_addr))
clients[self.src_addr[0]].pop(self.id, None) clear_worker(self, clients)
logging.debug(clients) logging.debug(clients)