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

Update handler.py 

fix: socket moved to ssh_connect
pull/323/head
mzsombor 2023-01-10 12:56:09 +02:00 committed by GitHub
parent d2c7cb3b38
commit 0a3e032568
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
webssh/handler.py
View File

@ -401,7 +401,7 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler):
privatekey, filename = self.get_privatekey() privatekey, filename = self.get_privatekey()
passphrase = self.get_argument('passphrase', u'') passphrase = self.get_argument('passphrase', u'')
totp = self.get_argument('totp', u'') totp = self.get_argument('totp', u'')
source_address = self.get_source_address() source_address = self.get_argument('source_address', u'')
if isinstance(self.policy, paramiko.RejectPolicy): if isinstance(self.policy, paramiko.RejectPolicy):
self.lookup_hostname(hostname, port) self.lookup_hostname(hostname, port)
@ -411,19 +411,8 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler):
else: else:
pkey = None pkey = None
if source_address:
logging.info("Binding socket for source ip {}".format(source_address))
sock = socket.socket()
sock.settimeout(options.timeout) # Set a timeout on blocking socket operations
try:
sock.bind((source_address, 0))
except OSError:
raise InvalidValueError('Unable to bind source address {} socket'.format(source_address))
else:
sock = None
self.ssh_client.totp = totp self.ssh_client.totp = totp
args = (hostname, port, username, password, pkey, sock) args = (hostname, port, username, password, pkey, source_address)
logging.debug(args) logging.debug(args)
return args return args
@ -469,16 +458,23 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler):
dst_addr = args[:2] dst_addr = args[:2]
logging.info('Connecting to {}:{}'.format(*dst_addr)) logging.info('Connecting to {}:{}'.format(*dst_addr))
sock = args[5] sock = None
if sock: source_address = args[5]
if source_address:
logging.info('Connecting source address socket') logging.info('Connecting source address socket')
sock = socket.socket()
sock.settimeout(options.timeout) # Set a timeout on blocking socket operations
try:
sock.bind((source_address, 0))
except OSError:
raise InvalidValueError('Unable to bind source address {} socket'.format(source_address))
try: try:
sock.connect(dst_addr) sock.connect(dst_addr)
except socket.error: except socket.error:
raise ValueError('Unable to connect source address socket to {}:{}'.format(*dst_addr)) raise ValueError('Unable to connect source address socket to {}:{}'.format(*dst_addr))
try: try:
ssh.connect(*args, timeout=options.timeout) ssh.connect(*args, sock=sock, timeout=options.timeout)
except socket.error: except socket.error:
raise ValueError('Unable to connect to {}:{}'.format(*dst_addr)) raise ValueError('Unable to connect to {}:{}'.format(*dst_addr))
except paramiko.BadAuthenticationType: except paramiko.BadAuthenticationType:
@ -626,4 +622,4 @@ class WsockHandler(MixinHandler, tornado.websocket.WebSocketHandler):
worker = self.worker_ref() if self.worker_ref else None worker = self.worker_ref() if self.worker_ref else None
if worker: if worker:
worker.close(reason=self.close_reason) worker.close(reason=self.close_reason)