Changeset 1075 for TI05-delivery

Timestamp:

31/05/06 17:03:55 (14 years ago)

Author:

spascoe

Message:

Python code can read an authorisation message from the client.

Test cases confirm message passing client->server->python is working.

Location:

TI05-delivery/trunk

Files:

• src/bbftp-server-3.2.0/bbftpd/bbftpd_private_user.c (modified) (2 diffs)
• src/python_ext/bbftpd.c (modified) (4 diffs)
• test/test_embedded.py (modified) (4 diffs)

TI05-delivery/trunk/src/bbftp-server-3.2.0/bbftpd/bbftpd_private_user.c

@@ -97 +97 @@
 int bbftpd_private_auth(char *logmessage)
 {
+
+#ifdef NDG_PYTHON_EMBED
   char *username;
+
+  if (bbftpd_private_auth_callback(logmessage) == -1) {
+    return -1;
+  }
+  if ((username = bbftpd_private_auth_getusername(logmessage)) == NULL) {
+    return -1;
+  }
+   
+  sprintf(currentusername, "%.*s", MAXLEN, username);
+#else
 
   char msg[NDG_MESSAGE_LEN];
@@ -108 +120 @@
   }
 
-#ifdef NDG_PYTHON_EMBED
-  if (bbftpd_private_auth_callback(logmessage) == -1) {
-    return -1;
-  }
-  if ((username = bbftpd_private_auth_getusername(logmessage)) == NULL) {
-    return -1;
-  }
-   
-  sprintf(currentusername, "%.*s", MAXLEN, username);
 #endif
 

TI05-delivery/trunk/src/python_ext/bbftpd.c

@@ -14 +14 @@
 extern char **environ;
 /*
- * variables and prototypes from bbftpd.c
+ * variables and prototypes from bbftpd source
  */
 
@@ -21 +21 @@
 
 int bbftpd_main(int argc, char **argv, char **envp);
+int bbftpd_private_send(char *buffertosend, int buffertosendlength, char *logmessage) ;
+int bbftpd_private_recv(char *buffertorecv, int lengthtorecv, char *logmessage) ;
 
 /*
@@ -100 +102 @@
  *
  */
+
+/* send(string) */
+static PyObject *bbftpd_send(PyObject *self, PyObject *args) {
+  char *buffer, logmessage[1024];
+  int len;
+
+  if (!PyArg_ParseTuple(args, "s#", &buffer, &len)) {
+    return NULL;
+  }
+
+  if (authContext == NULL) {
+    PyErr_SetString(PyExc_RuntimeError, "Must be called within a bbftpd callback");
+    return NULL;
+  }
+
+  if (bbftpd_private_send(buffer, len, logmessage) == -1) {
+    PyErr_SetString(PyExc_IOError, logmessage);
+    return NULL;
+  }
+
+  Py_RETURN_NONE;
+}
+
+/* recv(length) -> string */
+static PyObject *bbftpd_recv(PyObject *self, PyObject *args) {
+  char *buffer, logmessage[1024];
+  int len;
+
+  if (!PyArg_ParseTuple(args, "i", &len)) {
+    return NULL;
+  }
+
+  if (authContext == NULL) {
+    PyErr_SetString(PyExc_RuntimeError, "Must be called within a bbftpd callback");
+    return NULL;
+  }
+  if ((buffer = (char*)malloc(len*sizeof(char))) == NULL) {
+    PyErr_NoMemory();
+    return NULL;
+  }
+
+  if (bbftpd_private_recv(buffer, len, logmessage) == -1) {
+    PyErr_SetString(PyExc_IOError, logmessage);
+    free(buffer);
+    return NULL;
+  }
+
+  return Py_BuildValue("s#", buffer, len);
+}
+
 
 /**
@@ -174 +226 @@
     "@return: the PID of the server process\n"
   },
+  {
+    "send", bbftpd_send, METH_VARARGS,
+    "Send an authentication message to the client.\n"
+    "\n"
+    "Equivilent to bbftpd_private_send() C call.\n"
+    "\n"
+    "@param buffer: A string containing the message\n"
+    "@raise IOError: if bbftpd_private_send() call fails\n"
+  },
+  {
+    "recv", bbftpd_recv, METH_VARARGS,
+    "Receive an authentication message from the client.\n"
+    "\n"
+    "Equivilent to bbftpd_private_recv() C call.\n"
+    "\n"
+    "@param len: The length of message to expect\n"
+    "@return: A string containing the message\n"
+    "@raise IOError: if bbftpd_private_recv() call fails\n"
+  },
   {NULL, NULL, 0, NULL}
 };

TI05-delivery/trunk/test/test_embedded.py

@@ -16 +16 @@
 BBFTP = glob('%s/src/bbftp-client*/bbftpc/bbftp' % HOME)[0]
 DATADIR = '%s/test/data' % HOME
+NDG_MESSAGE_LEN = 256
+
 sys.path.append(BUILDDIR)
 import bbftpd
         
-class AuthContext(object):
+class AuthzContext:
+    def __init__(self, version_msg, user):
+        self.version = version_msg
+        self.username = user
+
+class AuthContext:
     def authorise(self):
-        # Return a dummy authzContext
-        return AuthzContext("JoeBloggs")
+        # Read the auth version message
+        msg = bbftpd.recv(NDG_MESSAGE_LEN)
+        # Trim to first '\0'
+        x = msg.find('\0')
+        if x:
+            msg = msg[:x]
 
-class AuthzContext(object):
-    def __init__(self, username):
-        self.username = username
+        syslog.syslog(syslog.LOG_DEBUG, 'AuthContext received Auth message: %s' % msg)
+        
+        return AuthzContext(msg, "TestCaseUser")
 
 class EmbeddedServerTestCase(unittest.TestCase):
@@ -62 +73 @@
         lines = self._readSyslog()
         self.assert_(self._findLines(['.*Getting new bbftp connexion.*',
-                                      '.*Received auth message: NDG-bbFTP.*',
+                                      '.*AuthContext received Auth message: NDG-bbFTP.*',
                                       r'.*Authz: MSG_LIST_V2 .*/test/data/\*.*',
-                                      r'.*User JoeBloggs disconnected.*'], lines))
+                                      r'.*User TestCaseUser disconnected.*'], lines))
 
 
@@ -84 +95 @@
         # Check syslog
         lines = self._readSyslog()
-        self.assert_(self._findLines(['.*Authz: RETR .*/foo', '.*GET JoeBloggs .*/foo.*'], lines))
+        self.assert_(self._findLines(['.*Authz: RETR .*/foo', '.*GET TestCaseUser .*/foo.*'], lines))
 
     def testStore(self):
@@ -107 +118 @@
         # Check syslog
         lines = self._readSyslog()
-        self.assert_(self._findLines(['.*Authz: STORE .*/new_bar', '.*PUT JoeBloggs .*/new_bar.*'], lines))
+        self.assert_(self._findLines(['.*Authz: STORE .*/new_bar', '.*PUT TestCaseUser .*/new_bar.*'], lines))