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

Move get_client_addr to MixinHandler

pull/38/head
Sheng 2018-10-13 22:16:16 +08:00
parent e66e5f2045
commit deef92fe66
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
webssh/handler.py
View File

@ -48,6 +48,10 @@ class MixinHandler(object):
raise InvalidValueError('Missing value {}'.format(name)) raise InvalidValueError('Missing value {}'.format(name))
return value return value
def get_client_addr(self):
return self.get_real_client_addr() or self.request.connection.context.\
address
def get_real_client_addr(self): def get_real_client_addr(self):
ip = self.request.remote_ip ip = self.request.remote_ip
@ -194,10 +198,6 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler):
logging.debug(args) logging.debug(args)
return args return args
def get_client_addr(self):
return self.get_real_client_addr() or self.request.connection.stream.\
socket.getpeername()
def get_default_encoding(self, ssh): def get_default_encoding(self, ssh):
try: try:
_, stdout, _ = ssh.exec_command('locale charmap') _, stdout, _ = ssh.exec_command('locale charmap')
@ -277,9 +277,6 @@ class WsockHandler(MixinHandler, tornado.websocket.WebSocketHandler):
self.loop = loop self.loop = loop
self.worker_ref = None self.worker_ref = None
def get_client_addr(self):
return self.get_real_client_addr() or self.stream.socket.getpeername()
def open(self): def open(self):
self.src_addr = self.get_client_addr() self.src_addr = self.get_client_addr()
logging.info('Connected from {}:{}'.format(*self.src_addr)) logging.info('Connected from {}:{}'.format(*self.src_addr))