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

Strip encoding

pull/26/head
Sheng 2018-08-28 20:25:07 +08:00
parent 58feb5e76b
commit ad12876b0c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/sshserver.py
View File

@ -51,7 +51,7 @@ class Server(paramiko.ServerInterface):
b'UWT10hcuO4Ks8=') b'UWT10hcuO4Ks8=')
good_pub_key = paramiko.RSAKey(data=decodebytes(data)) good_pub_key = paramiko.RSAKey(data=decodebytes(data))
encodings = ['UTF-8', 'GBK'] encodings = ['UTF-8', 'GBK', 'UTF-8\r\n', 'GBK\r\n']
def __init__(self): def __init__(self):
self.shell_event = threading.Event() self.shell_event = threading.Event()
@ -146,7 +146,7 @@ def run_ssh_server(port=2200, running=True):
# chan.send('\r\n\r\nWelcome!\r\n\r\n') # chan.send('\r\n\r\nWelcome!\r\n\r\n')
print(server.encoding) print(server.encoding)
chan.send(banner.encode(server.encoding)) chan.send(banner.encode(server.encoding.strip()))
if username == 'bar': if username == 'bar':
msg = chan.recv(1024) msg = chan.recv(1024)
chan.send(msg) chan.send(msg)

2
webssh/handler.py
View File

@ -173,7 +173,7 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler):
except paramiko.SSHException: except paramiko.SSHException:
result = None result = None
else: else:
result = to_str(stdout.read()) result = to_str(stdout.read().strip())
return result if result else 'utf-8' return result if result else 'utf-8'