Changeset 983

Timestamp:

23/05/06 15:09:39 (13 years ago)

Author:

spascoe

Message:

Added the autorisation hook bbftpd_private_authz. It appears to be called
correctly for a dir command.

Location:

TI05-delivery/trunk/src/bbftp-server-3.2.0

Files:

• bbftpd/bbftpd_cd.c (modified) (1 diff)
• bbftpd/bbftpd_mkdir.c (modified) (1 diff)
• bbftpd/bbftpd_private_user.c (modified) (6 diffs)
• bbftpd/bbftpd_readcontrol.c (modified) (4 diffs)
• bbftpd/bbftpd_rm.c (modified) (1 diff)
• bbftpd/bbftpd_stat.c (modified) (1 diff)
• bbftpd/bbftpd_statfs.c (modified) (1 diff)
• includes/daemon_proto.h (modified) (1 diff)

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

@@ -94 +94 @@
      transferoption  = msg_dir->transferoption ;
     dirname = msg_dir->dirname ;
+
+#ifdef NDG_AUTH
+    if (bbftpd_private_authz(MSG_CHDIR_V2, (void *)msg_dir, logmessage) != 0) {
+      syslog(BBFTPD_ERR, logmessage);
+      reply(MSG_BAD, logmessage);
+      FREE(logmessage);
+      FREE(buffer);
+      return 0;
+    }
+#endif // NDG_AUTH
     
     if ( (transferoption & TROPT_RFIO) == TROPT_RFIO ) {

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

@@ -85 +85 @@
     buffer[msglen] = '\0' ;
     msg_dir = (struct mess_dir *) buffer ;
+#ifdef NDG_AUTH
+    if (bbftpd_private_authz(MSG_MKDIR_V2, (void *)msg_dir, logmessage) != 0) {
+      syslog(BBFTPD_ERR, logmessage);
+      reply(MSG_BAD, logmessage);
+      FREE(buffer);
+      FREE(logmessage);
+      return 0;
+    }
+#endif // NDG_AUTH
+
     transferoption  = msg_dir->transferoption ;
     dirname = msg_dir->dirname ;

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

@@ -18 +18 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */ 
+ */
 
 /****************************************************************************
 
-  
-  
+
+
  bbftpd_private_user.c  v 2.1.0 2001/05/21  - Routines creation
 
@@ -76 +76 @@
 **      error with logmessage filled                                           *
 **      It is the duty of the programmer to take care that the buffer is large *
-**      enought                                                                * 
+**      enought                                                                *
 **                                                                             *
 **                                                                             *
@@ -91 +91 @@
 *******************************************************************************/
 
-int bbftpd_private_auth(char *logmessage) 
-{    
+int bbftpd_private_auth(char *logmessage)
+{
   char msg[NDG_MESSAGE_LEN];
   /* Send version verification message.  */
@@ -102 +102 @@
   }
 
-  return 0 ; 
+  return 0 ;
 }
 
@@ -133 +133 @@
  * 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 
+ *     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.
  *
@@ -161 +161 @@
 }
 
+/*
+** bbftpd_private_authz :
+**
+**    Routine to authorise individual bbftp commands.  The function must return
+**    OK for the command to proceed.
+**
+**    INPUT variables:
+**        msgcode : The message code from struct message
+**        msgstruct : A pointer to a bbftpd structure dependent on the message type (see below)
+**
+**    OUTPUT variables:
+**        logmessage : to write the error message in case of failure
+**
+**    RETURN:
+**       -1  Authorisation failed
+**        0  OK
+**
+**  msgstruct should be cast to the appropriate structure from structures.h
+**  acording to msgcode:
+**
+**    MSG_CHDIR_V2  : struct mess_dir
+**    MSG_CHUMASK   : struct mess_int
+**    MSG_MKLIST_V2 : struct mess_dir
+**    MSG_MKDIR_V2  : struct mess_dir
+**    MSG_RM        : struct mess_dir
+**    MSG_STAT      : struct mess_dir
+**    MSG_DF        : struct mess_dir
+**    MSG_RETR_V2   : struct mess_store_v2
+**    MSG_STORE_V2  : struct mess_store_v2
+**
+*/
+int bbftpd_private_authz(int msgcode, void *msgstruct, char *logmessage)
+{
+
+  // For test purposes just log the authorisation request
+  syslog(LOG_INFO, "Authorisation request: %d", msgcode);
+  return 0;
+
+}
+
+
 #endif // NDG_AUTH

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

@@ -177 +177 @@
                     }
                     msg_integer = (struct  mess_integer *) receive_buffer ;
+#ifdef NDG_AUTH
+                    if (bbftpd_private_authz(msgcode, (void *)msg_integer, logmessage) != 0) {
+                      syslog(BBFTPD_ERR, logmessage);
+                      reply(MSG_BAD, logmessage);
+                      FREE(receive_buffer);
+                      return 0;
+                    }
+#endif // NDG_AUTH
+
 #ifndef WORDS_BIGENDIAN
                     myumask = ntohl(msg_integer->myint) ;
@@ -224 +233 @@
                    receive_buffer[msglen] = '\0' ;
                    msg_dir = (struct mess_dir *) receive_buffer ;
+#ifdef NDG_AUTH
+                    if (bbftpd_private_authz(msgcode, (void *)msg_dir, logmessage) != 0) {
+                      syslog(BBFTPD_ERR, logmessage);
+                      reply(MSG_BAD, logmessage);
+                      FREE(receive_buffer);
+                      return 0;
+                    }
+#endif // NDG_AUTH
                    transferoption  = msg_dir->transferoption ;
                    syslog(BBFTPD_DEBUG,"Pattern = %s",msg_dir->dirname) ;
@@ -267 +284 @@
                     }
                     msg_store_v2 = (struct  mess_store_v2 *) receive_buffer ;
+#ifdef NDG_AUTH
+                    if (bbftpd_private_authz(msgcode, (void *)msg_store_v2, logmessage) != 0) {
+                      syslog(BBFTPD_ERR, logmessage);
+                      reply(MSG_BAD, logmessage);
+                      FREE(receive_buffer);
+                      return 0;
+                    }
+#endif // NDG_AUTH
+
                     /*
                     ** Set up the transfer parameter, we are going only to store 
@@ -306 +332 @@
                     }
                     msg_store_v2 = (struct  mess_store_v2 *) receive_buffer ;
+#ifdef NDG_AUTH
+                    if (bbftpd_private_authz(msgcode, (void *)msg_store_v2, logmessage) != 0) {
+                      syslog(BBFTPD_ERR, logmessage);
+                      reply(MSG_BAD, logmessage);
+                      FREE(receive_buffer);
+                      return 0;
+                    }
+#endif // NDG_AUTH
+
                     /*
                     ** Set up the transfer parameter, we are going only to store 

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

@@ -79 +79 @@
     buffer[msglen] = '\0' ;
     msg_file = (struct mess_dir *) buffer ;
+#ifdef NDG_AUTH
+    if (bbftpd_private_authz(MSG_RM, (void *)msg_file, logmessage) != 0) {
+      syslog(BBFTPD_ERR, logmessage);
+      reply(MSG_BAD, logmessage);
+      FREE(buffer);
+      FREE(logmessage);
+      return 0;
+    }
+#endif // NDG_AUTH
+
     transferoption  = msg_file->transferoption ;
     filename = msg_file->dirname ;

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

@@ -103 +103 @@
     buffer[msglen] = '\0' ;
     msg_file = (struct mess_dir *) buffer ;
+#ifdef NDG_AUTH
+    if (bbftpd_private_authz(MSG_STAT, (void *)msg_file, logmessage) != 0) {
+      syslog(BBFTPD_ERR, logmessage);
+      reply(MSG_BAD, logmessage);
+      FREE(buffer);
+      FREE(logmessage);
+      return 0;
+    }
+#endif // NDG_AUTH
+
     transferoption  = msg_file->transferoption ;
     filename = msg_file->dirname ;

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

@@ -106 +106 @@
     buffer[msglen] = '\0' ;
     msg_file = (struct mess_dir *) buffer ;
+#ifdef NDG_AUTH
+    if (bbftpd_private_authz(MSG_DF, (void *)msg_file, logmessage) != 0) {
+      syslog(BBFTPD_ERR, logmessage);
+      reply(MSG_BAD, logmessage);
+      FREE(buffer);
+      FREE(logmessage);
+      return 0;
+    }
+#endif // NDG_AUTH
     transferoption  = msg_file->transferoption ;
     dirname = msg_file->dirname ;

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

@@ -76 +76 @@
 void bbftpd_private_finalise(void);
 void bbftpd_private_auth_finalise(void);
+int bbftpd_private_authz(int msgcode, void *msgstruct, char *logmessage);
 #endif // NDG_AUTH
 /*