Skip to content
Snippets Groups Projects
Commit c8bfad9c authored by Chris Hines's avatar Chris Hines
Browse files

fix up ssh error messages to make sure they get into the HTTP error response

parent f4abf2ac
No related branches found
No related tags found
2 merge requests!11Dev,!6Dev
Pipeline #7145 passed
......@@ -121,11 +121,13 @@ class Ssh:
except FileNotFoundError:
mode = None
logger.debug("control socket not open")
logger.error(ctrl_p.stderr.read())
raise SshCtrlException(ctrl_p.stderr.read().decode())
error = ctrp_p.stderr.read()
logger.error(error)
raise SshCtrlException(error.decode())
if not stat.S_ISSOCK(mode):
logger.error(ctrl_p.stderr.read())
raise SshCtrlException(ctrl_p.stderr.read().decode())
error = ctrp_p.stderr.read()
logger.error(error)
raise SshCtrlException(error.decode())
return ctrlsocket
@staticmethod
......@@ -247,7 +249,7 @@ class Ssh:
logger.error(stderr.decode())
logger.error(('Permission denied' in stderr.decode()))
logger.error('Couldn\'t canonicalize: No such file or directory' in stderr.decode())
raise SshCtrlException()
raise SshCtrlException(stderr.decode())
dirlist = Ssh.parse_sftp_output(stdout.decode())
return dirlist
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment