Changeset 1141 for TI05-delivery/trunk/lib/python/delivery/server.py

Timestamp:

08/06/06 12:51:22 (14 years ago)

Author:

spascoe

Message:

There are various changes here.

The server now calls python for authorisation. This is untested, although the test suite passes. More flesh on delivery.server and it's now used in the
test suite. The server now logs python exceptions to syslog from within C code.

File:

• TI05-delivery/trunk/lib/python/delivery/server.py (modified) (6 diffs)

TI05-delivery/trunk/lib/python/delivery/server.py

@@ -7 +7 @@
 import bbftpd
 
-def start(authHandler):
+def start(authHandler, args):
     """Start the bbftp server.
 
     The server performs a fork() during initialisation, the child process remains in
     the server's main loop and the parent returns from this function.  The server process
-    calls authHandler() on each connection to do authentication/authorisation.
+    calls authHandler.authorise() on each connection to do authentication/authorisation.
 
     @note: because the server process forks, authHandler will not see any changes to the python
         interpreter following the call to start().
 
+    @param authHandler: an instance of AuthHandler.
+    @param args: a list of command line arguments.
     @return: the PID of the server process.
     """
     
-    bbftpd.run(authHandler)
+    return bbftpd.run(authHandler, args)
 
 
@@ -30 +32 @@
     """
     
-    def __call__(self):
-        """Entry point called by the server to do authorisation.
-
-        This function simply calls the authorise() method.  See authorise() for details.
-        """
-        return self.authorise()
-
     def send(self, buffer):
         """Send a message to the client.
@@ -70 +65 @@
 class AuthzHandler(object):
     """Abstract base class for implementing authorisation.
+
+    @ivar username the client's username
     """
 
@@ -92 +89 @@
         raise NotImplementedError
 
-    def authzSend(self, path):
-        """Authorise a send request.
+    def authzStore(self, path):
+        """Authorise a store request.
 
         @param path: the destination file.
@@ -99 +96 @@
         """
 
+        raise NotImplementedError
+    
+    def _raiseNoUsername(self):
+        raise ValueError, "No username has been set"
+    username = property(_raiseNoUsername)
 
-
+#--------------------------------------------------------------------------------------------------------------
 
 class BasicClientAuthHandler(AuthHandler):
@@ -124 +126 @@
         return msg
 
+
+
+class LiberalAuthzHandler(AuthzHandler):
+    """Allow everything.
+    """
+
+    username = None
+
+    def __init__(self, username):
+        self.username = username
+
+    def authzControl(self, m, t, p):
+        return 0;
+
+    def authzRetr(self, p):
+        return 0;
+
+    def authzStore(self, p):
+        return 0;
+