Changeset 973 for TI05-delivery

Timestamp:

22/05/06 12:23:42 (14 years ago)

Author:

spascoe

Message:

Added the private authentication API extensions needed to implement
NDG security. This API is connected to empty stub functions, no useful
functionality yet. Authorisation will require a further extension later.

The code compiles. Execution yet to be tested.

Location:

TI05-delivery/trunk/src

Files:

• Makefile (modified) (1 diff)
• bbftp-server-3.2.0/bbftpd/bbftpd.c (modified) (2 diffs)
• bbftp-server-3.2.0/bbftpd/bbftpd_private.c (modified) (3 diffs)
• bbftp-server-3.2.0/bbftpd/bbftpd_private_user.c (modified) (1 diff)
• bbftp-server-3.2.0/includes/bbftpd_private.h (modified) (1 diff)
• bbftp-server-3.2.0/includes/daemon_proto.h (modified) (1 diff)

TI05-delivery/trunk/src/Makefile

@@ -3 +3 @@
 
 PREFIX=$(HOME)/opt/bbftp
-CONFIG_OPTS=--prefix=$(PREFIX) --without-gzip --without-rfio --enable-authentication=private
+CONFIG_OPTS=--prefix=$(PREFIX) --without-gzip --without-rfio --enable-authentication=private CPPFLAGS="-DNDG_AUTH"
 
 BBFTPD=bbftp-server-3.2.0/bbftpd

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

@@ -377 +377 @@
 #endif
 
+
 /*
  * Stats
@@ -789 +790 @@
     }
 #endif
-
+#ifdef NDG_AUTH
+    if ( bbftpd_private_initialise(logmessage) == -1) {      
+      syslog(BBFTPD_ERR, "bbftpd_private_init failure: %s", logmessage);
+      //!TODO: Should I write to stderr in all daemon modes (be_daemon)?
+      fprintf(stderr, "bbftpd_private_init failure: %s", logmessage);
+      exit(1);
+    }
+#endif // NDG_AUTH
     if ( be_daemon == 2 ) {
         /*

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

@@ -61 +61 @@
 extern  RSA     *myrsa ;
 
+
 /*******************************************************************************
 ** bbftpd_private_receive_connection :                                         *
@@ -179 +180 @@
         return -1 ;
     }
+#ifdef NDG_AUTH
+    ndg_atexit_status = NDG_INCHILD;
+#endif // NDG_AUTH
+
     return 0 ;
 }
@@ -342 +347 @@
     return totallendecrypted ;
 }
+
+
+#ifdef NDG_AUTH
+/*
+** bbftpd_private_initialise :
+**
+**      Routine to initialise the private authentication infrastructure.
+**      This function is mainly a wrapper around bbftpd_private_init(),
+**      except that it also sets up an atexit function.
+*/
+int bbftpd_private_initialise(char *logmessage) {
+
+    if (atexit(bbftpd_private_atexit) != 0) {
+      sprintf(logmessage, "atexit failure");
+      return -1;
+    }
+    ndg_atexit_status = NDG_INFATHER;
+    return bbftpd_private_init(logmessage);
+}
+
+/*
+** bbftpd_private_atexit :
+**
+**      Routine to be registered with atexit() for cleaning up the private authentication
+**      infrastructure.  This function must know whether the server is in a connected or
+**      unconnected state, therefore the global variable ndg_atexit_status is used.
+*/
+void bbftpd_private_atexit(void)
+{
+  if (ndg_atexit_status == NDG_INFATHER) {
+    bbftpd_private_finalise();
+  }
+  else if (ndg_atexit_status == NDG_INCHILD) {
+    bbftpd_private_auth_finalise();
+  }
+  else {
+    syslog(BBFTPD_ERR, "ndg_atexit_status unrecognised: %d", ndg_atexit_status);
+    fprintf(stderr, "ndg_atexit_status unrecognised: %d", ndg_atexit_status);
+  }
+}
+#endif // NDG_AUTH

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

@@ -105 +105 @@
   return 0 ; 
 }
+
+
+#ifdef NDG_AUTH
+
+/*
+ * bbftpd_private_init :
+ *
+ *     Routine to initialise private authentication.  This function will be
+ *     called before bbftpd begins listening for connections and therefore
+ *     before the fork() that occurs when a client connects.
+ *
+ *     OUTPUT variable :
+ *          logmessage :  to write the error message in case of error
+ *
+ *     RETURN:
+ *         -1  Unrecoverable error
+ *          0  OK
+ *
+ */
+
+int bbftpd_private_init(char *logmessage)
+{
+  syslog(LOG_INFO, "initialising private authentication");
+  return 0;
+}
+
+/*
+ * bbftpd_private_finalise :
+ *
+ *     Routine to clean up the private authentication infrastructure when the 
+ *     daemon exits.  This function is the counterpart of bbftpd_private_init and 
+ *     will be called from the daemon process during exit.  NOTE: it will not 
+ *     be aware of any actions of child processes.
+ *
+ */
+
+void bbftpd_private_finalise(void)
+{
+  syslog(LOG_INFO, "finalising private authentication in server");
+  return;
+}
+
+/*
+ * bbftpd_private_auth_finalise :
+ *
+ *     Routine to clean up the private authentication infrastructure for each child.
+ *     This function is the counterpart of bbftpd_private_auth and will be called from
+ *     each child of the daemon during exit.
+ *
+ */
+
+void bbftpd_private_auth_finalise(void)
+{
+  syslog(LOG_INFO, "finalising private authentication in connection");
+  return;
+}
+
+#endif // NDG_AUTH

TI05-delivery/trunk/src/bbftp-server-3.2.0/includes/bbftpd_private.h

@@ -40 +40 @@
 */
 RSA     *hisrsa ;
+
+#ifdef NDG_AUTH
+/*
+** NDG authentication global variables.
+*/
+#define NDG_INFATHER 1
+#define NDG_INCHILD 2
+int ndg_atexit_status ;
+#endif // NDG_AUTH

TI05-delivery/trunk/src/bbftp-server-3.2.0/includes/daemon_proto.h

@@ -63 +63 @@
 int bbftpd_private_send(char *buffertosend, int buffertosendlength, char *logmessage) ;
 int bbftpd_private_recv(char *buffertorecv, int lengthtorecv, char *logmessage) ;
+#ifdef NDG_AUTH
+int bbftpd_private_initialise(char *logmessage);
+void bbftpd_private_atexit(void);
+#endif // NDG_AUTH
 /*
 ** Prototype for user private authentication routines
 */
 int bbftpd_private_auth(char *logmessage) ;
+#ifdef NDG_AUTH
+int bbftpd_private_init(char *logmessage);
+void bbftpd_private_finalise(void);
+void bbftpd_private_auth_finalise(void);
+#endif // NDG_AUTH
 /*
 ** Prototype for retr routines