Updated sftp error handling. Added sftp tests.

Author: Pan

ssh/error_codes.pyx

@@ -0,0 +1,23 @@
+# This file is part of ssh-python.
+# Copyright (C) 2018 Panos Kittenis
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation, version 2.1.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-130
+
+cimport c_ssh
+
+
+SSH_OK = c_ssh.SSH_OK
+SSH_EOF = c_ssh.SSH_EOF
+SSH_ERROR = c_ssh.SSH_ERROR
+SSH_AGAIN = c_ssh.SSH_AGAIN

ssh/session.pyx

@@ -29,7 +29,7 @@ from sftp cimport SFTP
 from exceptions import OptionError, InvalidAPIUse
 
 cimport c_ssh
-from c_sftp cimport sftp_session, sftp_new
+from c_sftp cimport sftp_session, sftp_new, sftp_init
 
 
 cdef bint _check_connected(c_ssh.ssh_session session) nogil except -1:
@@ -95,6 +95,26 @@ cdef class Session:
                 c_ssh.ssh_get_error_code(self._session), self._session)
         return SFTP.from_ptr(_sftp, self)
 
+    def sftp_init(self):
+        """Convenience function for creating and initialising new SFTP
+        session.
+
+        Not part of libssh API."""
+        cdef sftp_session _sftp
+        cdef SFTP sftp
+        cdef int rc
+        with nogil:
+            _check_connected(self._session)
+            _sftp = sftp_new(self._session)
+            if _sftp is NULL:
+                with gil:
+                    return handle_ssh_error_codes(
+                        c_ssh.ssh_get_error_code(self._session), self._session)
+            rc = sftp_init(_sftp)
+        sftp = SFTP.from_ptr(_sftp, self)
+        handle_ssh_error_codes(rc, self._session)
+        return sftp
+
     def connect(self):
         cdef int rc
         with nogil:

ssh/sftp.pyx

@@ -21,10 +21,10 @@ from sftp_handles cimport SFTPFile, SFTPDir
 from sftp_attributes cimport SFTPAttributes
 from sftp_statvfs cimport SFTPStatVFS
 from utils cimport handle_ssh_error_codes, to_bytes
-from .exceptions import SFTPHandleError
+from .exceptions import SFTPError
 
 cimport c_sftp
-from c_ssh cimport ssh_get_error_code, timeval
+from c_ssh cimport ssh_get_error, ssh_get_error_code, timeval
 
 
 cdef class SFTP:
@@ -98,12 +98,7 @@ cdef class SFTP:
         with nogil:
             c_dir = c_sftp.sftp_opendir(self._sftp, c_path)
         if c_dir is NULL:
-            # May or may not be an 'ssh error' which only handles
-            # three error types
-            handle_ssh_error_codes(
-                ssh_get_error_code(self.session._session),
-                self.session._session)
-            raise SFTPHandleError
+            raise SFTPError(ssh_get_error(self.session._session))
         _dir = SFTPDir.from_ptr(c_dir, self)
         return _dir
 
@@ -115,10 +110,7 @@ cdef class SFTP:
         with nogil:
             c_attrs = c_sftp.sftp_stat(self._sftp, c_path)
         if c_attrs is NULL:
-            handle_ssh_error_codes(
-                ssh_get_error_code(self.session._session),
-                self.session._session)
-            raise SFTPHandleError
+            raise SFTPError(ssh_get_error(self.session._session))
         _attrs = SFTPAttributes.from_ptr(c_attrs, self)
         return _attrs
 
@@ -130,10 +122,7 @@ cdef class SFTP:
         with nogil:
             c_attrs = c_sftp.sftp_lstat(self._sftp, c_path)
         if c_attrs is NULL:
-            handle_ssh_error_codes(
-                ssh_get_error_code(self.session._session),
-                self.session._session)
-            raise SFTPHandleError
+            raise SFTPError(ssh_get_error(self.session._session))
         _attrs = SFTPAttributes.from_ptr(c_attrs, self)
         return _attrs
 
@@ -145,10 +134,7 @@ cdef class SFTP:
         with nogil:
             c_file = c_sftp.sftp_open(self._sftp, c_path, accesstype, mode)
         if c_file is NULL:
-            handle_ssh_error_codes(
-                ssh_get_error_code(self.session._session),
-                self.session._session)
-            raise SFTPHandleError
+            raise SFTPError(ssh_get_error(self.session._session))
         _file = SFTPFile.from_ptr(c_file, self)
         return _file
 
@@ -158,7 +144,7 @@ cdef class SFTP:
         cdef int rc
         with nogil:
             rc = c_sftp.sftp_unlink(self._sftp, c_path)
-        return handle_ssh_error_codes(rc,  self.session._session)
+        return handle_ssh_error_codes(rc, self.session._session)
 
     def rmdir(self, path not None):
         cdef bytes b_path = to_bytes(path)

ssh/sftp_handles.pyx

@@ -130,7 +130,7 @@ cdef class SFTPFile:
                 if size == SSH_ERROR:
                     raise SFTPError(ssh_get_error(self.sftp.session._session))
                 elif size == SSH_AGAIN:
-                    return SSH_AGAIN
+                    return SSH_AGAIN, buf
         finally:
             free(c_buf)
         return size, buf