Changeset 987 for TI05-delivery

Timestamp:

23/05/06 16:25:39 (14 years ago)

Author:

spascoe

Message:

Closer inspection of the bbftp code reveals I'll need to refactor the
authz interface slightly. bbftpd_private_authz has been renamed
bbftpd_private_authz_control with a slightly different prototype.
This function now doesn't authorise store/retrieve requests.

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) (2 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

@@ -96 +96 @@
 
 #ifdef NDG_AUTH
-    if (bbftpd_private_authz(MSG_CHDIR_V2, (void *)msg_dir, logmessage) != 0) {
+    if (bbftpd_private_authz_control(MSG_CHDIR_V2, msg_dir->transferoption, msg_dir->dirname,
+                                     logmessage) != 0) {
       syslog(BBFTPD_ERR, logmessage);
       reply(MSG_BAD, logmessage);

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

@@ -86 +86 @@
     msg_dir = (struct mess_dir *) buffer ;
 #ifdef NDG_AUTH
-    if (bbftpd_private_authz(MSG_MKDIR_V2, (void *)msg_dir, logmessage) != 0) {
+    if (bbftpd_private_authz_control(MSG_MKDIR_V2, msg_dir->transferoption, msg_dir->dirname,
+                                     logmessage) != 0) {
       syslog(BBFTPD_ERR, logmessage);
       reply(MSG_BAD, logmessage);

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

@@ -162 +162 @@
 
 /*
-** bbftpd_private_authz :
-**
-**    Routine to authorise individual bbftp commands.  The function must return
-**    OK for the command to proceed.
+** bbftpd_private_authz_control :
+**
+**    Routine to authorise bbftp control commands.  
 **
 **    INPUT variables:
 **        msgcode : The message code from struct message
-**        msgstruct : A pointer to a bbftpd structure dependent on the message type (see below)
+**        transferoptions : TROPT_* options
+**        path : path to apply command to
 **
 **    OUTPUT variables:
@@ -178 +178 @@
 **        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);
+int bbftpd_private_authz_control(int msgcode, int transferoption, char *path, char *logmessage)
+{
+
+  switch (msgcode) {
+  case MSG_CHDIR_V2:
+    syslog(LOG_INFO, "Authz: MSG_DIR 0x%x %s", transferoption, path);
+    break;
+  case MSG_LIST_V2:
+    syslog(LOG_INFO, "Authz: MSG_LIST_V2 0x%x %s", transferoption, path);
+    break;
+  case MSG_MKDIR_V2:
+    syslog(LOG_INFO, "Authz: MSG_MKDIR_V2 0x%x %s", transferoption, path);
+    break;
+  case MSG_RM:
+    syslog(LOG_INFO, "Authz: MSG_RM 0x%x %s", transferoption, path);
+    break;
+  case MSG_STAT:
+    syslog(LOG_INFO, "Authz: MSG_STAT 0x%x %s", transferoption, path);
+    break;
+  case MSG_DF:
+    syslog(LOG_INFO, "Authz: MSG_DF 0x%x %s", transferoption, path);
+    break;
+  default:
+    sprintf(logmessage, "Unrecognised message to authorise %d", msgcode);
+    return -1;
+  }
+
   return 0;
-
 }
 

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) ;
@@ -234 +225 @@
                    msg_dir = (struct mess_dir *) receive_buffer ;
 #ifdef NDG_AUTH
-                    if (bbftpd_private_authz(msgcode, (void *)msg_dir, logmessage) != 0) {
+                    if (bbftpd_private_authz_control(msgcode, msg_dir->transferoption, msg_dir->dirname,
+                                                     logmessage) != 0) {
                       syslog(BBFTPD_ERR, logmessage);
                       reply(MSG_BAD, logmessage);
@@ -284 +276 @@
                     }
                     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
 
                     /*
@@ -332 +316 @@
                     }
                     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
 
                     /*

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

@@ -80 +80 @@
     msg_file = (struct mess_dir *) buffer ;
 #ifdef NDG_AUTH
-    if (bbftpd_private_authz(MSG_RM, (void *)msg_file, logmessage) != 0) {
+    if (bbftpd_private_authz_control(MSG_RM, msg_file->transferoption, msg_file->dirname,
+                                     logmessage) != 0) {
       syslog(BBFTPD_ERR, logmessage);
       reply(MSG_BAD, logmessage);

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

@@ -104 +104 @@
     msg_file = (struct mess_dir *) buffer ;
 #ifdef NDG_AUTH
-    if (bbftpd_private_authz(MSG_STAT, (void *)msg_file, logmessage) != 0) {
+    if (bbftpd_private_authz_control(MSG_STAT, msg_file->transferoption, msg_file->dirname,
+                                     logmessage) != 0) {
       syslog(BBFTPD_ERR, logmessage);
       reply(MSG_BAD, logmessage);

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

@@ -107 +107 @@
     msg_file = (struct mess_dir *) buffer ;
 #ifdef NDG_AUTH
-    if (bbftpd_private_authz(MSG_DF, (void *)msg_file, logmessage) != 0) {
+    if (bbftpd_private_authz_control(MSG_DF, msg_file->transferoption, msg_file->dirname,
+                                     logmessage) != 0) {
       syslog(BBFTPD_ERR, logmessage);
       reply(MSG_BAD, logmessage);

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);
+int bbftpd_private_authz_control(int msgcode, int transferoption, char *path, char *logmessage);
 #endif // NDG_AUTH
 /*