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

Set default port 22 on server side

pull/38/head
Sheng 2018-10-10 22:30:37 +08:00
parent 66891cb71c
commit 0c9db2abaf
3 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/test_app.py
View File

@ -92,10 +92,6 @@ class TestAppBasic(AsyncHTTPTestCase):
response = self.sync_post(body) response = self.sync_post(body)
self.assert_response(b'Missing argument hostname', response) self.assert_response(b'Missing argument hostname', response)
body = 'hostname=127.0.0.1&username=admin&password&_xsrf=yummy'
response = self.sync_post(body)
self.assert_response(b'Missing argument port', response)
body = 'hostname=127.0.0.1&port=7000&password&_xsrf=yummy' body = 'hostname=127.0.0.1&port=7000&password&_xsrf=yummy'
response = self.sync_post(body) response = self.sync_post(body)
self.assert_response(b'Missing argument username', response) self.assert_response(b'Missing argument username', response)
@ -104,10 +100,6 @@ class TestAppBasic(AsyncHTTPTestCase):
response = self.sync_post(body) response = self.sync_post(body)
self.assert_response(b'Missing value hostname', response) self.assert_response(b'Missing value hostname', response)
body = 'hostname=127.0.0.1&port=&username=&password&_xsrf=yummy'
response = self.sync_post(body)
self.assert_response(b'Missing value port', response)
body = 'hostname=127.0.0.1&port=7000&username=&password&_xsrf=yummy' body = 'hostname=127.0.0.1&port=7000&username=&password&_xsrf=yummy'
response = self.sync_post(body) response = self.sync_post(body)
self.assert_response(b'Missing value username', response) self.assert_response(b'Missing value username', response)

12
webssh/handler.py
View File

@ -30,6 +30,7 @@ except ImportError:
DELAY = 3 DELAY = 3
KEY_MAX_SIZE = 16384 KEY_MAX_SIZE = 16384
DEFAULT_PORT = 22
class InvalidValueError(Exception): class InvalidValueError(Exception):
@ -154,11 +155,14 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler):
return value return value
def get_port(self): def get_port(self):
value = self.get_value('port') value = self.get_argument('port', u'')
if not value:
return DEFAULT_PORT
port = to_int(value) port = to_int(value)
if port and is_valid_port(port): if port is None or not is_valid_port(port):
return port raise InvalidValueError('Invalid port: {}'.format(value))
raise InvalidValueError('Invalid port: {}'.format(value)) return port
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)

8
webssh/static/js/main.js
View File

@ -387,11 +387,7 @@ jQuery(function($){
attr = attrs[i]; attr = attrs[i];
val = data.get(attr); val = data.get(attr);
if (typeof val === 'string') { if (typeof val === 'string') {
val = val.trim(); data.set(attr, val.trim());
if (attr === 'port' && val === '') {
val = 22;
}
data.set(attr, val);
} }
} }
} }
@ -410,7 +406,7 @@ jQuery(function($){
if (!hostname) { if (!hostname) {
msg = 'Need value hostname'; msg = 'Need value hostname';
} else if (!port) { } else if (!port) {
msg = 'Need value port'; msg = '';
} else if (!username) { } else if (!username) {
msg = 'Need value username'; msg = 'Need value username';
} else if (!hostname_tester.test(hostname)) { } else if (!hostname_tester.test(hostname)) {