diff --git a/webssh/handler.py b/webssh/handler.py index 6cfc822..5aaeef8 100644 --- a/webssh/handler.py +++ b/webssh/handler.py @@ -377,6 +377,12 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler): raise InvalidValueError('Invalid port: {}'.format(value)) return port + def get_source_address(self): + value = self.get_value('source_address') + if not is_valid_ip_address(value): + raise InvalidValueError('Invalid source ip address: {}'.format(value)) + return value + def lookup_hostname(self, 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() passphrase = self.get_argument('passphrase', u'') totp = self.get_argument('totp', u'') + source_address = self.get_source_address() if isinstance(self.policy, paramiko.RejectPolicy): self.lookup_hostname(hostname, port) @@ -404,8 +411,19 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler): else: 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 - args = (hostname, port, username, password, pkey) + args = (hostname, port, username, password, pkey, sock) logging.debug(args) return args @@ -451,6 +469,14 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler): dst_addr = args[:2] logging.info('Connecting to {}:{}'.format(*dst_addr)) + sock = args[5] + if sock: + logging.info('Connecting source address socket') + try: + sock.connect(dst_addr) + except socket.error: + raise ValueError('Unable to connect source address socket to {}:{}'.format(*dst_addr)) + try: ssh.connect(*args, timeout=options.timeout) except socket.error: @@ -600,4 +626,4 @@ class WsockHandler(MixinHandler, tornado.websocket.WebSocketHandler): worker = self.worker_ref() if self.worker_ref else None if worker: - worker.close(reason=self.close_reason) + worker.close(reason=self.close_reason) \ No newline at end of file diff --git a/webssh/templates/index.html b/webssh/templates/index.html index 3268c38..4b27e32 100644 --- a/webssh/templates/index.html +++ b/webssh/templates/index.html @@ -77,6 +77,8 @@