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

Updated handler.py and test_hanlder.py

pull/12/merge
Sheng 2018-04-25 19:01:54 +08:00
parent 50ab045c1f
commit d1177bc2c5
2 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tests/test_handler.py
View File

@ -1,5 +1,4 @@
import unittest import unittest
import sys
from tornado.httputil import HTTPServerRequest from tornado.httputil import HTTPServerRequest
from handler import MixinHandler from handler import MixinHandler
@ -7,33 +6,23 @@ from handler import MixinHandler
class TestMixinHandler(unittest.TestCase): class TestMixinHandler(unittest.TestCase):
def test_get_real_client_addr_without_nginx_config(self): def test_get_real_client_addr(self):
handler = MixinHandler() handler = MixinHandler()
handler.request = HTTPServerRequest(uri='/') handler.request = HTTPServerRequest(uri='/')
self.assertIsNone(handler.get_real_client_addr()) self.assertIsNone(handler.get_real_client_addr())
def test_get_real_client_addr_with_correct_nginx_config(self):
handler = MixinHandler()
handler.request = HTTPServerRequest(uri='/')
ip = '127.0.0.1' ip = '127.0.0.1'
handler.request.headers.add('X-Real-Ip', ip) handler.request.headers.add('X-Real-Ip', ip)
handler.request.headers.add('X-Real-Port', '12345') self.assertEqual(handler.get_real_client_addr(), False)
self.assertEqual(handler.get_real_client_addr(), (ip, 12345))
@unittest.skipIf(sys.version_info < (3,),
reason='assertLogs not supported in Python 2')
def test_get_real_client_addr_with_bad_nginx_config(self):
handler = MixinHandler()
handler.request = HTTPServerRequest(uri='/')
ip = '127.0.0.1'
handler.request.headers.add('X-Real-Ip', ip)
with self.assertLogs() as cm:
handler.get_real_client_addr()
self.assertEqual(cm.output, ['WARNING:root:Bad nginx configuration.'])
handler.request.headers.add('X-Real-Port', '12345x') handler.request.headers.add('X-Real-Port', '12345x')
with self.assertLogs() as cm: self.assertEqual(handler.get_real_client_addr(), False)
handler.get_real_client_addr()
self.assertEqual(cm.output, ['WARNING:root:Bad nginx configuration.']) handler.request.headers.update({'X-Real-Port': '12345'})
self.assertEqual(handler.get_real_client_addr(), (ip, 12345))
handler.request.headers.update({'X-Real-ip': None})
self.assertEqual(handler.get_real_client_addr(), False)
handler.request.headers.update({'X-Real-Port': '12345x'})
self.assertEqual(handler.get_real_client_addr(), False)

2
webssh/handler.py
View File

@ -35,7 +35,9 @@ class MixinHandler(object):
else: else:
if ip: # does not validate ip and port here if ip: # does not validate ip and port here
return (ip, port) return (ip, port)
logging.warn('Bad nginx configuration.') logging.warn('Bad nginx configuration.')
return False
class IndexHandler(MixinHandler, tornado.web.RequestHandler): class IndexHandler(MixinHandler, tornado.web.RequestHandler):