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

wip: try source address

pull/322/head
Zsombor 2023-01-09 10:36:26 +02:00
parent 04bd859f15
commit 14eaa0beab
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
webssh/handler.py
View File

@ -377,6 +377,12 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler):
raise InvalidValueError('Invalid port: {}'.format(value)) raise InvalidValueError('Invalid port: {}'.format(value))
return port return port
def get_source_address(self):
value = self.get_value('source_address')
if not is_valid_ip_address(value):
raise InvalidValueError('Invalid ip address: {}'.format(value))
return value
def lookup_hostname(self, hostname, port): def lookup_hostname(self, hostname, port):
key = hostname if port == 22 else '[{}]:{}'.format(hostname, port) key = hostname if port == 22 else '[{}]:{}'.format(hostname, port)
@ -395,6 +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_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)
@ -405,7 +412,7 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler):
pkey = None pkey = None
self.ssh_client.totp = totp self.ssh_client.totp = totp
args = (hostname, port, username, password, pkey) args = (hostname, port, username, password, pkey, source_address)
logging.debug(args) logging.debug(args)
return args return args
@ -451,8 +458,17 @@ 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))
# WIP ZM
sock = socket.socket()
sock.settimeout(5) # otherwise it will hang if host is unreachable
sock.bind((args[5], 0))
print(args)
sock.connect((args[0], args[1]))
try: try:
ssh.connect(*args, timeout=options.timeout) ssh.connect(*args, timeout=options.timeout, sock=sock)
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:
@ -600,4 +616,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)