Changeset 988 for TI05-delivery

Timestamp:

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

Author:

spascoe

Message:

Completed the authorisation API refactoring to add 2 new functions
bbftpd_private_authz_retr() and bbftpd_private_authz_store().

Location:

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

Files:

• bbftpd/bbftpd_private_user.c (modified) (1 diff)
• bbftpd/bbftpd_readcontrol.c (modified) (2 diffs)
• includes/daemon_proto.h (modified) (1 diff)

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

@@ -211 +211 @@
 
 
+/*
+** bbftpd_private_authz_retr :
+**
+**     Routine to authorise file retrieve requests.
+**
+**     INPUT variables:
+**         path: the file to retrieve
+**
+**    OUTPUT variables:
+**        logmessage : to write the error message in case of failure
+**
+**    RETURN:
+**       -1  Authorisation failed
+**        0  OK
+**
+*/
+int bbftpd_private_authz_retr(char *path, char *logmessage)
+{
+  syslog(LOG_INFO, "Authz: RETR %s", path);
+  return 0;
+}
+
+/*
+** bbftpd_private_authz_store :
+**
+**     Routine to authorise file store requests.
+**
+**     INPUT variables:
+**         path: the file to store
+**
+**    OUTPUT variables:
+**        logmessage : to write the error message in case of failure
+**
+**    RETURN:
+**       -1  Authorisation failed
+**        0  OK
+**
+*/
+
+int bbftpd_private_authz_store(char *path, char *logmessage)
+{
+  syslog(LOG_INFO, "Authz: STORE %s", path);
+  return 0;
+}
 #endif // NDG_AUTH

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

@@ -399 +399 @@
                     curfilenamelen = msglen ;
                     syslog(BBFTPD_DEBUG,"Request to store file %s",curfilename) ;
+#ifdef NDG_AUTH
+                    if (bbftpd_private_authz_store(curfilename, logmessage) != 0) {
+                      syslog(BBFTPD_ERR, logmessage);
+                      reply(MSG_BAD_NO_RETRY, logmessage);
+                      free_all_var();
+                      state = S_LOGGED;
+                      return 0;
+                    }
+#endif // NDG_AUTH
                     if ( (retcode = bbftpd_storecheckoptions(logmessage)) < 0 ) {
                         syslog(BBFTPD_ERR,logmessage) ;
@@ -667 +676 @@
                     curfilenamelen = msglen ;
                     syslog(BBFTPD_DEBUG,"Request to retreive file %s",curfilename) ;
+#ifdef NDG_AUTH
+                    if (bbftpd_private_authz_retr(curfilename, logmessage) != 0) {
+                      syslog(BBFTPD_ERR, logmessage);
+                      reply(MSG_BAD_NO_RETRY, logmessage);
+                      free_all_var();
+                      state = S_LOGGED;
+                      return 0;
+                    }
+#endif // NDG_AUTH
                     /*
                     ** Create the file

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

@@ -77 +77 @@
 void bbftpd_private_auth_finalise(void);
 int bbftpd_private_authz_control(int msgcode, int transferoption, char *path, char *logmessage);
+int bbftpd_private_authz_retr(char *path, char *logmessage);
+int bbftpd_private_authz_store(char *path, char *logmessage);
 #endif // NDG_AUTH
 /*