github/webssh
1
0
Fork 0
mirror of https://github.com/huashengdun/webssh.git synced 2026-08-20 12:46:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Call lookup_hostname only under reject policy

Browse Source
This commit is contained in:
Sheng
2018-10-08 23:28:04 +08:00
parent 33703f0ca3
commit de0fda1ae1
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webssh/handler.py
+15 -13
View File
@@ -152,16 +152,6 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler):
raise InvalidValueError('Invalid hostname: {}'.format(value))
return value
def lookup_hostname(self, hostname, port):
if isinstance(self.policy, paramiko.RejectPolicy):
key = hostname if port == 22 else '[{}]:{}'.format(hostname, port)
if self.ssh_client._system_host_keys.lookup(key) is None:
if self.ssh_client._host_keys.lookup(key) is None:
raise ValueError(
'Connection to {}:{} is not allowed.'.format(
hostname, port)
)
def get_port(self):
value = self.get_value('port')
try:
@@ -174,16 +164,28 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler):
raise InvalidValueError('Invalid port: {}'.format(value))
def lookup_hostname(self, hostname, port):
key = hostname if port == 22 else '[{}]:{}'.format(hostname, port)
if self.ssh_client._system_host_keys.lookup(key) is None:
if self.ssh_client._host_keys.lookup(key) is None:
raise ValueError(
'Connection to {}:{} is not allowed.'.format(
hostname, port)
)
def get_args(self):
hostname = self.get_hostname()
port = self.get_port()
self.lookup_hostname(hostname, port)
if isinstance(self.policy, paramiko.RejectPolicy):
self.lookup_hostname(hostname, port)
username = self.get_value('username')
password = self.get_argument('password', u'')
privatekey = self.get_privatekey()
if privatekey:
pkey = self.get_pkey_obj(privatekey, password,
self.privatekey_filename)
pkey = self.get_pkey_obj(
privatekey, password, self.privatekey_filename
)
else:
pkey = None
args = (hostname, port, username, password, pkey)