sascha/devlib
1
0
Fork 0
mirror of https://github.com/ARM-software/devlib.git synced 2025-11-04 07:51:21 +00:00
Code Issues Releases Wiki Activity

ssh: Raise explicit exception when SFTP is not available

Browse Source 
When SFTP is not available on OpenSSH, paramiko will raise a generic
exception:

    paramiko.ssh_exception.SSHException: EOF during negotiation

In order to make it easier to debug, raise a TargetStableError telling
the user to enable SFTP on their server. On OpenSSH, this means
installing the sftp subsystem and enabling it in sshd_config.
This commit is contained in:
douglas-raillard-arm
2021-05-05 15:21:17 +01:00
committed by Marc Bonnici
parent 34e51e7230
commit b9374d530e
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
devlib/utils/ssh.py
View File

@@ -466,7 +466,13 @@ class SshConnection(SshConnectionBase):
return self.transfer_mgr.progress_cb if self.transfer_mgr is not None else None return self.transfer_mgr.progress_cb if self.transfer_mgr is not None else None
def _get_sftp(self, timeout): def _get_sftp(self, timeout):
sftp = self.client.open_sftp() try:
sftp = self.client.open_sftp()
except paramiko.ssh_exception.SSHException as e:
if 'EOF during negotiation' in str(e):
raise TargetStableError('The SSH server does not support SFTP. Please install and enable appropriate module.') from e
else:
raise
sftp.get_channel().settimeout(timeout) sftp.get_channel().settimeout(timeout)
return sftp return sftp