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

Updated lookup_hostname

pull/30/merge
Sheng 2018-10-08 22:37:03 +08:00
parent c873b50522
commit 33703f0ca3
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/test_app.py
View File

@ -536,4 +536,5 @@ class TestAppWithRejectPolicy(OtherTestBase):
data = json.loads(to_str(response.body)) data = json.loads(to_str(response.body))
self.assertIsNone(data['id']) self.assertIsNone(data['id'])
self.assertIsNone(data['encoding']) self.assertIsNone(data['encoding'])
self.assertEqual('Connection to 127.0.0.1 is not allowed.', data['status']) # noqa message = 'Connection to {}:{} is not allowed.'.format(self.body['hostname'], self.sshserver_port) # noqa
self.assertEqual(message, data['status'])

12
webssh/handler.py
View File

@ -152,12 +152,14 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler):
raise InvalidValueError('Invalid hostname: {}'.format(value)) raise InvalidValueError('Invalid hostname: {}'.format(value))
return value return value
def lookup_hostname(self, hostname): def lookup_hostname(self, hostname, port):
if isinstance(self.policy, paramiko.RejectPolicy): if isinstance(self.policy, paramiko.RejectPolicy):
if self.ssh_client._system_host_keys.lookup(hostname) is None: key = hostname if port == 22 else '[{}]:{}'.format(hostname, port)
if self.ssh_client._host_keys.lookup(hostname) is None: if self.ssh_client._system_host_keys.lookup(key) is None:
if self.ssh_client._host_keys.lookup(key) is None:
raise ValueError( raise ValueError(
'Connection to {} is not allowed.'.format(hostname) 'Connection to {}:{} is not allowed.'.format(
hostname, port)
) )
def get_port(self): def get_port(self):
@ -174,8 +176,8 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler):
def get_args(self): def get_args(self):
hostname = self.get_hostname() hostname = self.get_hostname()
self.lookup_hostname(hostname)
port = self.get_port() port = self.get_port()
self.lookup_hostname(hostname, port)
username = self.get_value('username') username = self.get_value('username')
password = self.get_argument('password', u'') password = self.get_argument('password', u'')
privatekey = self.get_privatekey() privatekey = self.get_privatekey()