finished waklog rename, added WaklogProtected directive

git-svn-id: https://modwaklog.svn.sourceforge.net/svnroot/modwaklog/trunk/modwaklog@8 0d961d1b-a432-0410-8fea-cc29f225fe07

diff --git a/Makefile b/Makefile
index d9ee264..4667601 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-ALL=   mod_afs.so
+ALL=   mod_waklog.so
 
 APXS=  apxs
 CC=    gcc
@@ -10,7 +10,7 @@ LIB=    -L/usr/local/krb5/lib \
        -L/usr/local/openafs/lib/afs -lsys \
        -L/usr/local/openafs/lib -lrx -llwp
 CFLAGS=        ${DEF} ${INC} -DEAPI
-OBJ=   mod_afs.o lifetime.o version.o
+OBJ=   mod_waklog.o lifetime.o version.o
 
 all:   ${ALL}
 
@@ -20,7 +20,7 @@ version.o : version.c
            -DVERSION=\"`cat VERSION`\" \
            -c version.c
 
-mod_afs.so:  ${OBJ}
+mod_waklog.so:  ${OBJ}
        ${APXS} -c ${LIB} ${OBJ}
 
 clean:

diff --git a/VERSION b/VERSION
index a49294f..d220514 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-20020807
+20030221

diff --git a/mod_afs.c b/mod_waklog.c
similarity index 57%
rename from mod_afs.c
rename to mod_waklog.c
index c4d221c..cf56456 100644 (file)
--- a/mod_afs.c
+++ b/mod_waklog.c
@@ -10,7 +10,7 @@
 #include <kerberosIV/des.h>
 #include <afs/venus.h>
 
-#define SRVTAB "/usr/local/etc/srvtab.itdwww"
+module waklog_module;
 
 struct ClearToken {
     long AuthHandle;
@@ -20,27 +20,85 @@ struct ClearToken {
     long EndTimestamp;
 };
 
+typedef struct {
+    int        configured;
+    int        protect;
+} waklog_host_config;
+
+
+    static void *
+waklog_create_dir_config( pool *p, char *path )
+{
+    waklog_host_config *cfg;
+
+    cfg = (waklog_host_config *)ap_pcalloc( p, sizeof( waklog_host_config ));
+    cfg->configured = 0;
+    cfg->protect = 0;
+
+    return( cfg );
+}
+
+
+    static void *
+waklog_create_server_config( pool *p, server_rec *s )
+{
+    waklog_host_config *cfg;
+
+    cfg = (waklog_host_config *)ap_pcalloc( p, sizeof( waklog_host_config ));
+    cfg->configured = 0;
+    cfg->protect = 0;
+
+    return( cfg );
+}
+
+
     static void
-afs_init( server_rec *s, pool *p )
+waklog_init( server_rec *s, pool *p )
 {
     extern char *version;
 
     ap_log_error( APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, s,
-           "mod_afs: version %s initialized.", version );
+           "mod_waklog: version %s initialized.", version );
     return;
 }
 
 
+    static const char *
+set_waklog_protect( cmd_parms *params, void *mconfig, int flag )
+{
+    waklog_host_config          *cfg;
+
+    if ( params->path == NULL ) {
+        cfg = (waklog_host_config *) ap_get_module_config(
+                params->server->module_config, &waklog_module );
+    } else {
+        cfg = (waklog_host_config *)mconfig;
+    }
+
+    cfg->protect = flag;
+    cfg->configured = 1;
+    return( NULL );
+}
+
+
     static void
-afs_child_init( server_rec *s, pool *p )
+waklog_child_init( server_rec *s, pool *p )
 {
     setpag();
-    ap_log_error( APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, s,
-           "mod_afs: setpag called in child init" );
     return;
 }
 
 
+command_rec waklog_cmds[ ] =
+{
+    { "WaklogProtected", set_waklog_protect,
+    NULL, RSRC_CONF | ACCESS_CONF, FLAG,
+    "enable waklog on a location or directory basis" },
+
+    { NULL }
+};
+
+
     static void
 pioctl_cleanup( void *data )
 {
@@ -54,17 +112,17 @@ pioctl_cleanup( void *data )
 
     if ( pioctl( 0, VIOCUNPAG, &vi, 0 ) < 0 ) {
        ap_log_error( APLOG_MARK, APLOG_ERR, r->server,
-               "mod_afs: unlog pioctl failed" );
+               "mod_waklog: unlog pioctl failed" );
     }
 
     ap_log_error( APLOG_MARK, APLOG_ERR, r->server,
-           "mod_afs: unlog pioctl succeeded" );
+           "mod_waklog: unlog pioctl succeeded" );
     return;
 }
 
 
     static int
-get_afs_tokens( request_rec *r )
+waklog_get_tokens( request_rec *r )
 {
     CREDENTIALS                cr;
     struct ViceIoctl   vi;
@@ -73,16 +131,25 @@ get_afs_tokens( request_rec *r )
     char               buf[ 1024 ], *s;
     char               *urealm = "UMICH.EDU";
     char               *lrealm = "umich.edu";
+    waklog_host_config  *cfg;
+
+    /* directory config? */
+    cfg = (waklog_host_config *)ap_get_module_config(
+            r->per_dir_config, &waklog_module);
 
-    /*
-    /* setpag();
-    /* ap_log_error( APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, s,
-    /*     "mod_afs: setpag called in get_afs_tokens" );
-    */
+    /* server config? */
+    if ( !cfg->configured ) {
+        cfg = (waklog_host_config *)ap_get_module_config(
+                r->server->module_config, &waklog_module);
+    }
+
+    if ( !cfg->protect ) {
+        return( DECLINED );
+    }
 
     if (( rc = get_ad_tkt( "afs", "", urealm, 255 )) != KSUCCESS ) {
        ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, r->server,
-               "mod_afs: get_ad_tkt: %s", krb_err_txt[ rc ] );
+               "mod_waklog: get_ad_tkt: %s", krb_err_txt[ rc ] );
 
        /* user doesn't have tickets: use server's srvtab */
 
@@ -91,18 +158,18 @@ get_afs_tokens( request_rec *r )
 
     if (( rc = krb_get_cred( "afs", "", urealm, &cr )) != KSUCCESS ) {
        ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
-               "mod_afs: krb_get_cred: %s", krb_err_txt[ rc ] );
+               "mod_waklog: krb_get_cred: %s", krb_err_txt[ rc ] );
        return OK;
     }
 
     ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server,
-           "mod_afs: %s.%s@%s", cr.service, cr.instance, cr.realm );
+           "mod_waklog: %s.%s@%s", cr.service, cr.instance, cr.realm );
     ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server,
-           "mod_afs: %d %d %d", cr.lifetime, cr.kvno, cr.issue_date );
+           "mod_waklog: %d %d %d", cr.lifetime, cr.kvno, cr.issue_date );
     ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server,
-           "mod_afs: %s %s", cr.pname, cr.pinst );
+           "mod_waklog: %s %s", cr.pname, cr.pinst );
     ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server,
-           "mod_afs: %d", cr.ticket_st.length );
+           "mod_waklog: %d", cr.ticket_st.length );
 
     s = buf;
     memmove( s, &cr.ticket_st.length, sizeof( int ));
@@ -136,37 +203,37 @@ get_afs_tokens( request_rec *r )
 
     if ( pioctl( 0, VIOCSETTOK, &vi, 0 ) < 0 ) {
        ap_log_error( APLOG_MARK, APLOG_ERR, r->server,
-               "mod_afs: pioctl failed" );
+               "mod_waklog: pioctl failed" );
     }
 
     /* we'll need to unlog when this connection is done. */
     ap_register_cleanup( r->pool, (void *)r, pioctl_cleanup, ap_null_cleanup );
 
-ap_log_error( APLOG_MARK, APLOG_ERR, r->server,
-       "mod_afs: done with token stuff" );
+ap_log_error( APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, r->server,
+       "mod_waklog: done with token stuff" );
 
     return OK;
 }
 
 
-module MODULE_VAR_EXPORT afs_module = {
+module MODULE_VAR_EXPORT waklog_module = {
     STANDARD_MODULE_STUFF, 
-    afs_init,              /* module initializer                  */
-    NULL,                  /* create per-dir    config structures */
+    waklog_init,              /* module initializer                  */
+    waklog_create_dir_config, /* create per-dir    config structures */
     NULL,                  /* merge  per-dir    config structures */
-    NULL,                  /* create per-server config structures */
+    waklog_create_server_config, /* create per-server config structures */
     NULL,                  /* merge  per-server config structures */
-    NULL,                  /* table of config file commands       */
+    waklog_cmds,           /* table of config file commands       */
     NULL,                  /* [#8] MIME-typed-dispatched handlers */
     NULL,                  /* [#1] URI to filename translation    */
     NULL,                  /* [#4] validate user id from request  */
     NULL,                  /* [#5] check if the user is ok _here_ */
     NULL,                  /* [#3] check access by host address   */
     NULL,                  /* [#6] determine MIME type            */
-    NULL,                  /* [#7] pre-run fixups                 */
+    waklog_get_tokens,     /* [#7] pre-run fixups                 */
     NULL,                  /* [#9] log a transaction              */
-    get_afs_tokens,        /* [#2] header parser                  */
-    afs_child_init,        /* child_init                          */
+    NULL,                  /* [#2] header parser                  */
+    waklog_child_init,     /* child_init                          */
     NULL,                  /* child_exit                          */
     NULL                   /* [#0] post read-request              */
 #ifdef EAPI