Added socket properties to session for providing socket. Added test for connecting with an existing python socket.

Author: Pan

ssh/session.pxd

@@ -18,3 +18,5 @@ cimport c_ssh
 
 cdef class Session:
     cdef c_ssh.ssh_session _session
+    cdef c_ssh.socket_t _sock
+    cdef object sock

ssh/session.pyx

@@ -36,12 +36,29 @@ cdef class Session:
         self._session = c_ssh.ssh_new()
         if self._session is NULL:
             raise MemoryError
+        self.sock = None
 
     def __dealloc__(self):
         if self._session is not NULL:
             c_ssh.ssh_free(self._session)
         self._session = NULL
 
+    def set_socket(self, socket):
+        """Set socket to use for session.
+
+        Not part of libssh API but needs to be done in C to be able to
+        translate python sockets to file descriptors to be used by libssh.
+        """
+        cdef c_ssh.socket_t _sock = PyObject_AsFileDescriptor(socket)
+        cdef c_ssh.ssh_options_e fd = c_ssh.ssh_options_e.SSH_OPTIONS_FD
+        cdef int rc
+        with nogil:
+            rc = c_ssh.ssh_options_set(self._session, fd, &_sock)
+        handle_ssh_error_codes(rc, self._session)
+        self._sock = _sock
+        self.sock = socket
+        return rc
+
     def blocking_flush(self, int timeout):
         cdef int rc
         with nogil:
@@ -247,8 +264,11 @@ cdef class Session:
             rc = c_ssh.ssh_service_request(self._session, c_service)
         return handle_ssh_error_codes(rc, self._session)
 
-    def set_agent_channel(self, channel):
-        raise NotImplementedError
+    def set_agent_channel(self, Channel channel):
+        cdef int rc
+        with nogil:
+            rc = c_ssh.ssh_set_agent_channel(self._session, channel._channel)
+        return handle_ssh_error_codes(rc, self._session)
 
     def set_agent_socket(self, c_ssh.socket_t fd):
         cdef int rc

tests/test_session.py

@@ -15,6 +15,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-130
 
 import unittest
+import socket
 
 from .base_test import SSHTestCase
 
@@ -27,6 +28,19 @@
 
 class SessionTest(SSHTestCase):
 
+    def test_socket_connect(self):
+        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        sock.connect((self.host, self.port))
+        session = Session()
+        session.options_set(options.USER, self.user)
+        session.options_set(options.HOST, self.host)
+        session.options_set_port(self.port)
+        self.assertEqual(session.set_socket(sock), 0)
+        self.assertEqual(self.session.connect(), 0)
+        self.assertRaises(RequestDenied, self.session.userauth_none)
+        self.assertEqual(
+            self.session.userauth_publickey(self.pkey), 0)
+
     def test_connect(self):
         self.assertEqual(self.session.connect(), 0)
         self.assertRaises(RequestDenied, self.session.userauth_none)