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

Merge pull request #270 from Zotil/encoding_timeout

Browse Source 
timeout on exec_command
This commit is contained in:
Shengdun Hua
2022-02-20 21:18:18 +08:00
committed by GitHub
parent d74196eb00 c89fcc1da9
commit cd3c747747
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webssh/handler.py
+11 -6
View File
@@ -427,15 +427,20 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler):
for command in commands:
try:
_, stdout, _ = ssh.exec_command(command, get_pty=True)
_, stdout, _ = ssh.exec_command(command,
get_pty=True,
timeout=1)
except paramiko.SSHException as exc:
logging.info(str(exc))
else:
data = stdout.read()
logging.debug('{!r} => {!r}'.format(command, data))
result = self.parse_encoding(data)
if result:
return result
try:
data = stdout.read()
logging.debug('{!r} => {!r}'.format(command, data))
result = self.parse_encoding(data)
if result:
return result
except socket.timeout:
pass
logging.warning('Could not detect the default encoding.')
return 'utf-8'