Added SFTP implementation. Updated sftp stats and attributes.

Author: Pan

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "libssh"]
-	path = libssh
-	url = https://git.libssh.org/projects/libssh.git

libssh

@@ -20,10 +20,10 @@ from posix.types cimport mode_t
 
 cdef extern from "libssh/libssh.h" nogil:
     ctypedef long time_t
-    ctypedef long subseconds_t
+    ctypedef long suseconds_t
     cdef struct timeval:
         time_t       tv_sec
-        subseconds_t tv_usec
+        suseconds_t  tv_usec
     ctypedef unsigned char uint8_t
     ctypedef unsigned short uint16_t
     ctypedef unsigned int uint32_t

ssh/c_ssh.pxd

@@ -19,14 +19,6 @@ from session cimport Session
 cimport c_sftp
 
 
-cdef class SFTPStatVFS:
-    cdef c_sftp.sftp_statvfs_t _stats
-
-
-cdef class SFTPAttributes:
-    cdef c_sftp.sftp_attributes _attrs
-
-
 cdef class SFTP:
     cdef c_sftp.sftp_session _sftp
     cdef Session session

ssh/sftp.pxd

@@ -14,27 +14,16 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-130
 
+from libc.stdlib cimport malloc, free
+
 from session cimport Session
 from sftp_handles cimport SFTPFile, SFTPDir
-from utils cimport handle_ssh_error_codes
+from sftp_attributes cimport SFTPAttributes
+from sftp_statvfs cimport SFTPStatVFS
+from utils cimport handle_ssh_error_codes, to_bytes
 
 cimport c_sftp
-
-
-cdef class SFTPStatVFS:
-
-    def __dealloc__(self):
-        if self._stats is not NULL:
-            c_sftp.sftp_statvfs_free(self._stats)
-            self._stats = NULL
-
-
-cdef class SFTPAttributes:
-
-    def __dealloc__(self):
-        if self._attrs is not NULL:
-            c_sftp.sftp_attributes_free(self._attrs)
-            self._attrs = NULL
+from c_ssh cimport ssh_get_error_code, timeval
 
 
 cdef class SFTP:
@@ -47,16 +36,18 @@ cdef class SFTP:
 
     def __cinit__(self, Session session):
         self.session = session
-        cdef int rc
-        with nogil:
-            rc = c_sftp.sftp_init(self._sftp)
-        handle_ssh_error_codes(rc, self.session._session)
 
     def __dealloc__(self):
         if self._sftp is not NULL:
             c_sftp.sftp_free(self._sftp)
             self._sftp = NULL
 
+    def init(self):
+        cdef int rc
+        with nogil:
+            rc = c_sftp.sftp_init(self._sftp)
+        return handle_ssh_error_codes(rc, self.session._session)
+
     def get_error(self):
         cdef int rc
         with nogil:
@@ -70,62 +61,219 @@ cdef class SFTP:
         return rc
 
     def extensions_get_name(self, unsigned int indexn):
-        pass
+        cdef const char *_name
+        cdef bytes name = None
+        with nogil:
+            _name = c_sftp.sftp_extensions_get_name(self._sftp, indexn)
+        if _name is not NULL:
+            name = _name
+        return name
 
     def extensions_get_data(self, unsigned int indexn):
-        pass
+        cdef const char *_name
+        cdef bytes name = None
+        with nogil:
+            _name = c_sftp.sftp_extensions_get_data(self._sftp, indexn)
+        if _name is not NULL:
+            name = _name
+        return name
 
     def extension_supported(self, name not None, data not None):
-        pass
+        cdef bint rc
+        cdef bytes b_name = to_bytes(name)
+        cdef const char *c_name = b_name
+        cdef bytes b_data = to_bytes(data)
+        cdef const char *c_data = b_data
+        with nogil:
+            rc = c_sftp.sftp_extension_supported(
+                self._sftp, c_name, c_data)
+        return bool(rc)
 
     def opendir(self, path not None):
-        pass
+        cdef SFTPDir _dir
+        cdef c_sftp.sftp_dir c_dir
+        cdef bytes b_path = to_bytes(path)
+        cdef const char *c_path = b_path
+        with nogil:
+            c_dir = c_sftp.sftp_opendir(self._sftp, c_path)
+        if c_dir is NULL:
+            return handle_ssh_error_codes(
+                ssh_get_error_code(self.session._session),
+                self.session._session)
+        _dir = SFTPDir.from_ptr(c_dir, self)
+        return _dir
 
     def stat(self, path not None):
-        pass
+        cdef SFTPAttributes _attrs
+        cdef c_sftp.sftp_attributes c_attrs
+        cdef bytes b_path = to_bytes(path)
+        cdef const char *c_path = b_path
+        with nogil:
+            c_attrs = c_sftp.sftp_stat(self._sftp, c_path)
+        if c_attrs is NULL:
+            return handle_ssh_error_codes(
+                ssh_get_error_code(self.session._session),
+                self.session._session)
+        _attrs = SFTPAttributes.from_ptr(c_attrs, self)
+        return _attrs
 
     def lstat(self, path not None):
-        pass
+        cdef SFTPAttributes _attrs
+        cdef c_sftp.sftp_attributes c_attrs
+        cdef bytes b_path = to_bytes(path)
+        cdef const char *c_path = b_path
+        with nogil:
+            c_attrs = c_sftp.sftp_lstat(self._sftp, c_path)
+        if c_attrs is NULL:
+            return handle_ssh_error_codes(
+                ssh_get_error_code(self.session._session),
+                self.session._session)
+        _attrs = SFTPAttributes.from_ptr(c_attrs, self)
+        return _attrs
 
     def open(self, path not None, int accesstype, c_sftp.mode_t mode):
-        pass
+        cdef bytes b_path = to_bytes(path)
+        cdef const char *c_path = b_path
+        cdef SFTPFile _file
+        cdef c_sftp.sftp_file c_file
+        with nogil:
+            c_file = c_sftp.sftp_open(self._sftp, c_path, accesstype, mode)
+        if c_file is NULL:
+            return handle_ssh_error_codes(
+                ssh_get_error_code(self.session._session),
+                self.session._session)
+        _file = SFTPFile.from_ptr(c_file, self)
+        return _file
 
     def unlink(self, path not None):
-        pass
+        cdef bytes b_path = to_bytes(path)
+        cdef const char *c_path = b_path
+        cdef int rc
+        with nogil:
+            rc = c_sftp.sftp_unlink(self._sftp, c_path)
+        return handle_ssh_error_codes(rc,  self.session._session)
 
     def rmdir(self, path not None):
-        pass
+        cdef bytes b_path = to_bytes(path)
+        cdef const char *c_path = b_path
+        cdef int rc
+        with nogil:
+            rc = c_sftp.sftp_rmdir(self._sftp, c_path)
+        return handle_ssh_error_codes(rc, self.session._session)
 
     def mkdir(self, path not None, c_sftp.mode_t mode):
-        pass
+        cdef bytes b_path = to_bytes(path)
+        cdef const char *c_path = b_path
+        cdef int rc
+        with nogil:
+            rc = c_sftp.sftp_mkdir(self._sftp, c_path, mode)
+        return handle_ssh_error_codes(rc, self.session._session)
 
     def rename(self, original not None, newname not None):
-        pass
+        cdef bytes b_orig = to_bytes(original)
+        cdef const char *c_orig = b_orig
+        cdef bytes b_newname = to_bytes(newname)
+        cdef const char *c_newname = b_newname
+        cdef int rc
+        with nogil:
+            rc = c_sftp.sftp_rename(self._sftp, c_orig, c_newname)
+        return handle_ssh_error_codes(rc, self.session._session)
 
     def setstat(self, path not None, SFTPAttributes attr):
-        pass
+        cdef bytes b_path = to_bytes(path)
+        cdef const char *c_path = b_path
+        cdef int rc
+        with nogil:
+            rc = c_sftp.sftp_setstat(self._sftp, c_path, attr._attrs)
+        return handle_ssh_error_codes(rc, self.session._session)
 
     def chown(self, path not None,
               c_sftp.uid_t owner, c_sftp.gid_t group):
-        pass
+        cdef bytes b_path = to_bytes(path)
+        cdef const char *c_path = b_path
+        cdef int rc
+        with nogil:
+            rc = c_sftp.sftp_chown(self._sftp, c_path, owner, group)
+        return handle_ssh_error_codes(rc, self.session._session)
 
     def chmod(self, path not None, c_sftp.mode_t mode):
-        pass
+        cdef bytes b_path = to_bytes(path)
+        cdef const char *c_path = b_path
+        cdef int rc
+        with nogil:
+            rc = c_sftp.sftp_chmod(self._sftp, c_path, mode)
+        return handle_ssh_error_codes(rc, self.session._session)
 
-    def utimes(self, path not None, times):
-        pass
+    def utimes(self, path not None, long seconds, long microseconds):
+        cdef bytes b_path = to_bytes(path)
+        cdef const char *c_path = b_path
+        cdef int rc
+        cdef timeval *_val
+        with nogil:
+            _val = <timeval *>malloc(sizeof(timeval))
+            if _val is NULL:
+                with gil:
+                    raise MemoryError
+            _val.tv_sec = seconds
+            _val.tv_usec = microseconds
+            rc = c_sftp.sftp_utimes(self._sftp, c_path, _val)
+            free(_val)
+        return handle_ssh_error_codes(rc, self.session._session)
 
     def symlink(self, source not None, dest not None):
-        pass
+        cdef bytes b_source = to_bytes(source)
+        cdef const char *c_source = b_source
+        cdef bytes b_dest = to_bytes(dest)
+        cdef const char *c_dest = b_dest
+        cdef int rc
+        with nogil:
+            rc = c_sftp.sftp_symlink(self._sftp, c_source, c_dest)
+        return handle_ssh_error_codes(rc, self.session._session)
 
     def readlink(self, path not None):
-        pass
+        cdef bytes b_path = to_bytes(path)
+        cdef const char *c_path = b_path
+        cdef char *_link
+        cdef bytes b_link
+        with nogil:
+            _link = c_sftp.sftp_readlink(self._sftp, c_path)
+        if _link is NULL:
+            return handle_ssh_error_codes(
+                ssh_get_error_code(self.session._session),
+                self.session._session)
+        b_link = _link
+        return b_link
 
     def statvfs(self, path not None):
-        pass
+        cdef bytes b_path = to_bytes(path)
+        cdef const char *c_path = b_path
+        cdef SFTPStatVFS vfs
+        cdef c_sftp.sftp_statvfs_t c_vfs
+        with nogil:
+            c_vfs = c_sftp.sftp_statvfs(self._sftp, c_path)
+        if c_vfs is NULL:
+            return handle_ssh_error_codes(
+                ssh_get_error_code(self.session._session),
+                self.session._session)
+        vfs = SFTPStatVFS.from_ptr(c_vfs, self)
+        return vfs
 
     def canonicalize_path(self, path not None):
-        pass
+        cdef bytes b_path = to_bytes(path)
+        cdef const char *c_path = b_path
+        cdef char *_rpath
+        cdef bytes b_rpath
+        with nogil:
+            _rpath = c_sftp.sftp_canonicalize_path(self._sftp, c_path)
+        if _rpath is NULL:
+            return handle_ssh_error_codes(
+                ssh_get_error_code(self.session._session),
+                self.session._session)
+        b_rpath = _rpath
+        return b_rpath
 
     def server_version(self):
-        pass
+        cdef int rc
+        with nogil:
+            rc = c_sftp.sftp_server_version(self._sftp)
+        return rc

ssh/sftp.pyx

@@ -0,0 +1,27 @@
+# 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
+
+from sftp cimport SFTP
+
+cimport c_sftp
+
+
+cdef class SFTPAttributes:
+    cdef c_sftp.sftp_attributes _attrs
+    cdef SFTP sftp
+
+    @staticmethod
+    cdef SFTPAttributes from_ptr(c_sftp.sftp_attributes attrs, SFTP sftp)