From 87822447d403a1f02a60a7a63626b4b11bbfb8fd Mon Sep 17 00:00:00 2001 From: umjarod Date: Thu, 30 Nov 2006 23:16:00 +0000 Subject: [PATCH] Changes for compatibility with Apache 2. git-svn-id: https://modwaklog.svn.sourceforge.net/svnroot/modwaklog/trunk/modwaklog@36 0d961d1b-a432-0410-8fea-cc29f225fe07 --- Makefile | 14 +- NOTES | 8 +- README | 27 ++++ VERSION | 2 +- mod_waklog.c | 442 +++++++++++++++++++++++++++++++++------------------ 5 files changed, 328 insertions(+), 165 deletions(-) diff --git a/Makefile b/Makefile index 1a7da80..10411ac 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,15 @@ ALL= mod_waklog.so -APXS= apxs +APXS= /usr/sbin/apxs CC= gcc -INC= -I/usr/local/mit-k5/include \ - -I/usr/local/openafs/include \ - -I/usr/local/apache/include +INC= -I/usr/local/mit-k5/include \ + -I/usr/include \ + -I/usr/include/apr-0 LIB= -L/usr/local/mit-k5/lib \ -lkrb5 -lk5crypto -lcom_err \ - -L/usr/lib/afs -lsys -lrx -llwp -lauth -lresolv -lafsrpc + -L/usr/lib/afs -lsys -lrx -llwp -lauth -lafsutil -lresolv CFLAGS= ${DEF} ${INC} -DEAPI -g OBJ= mod_waklog.o lifetime.o version.o @@ -24,7 +24,9 @@ version.o : version.c mod_waklog.so: ${OBJ} ${APXS} -c ${LIB} ${OBJ} + mv .libs/${ALL} . clean: - rm -f *.o *.so a.out core + rm -f *.o *.so a.out core rm -f ${ALL} + rm -rf .libs diff --git a/NOTES b/NOTES index 22fc96e..a77d147 100644 --- a/NOTES +++ b/NOTES @@ -9,19 +9,19 @@ Removed K4 code. Removed extraneous #if 0's. Fixed bug where mod_waklog crashed if KRB5CCNAME was null. -Future releases: 0.8.0: -Add configuration directives for Apache conf files. +Integrate Apache 2 support. +Future releases: 0.9.0: -Integrate Apache 2 support. +Add configuration directives for Apache conf files. Configure support. Remove ticket renewal code? Make it an option? 1.0.0: Features working properly. -Post 1.0.0: +1.x.x: Things we haven't thought of yet. diff --git a/README b/README index b044f62..28f4c3c 100644 --- a/README +++ b/README @@ -38,3 +38,30 @@ acquires an afs credential for a principal in the pts group umweb:servers at phase 0, and removes this credential at phase 2; directories permitted "umweb:servers rl" will allow the stat() call to succeed. + +BUILD + +make + +Be sure the paths to apxs, include files, and libraries are correct. + +If you compiled Apache 2 with large file support, be sure to have: + + #define _LARGEFILE64_SOURCE + +in mod_waklog.c. If you run make and receive many errors about apr_off_t +being undefined, you may need to add or comment out the above line. + + +INSTALL + +Copy the mod_waklog.so to somewhere Apache can read and execute it. + +Add the following lines to your httpd.conf file: + + LoadModule waklog_module /path/to/mod_waklog.so + + + WaklogProtected On + + diff --git a/VERSION b/VERSION index c2ff6cd..3afbb68 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -20060613 +20061130 diff --git a/mod_waklog.c b/mod_waklog.c index f7f8d2a..a5eba8c 100644 --- a/mod_waklog.c +++ b/mod_waklog.c @@ -1,11 +1,50 @@ +#define _LARGEFILE64_SOURCE + #include "httpd.h" #include "http_config.h" -#include "http_conf_globals.h" #include "http_log.h" #include "http_protocol.h" #include "http_request.h" #include "http_core.h" + +#ifdef STANDARD20_MODULE_STUFF +#include +#include +#include +#include + +module AP_MODULE_DECLARE_DATA waklog_module; + +#define MK_POOL apr_pool_t +#define MK_TABLE_GET apr_table_get +#include "unixd.h" +extern unixd_config_rec unixd_config; +#define ap_user_id unixd_config.user_id +#define ap_group_id unixd_config.group_id +#define ap_user_name unixd_config.user_name +#define command(name, func, var, type, usage) \ + AP_INIT_ ## type (name, (void*) func, \ + (void*)APR_OFFSETOF(waklog_config, var), \ + OR_AUTHCFG | RSRC_CONF, usage) +typedef struct { + int dummy; +} child_info; + +const char *userdata_key = "waklog_init"; +#else #include "ap_config.h" + +module waklog_module; +#define MK_POOL pool +#define MK_TABLE_GET ap_table_get +#define command(name, func, var, type, usage) \ + { name, func, \ + (void*)XtOffsetOf(waklog_config, var), \ + OR_AUTHCFG | RSRC_CONF, type, usage } +#endif /* STANDARD20_MODULE_STUFF */ + +#define getModConfig(P, X) P = (waklog_host_config *) ap_get_module_config( (X)->module_config, &waklog_module ); + #include #if defined(sun) @@ -16,24 +55,26 @@ #include #include -#define KEYTAB "/etc/keytab.default" -#define KEYTAB_PRINCIPAL "defaultprinc" -#define AFS_CELL "someplace.edu" /* NB: lower case */ +#define KEYTAB "/etc/keytab.wwwserver" +#define KEYTAB_PRINCIPAL "someplacewwwserver" +#define AFS_CELL "someplace.edu" #define TKT_LIFE 10*60*60 #define SLEEP_TIME TKT_LIFE - 5*60 +/* If there's an error, retry more aggressively */ +#define ERR_SLEEP_TIME 5*60 #define K5PATH "FILE:/tmp/waklog.creds.k5" -module waklog_module; - typedef struct { + int forked; int configured; int protect; char *keytab; char *keytab_principal; char *afs_cell; + MK_POOL *p; } waklog_host_config; typedef struct { @@ -41,39 +82,41 @@ typedef struct { } waklog_child_config; waklog_child_config child; -#if 0 - static void * -waklog_create_dir_config( pool *p, char *path ) +static void +log_error(const char *file, int line, int level, int status, + const server_rec *s, const char *fmt, ...) { - waklog_host_config *cfg; + char errstr[1024]; + va_list ap; - cfg = (waklog_host_config *)ap_pcalloc( p, sizeof( waklog_host_config )); - cfg->configured = 0; - cfg->protect = 0; - cfg->keytab = KEYTAB; - cfg->keytab_principal = KEYTAB_PRINCIPAL; - cfg->afs_cell = AFS_CELL; + va_start(ap, fmt); + vsnprintf(errstr, sizeof(errstr), fmt, ap); + va_end(ap); - return( cfg ); -} -#endif /* 0 */ +#ifdef STANDARD20_MODULE_STUFF + ap_log_error(file, line, level | APLOG_NOERRNO, status, s, "%s", errstr); +#else + ap_log_error(file, line, level | APLOG_NOERRNO, s, "%s", errstr); +#endif +} static void * -waklog_create_server_config( pool *p, server_rec *s ) +waklog_create_server_config( MK_POOL *p, server_rec *s ) { waklog_host_config *cfg; cfg = (waklog_host_config *)ap_pcalloc( p, sizeof( waklog_host_config )); + cfg->p = p; + cfg->forked = 0; cfg->configured = 0; cfg->protect = 0; cfg->keytab = KEYTAB; cfg->keytab_principal = KEYTAB_PRINCIPAL; cfg->afs_cell = AFS_CELL; - - ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, s, "mod_waklog: server config created" ); - + log_error( APLOG_MARK, APLOG_DEBUG, 0, s, "mod_waklog: server config created." ); + return( cfg ); } @@ -83,12 +126,11 @@ set_waklog_protect( cmd_parms *params, void *mconfig, int flag ) { waklog_host_config *cfg; - cfg = (waklog_host_config *) ap_get_module_config( - params->server->module_config, &waklog_module ); + getModConfig(cfg, params->server ); cfg->protect = flag; cfg->configured = 1; - ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, params->server, "mod_waklog: waklog_protect set" ); + log_error( APLOG_MARK, APLOG_DEBUG, 0, params->server, "mod_waklog: waklog_protect set" ); return( NULL ); } @@ -98,11 +140,10 @@ set_waklog_keytab( cmd_parms *params, void *mconfig, char *file ) { waklog_host_config *cfg; - cfg = (waklog_host_config *) ap_get_module_config( - params->server->module_config, &waklog_module ); + getModConfig(cfg, params->server ); - ap_log_error( APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, params->server, - "mod_waklog: will use keytab: %s", file ); + log_error( APLOG_MARK, APLOG_INFO, 0, params->server, + "mod_waklog: will use keytab: %s", file ); cfg->keytab = ap_pstrdup ( params->pool, file ); cfg->configured = 1; @@ -115,11 +156,10 @@ set_waklog_use_keytab_principal( cmd_parms *params, void *mconfig, char *file ) { waklog_host_config *cfg; - cfg = (waklog_host_config *) ap_get_module_config( - params->server->module_config, &waklog_module ); + getModConfig(cfg, params->server ); - ap_log_error( APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, params->server, - "mod_waklog: will use keytab_principal: %s", file ); + log_error( APLOG_MARK, APLOG_INFO, 0, params->server, + "mod_waklog: will use keytab_principal: %s", file ); cfg->keytab_principal = ap_pstrdup ( params->pool, file ); cfg->configured = 1; @@ -132,11 +172,10 @@ set_waklog_use_afs_cell( cmd_parms *params, void *mconfig, char *file ) { waklog_host_config *cfg; - cfg = (waklog_host_config *) ap_get_module_config( - params->server->module_config, &waklog_module ); + getModConfig(cfg, params->server ); - ap_log_error( APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, params->server, - "mod_waklog: will use afs_cell: %s", file ); + log_error( APLOG_MARK, APLOG_INFO, 0, params->server, + "mod_waklog: will use afs_cell: %s", file ); cfg->afs_cell = ap_pstrdup( params->pool, file ); cfg->configured = 1; @@ -145,40 +184,48 @@ set_waklog_use_afs_cell( cmd_parms *params, void *mconfig, char *file ) static void -waklog_child_init( server_rec *s, pool *p ) +#ifdef STANDARD20_MODULE_STUFF +waklog_child_init(MK_POOL *p, server_rec *s) +#else +waklog_child_init(server_rec *s, MK_POOL *p) +#endif { + log_error( APLOG_MARK, APLOG_DEBUG, 0, s, + "mod_waklog: child_init called" ); + memset( &child.token, 0, sizeof( struct ktc_token ) ); setpag(); + log_error( APLOG_MARK, APLOG_DEBUG, 0, s, + "mod_waklog: child_init returned" ); + return; } +typedef struct { + int wak_protect; + char *wak_keytab; + char *wak_ktprinc; + char *wak_afscell; +} waklog_config; command_rec waklog_cmds[ ] = { - { "WaklogProtected", set_waklog_protect, - NULL, RSRC_CONF | ACCESS_CONF, FLAG, - "enable waklog on a location or directory basis" }, + command("WaklogProtected", set_waklog_protect, wak_protect, FLAG, "enable waklog on a location or directory basis"), - { "WaklogKeytab", set_waklog_keytab, - NULL, RSRC_CONF | ACCESS_CONF, TAKE1, - "Use the supplied keytab rather than the default" }, + command("WaklogKeytab", set_waklog_keytab, wak_keytab, TAKE1, "Use the supplied keytab rather than the default"), - { "WaklogUseKeytabPrincipal", set_waklog_use_keytab_principal, - NULL, RSRC_CONF | ACCESS_CONF, TAKE1, - "Use the supplied keytab principal rather than the default" }, + command("WaklogUseKeytabPrincipal", set_waklog_use_keytab_principal, wak_ktprinc, TAKE1, "Use the supplied keytab principal rather than the default"), - { "WaklogUseAFSCell", set_waklog_use_afs_cell, - NULL, RSRC_CONF | ACCESS_CONF, TAKE1, - "Use the supplied AFS cell rather than the default" }, + command("WaklogUseAFSCell", set_waklog_use_afs_cell, wak_afscell, TAKE1, "Use the supplied AFS cell rather than the default"), { NULL } }; - static void + static int token_cleanup( void *data ) { request_rec *r = (request_rec *)data; @@ -188,17 +235,17 @@ token_cleanup( void *data ) ktc_ForgetAllTokens(); - ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server, - "mod_waklog: ktc_ForgetAllTokens succeeded: pid: %d", getpid() ); + log_error( APLOG_MARK, APLOG_DEBUG, 0, r->server, + "mod_waklog: ktc_ForgetAllTokens succeeded: pid: %d", getpid() ); } - return; + return 0; } static int waklog_kinit( server_rec *s ) { - krb5_error_code kerror; + krb5_error_code kerror = 0; krb5_context kcontext = NULL; krb5_principal kprinc = NULL; krb5_get_init_creds_opt kopts; @@ -206,36 +253,35 @@ waklog_kinit( server_rec *s ) krb5_ccache kccache = NULL; krb5_keytab keytab = NULL; char ktbuf[ MAX_KEYTAB_NAME_LEN + 1 ]; - waklog_host_config *cfg; int i; + waklog_host_config *cfg; - ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, s, - "mod_waklog: waklog_kinit called: pid: %d", getpid() ); + log_error( APLOG_MARK, APLOG_DEBUG, 0, s, + "mod_waklog: waklog_kinit called: pid: %d", getpid() ); - cfg = (waklog_host_config *) ap_get_module_config( s->module_config, - &waklog_module ); + getModConfig(cfg, s); if (( kerror = krb5_init_context( &kcontext ))) { - ap_log_error( APLOG_MARK, APLOG_ERR, s, - "mod_waklog: %s", (char *)error_message( kerror )); + log_error( APLOG_MARK, APLOG_ERR, 0, s, + "mod_waklog: %s", (char *)error_message( kerror )); goto cleanup; } /* use the path */ if (( kerror = krb5_cc_resolve( kcontext, K5PATH, &kccache )) != 0 ) { - ap_log_error( APLOG_MARK, APLOG_ERR, s, - "mod_waklog: %s", (char *)error_message( kerror )); + log_error( APLOG_MARK, APLOG_ERR, 0, s, + "mod_waklog: %s", (char *)error_message( kerror )); goto cleanup; } - ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, s, - "mod_waklog: keytab_principal: %s", cfg->keytab_principal ); + log_error( APLOG_MARK, APLOG_DEBUG, 0, s, + "mod_waklog: keytab_principal: %s", cfg->keytab_principal ); if (( kerror = krb5_parse_name( kcontext, cfg->keytab_principal, &kprinc ))) { - ap_log_error( APLOG_MARK, APLOG_ERR, s, - "mod_waklog: %s", (char *)error_message( kerror )); + log_error( APLOG_MARK, APLOG_ERR, 0, s, + "mod_waklog: %s", (char *)error_message( kerror )); goto cleanup; } @@ -249,12 +295,12 @@ waklog_kinit( server_rec *s ) /* keytab from config */ strncpy( ktbuf, cfg->keytab, sizeof( ktbuf ) - 1 ); - ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, s, - "mod_waklog: waklog_kinit using: %s", ktbuf ); + log_error( APLOG_MARK, APLOG_DEBUG, 0, s, + "mod_waklog: waklog_kinit using: %s", ktbuf ); if (( kerror = krb5_kt_resolve( kcontext, ktbuf, &keytab )) != 0 ) { - ap_log_error( APLOG_MARK, APLOG_ERR, s, - "mod_waklog:krb5_kt_resolve %s", (char *)error_message( kerror )); + log_error( APLOG_MARK, APLOG_ERR, 0, s, + "mod_waklog:krb5_kt_resolve %s", (char *)error_message( kerror )); goto cleanup; } @@ -265,17 +311,15 @@ waklog_kinit( server_rec *s ) if (( kerror = krb5_get_init_creds_keytab( kcontext, &v5creds, kprinc, keytab, 0, NULL, &kopts ))) { - ap_log_error( APLOG_MARK, APLOG_ERR, s, - "mod_waklog:krb5_get_init_creds_keytab %s", (char *)error_message( kerror )); + log_error( APLOG_MARK, APLOG_ERR, 0, s, + "mod_waklog:krb5_get_init_creds_keytab %s", (char *)error_message( kerror )); goto cleanup; } - - if (( kerror = krb5_cc_initialize( kcontext, kccache, kprinc )) != 0 ) { - ap_log_error( APLOG_MARK, APLOG_ERR, s, - "mod_waklog:krb5_cc_initialize %s", (char *)error_message( kerror )); + log_error( APLOG_MARK, APLOG_ERR, 0, s, + "mod_waklog:krb5_cc_initialize %s", (char *)error_message( kerror )); goto cleanup; } @@ -283,14 +327,14 @@ waklog_kinit( server_rec *s ) kerror = krb5_cc_store_cred( kcontext, kccache, &v5creds ); krb5_free_cred_contents( kcontext, &v5creds ); if ( kerror != 0 ) { - ap_log_error( APLOG_MARK, APLOG_ERR, s, - "mod_waklog: %s", (char *)error_message( kerror )); + log_error( APLOG_MARK, APLOG_ERR, 0, s, + "mod_waklog: %s", (char *)error_message( kerror )); goto cleanup; } - ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, s, - "mod_waklog: waklog_kinit success" ); + log_error( APLOG_MARK, APLOG_DEBUG, 0, s, + "mod_waklog: waklog_kinit success" ); cleanup: if ( keytab ) @@ -302,10 +346,10 @@ cleanup: if ( kcontext ) krb5_free_context( kcontext ); - ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, s, - "mod_waklog: waklog_kinit: exiting" ); + log_error( APLOG_MARK, APLOG_DEBUG, 0, s, + "mod_waklog: waklog_kinit: exiting" ); - return( 0 ); + return( kerror ); } @@ -326,14 +370,14 @@ waklog_aklog( request_rec *r ) waklog_host_config *cfg; int buflen; - k5path = ap_table_get( r->subprocess_env, "KRB5CCNAME" ); + k5path = MK_TABLE_GET( r->subprocess_env, "KRB5CCNAME" ); - ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, r->server, - "mod_waklog: waklog_aklog called: k5path: %s", k5path ); + log_error( APLOG_MARK, APLOG_INFO, 0, r->server, + "mod_waklog: waklog_aklog called: k5path: %s", k5path ); if ( k5path == NULL ) { - ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server, - "mod_waklog: waklog_aklog giving up" ); + log_error( APLOG_MARK, APLOG_DEBUG, 0, r->server, + "mod_waklog: waklog_aklog giving up" ); goto cleanup; } @@ -343,16 +387,15 @@ waklog_aklog( request_rec *r ) if (( kerror = krb5_init_context( &kcontext ))) { /* Authentication Required ( kerberos error ) */ - ap_log_error( APLOG_MARK, APLOG_ERR, r->server, - (char *)error_message( kerror )); - + log_error( APLOG_MARK, APLOG_ERR, 0, r->server, + (char *)error_message( kerror )); + goto cleanup; } memset( (char *)&increds, 0, sizeof(increds)); - cfg = (waklog_host_config *) ap_get_module_config( - r->server->module_config, &waklog_module ); + getModConfig(cfg, r->server ); /* afs/ or afs */ strncpy( buf, "afs", sizeof( buf ) - 1 ); @@ -363,15 +406,15 @@ waklog_aklog( request_rec *r ) /* set server part */ if (( kerror = krb5_parse_name( kcontext, buf, &increds.server ))) { - ap_log_error( APLOG_MARK, APLOG_ERR, r->server, - (char *)error_message( kerror )); + log_error( APLOG_MARK, APLOG_ERR, 0, r->server, + (char *)error_message( kerror )); goto cleanup; } if (( kerror = krb5_cc_resolve( kcontext, k5path, &kccache )) != 0 ) { - ap_log_error( APLOG_MARK, APLOG_ERR, r->server, - (char *)error_message( kerror )); + log_error( APLOG_MARK, APLOG_ERR, 0, r->server, + (char *)error_message( kerror )); goto cleanup; } @@ -386,15 +429,15 @@ waklog_aklog( request_rec *r ) /* get the V5 credentials */ if (( kerror = krb5_get_credentials( kcontext, 0, kccache, &increds, &v5credsp ) ) ) { - ap_log_error( APLOG_MARK, APLOG_ERR, r->server, - "mod_waklog: krb5_get_credentials: %s", error_message( kerror )); + log_error( APLOG_MARK, APLOG_ERR, 0, r->server, + "mod_waklog: krb5_get_credentials: %s", error_message( kerror )); goto cleanup; } /* don't overflow */ if ( v5credsp->ticket.length >= MAXKTCTICKETLEN ) { /* from krb524d.c */ - ap_log_error( APLOG_MARK, APLOG_ERR, r->server, - "mod_waklog: ticket size (%d) too big to fake", v5credsp->ticket.length ); + log_error( APLOG_MARK, APLOG_ERR, 0, r->server, + "mod_waklog: ticket size (%d) too big to fake", v5credsp->ticket.length ); goto cleanup; } @@ -415,8 +458,8 @@ waklog_aklog( request_rec *r ) sizeof( token.sessionKey ) )) || (memcmp( child.token.ticket, token.ticket, token.ticketLen )) ) { - ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server, - "mod_waklog: client: %s", buf ); + log_error( APLOG_MARK, APLOG_DEBUG, 0, r->server, + "mod_waklog: client: %s", buf ); /* build the name */ memmove( buf, v5credsp->client->data[0].data, @@ -441,13 +484,13 @@ waklog_aklog( request_rec *r ) /* assemble the server's cell */ strncpy( server.cell, cfg->afs_cell , sizeof( server.cell ) - 1 ); - ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server, - "mod_waklog: server: name=%s, instance=%s, cell=%s", - server.name, server.instance, server.cell ); - - ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server, - "mod_waklog: client: name=%s, instance=%s, cell=%s", - client.name, client.instance, client.cell ); + log_error( APLOG_MARK, APLOG_DEBUG, 0, r->server, + "mod_waklog: server: name=%s, instance=%s, cell=%s", + server.name, server.instance, server.cell ); + + log_error( APLOG_MARK, APLOG_DEBUG, 0, r->server, + "mod_waklog: client: name=%s, instance=%s, cell=%s", + client.name, client.instance, client.cell ); /* use the path */ @@ -455,8 +498,8 @@ waklog_aklog( request_rec *r ) write( 2, "", 0 ); if ( ( rc = ktc_SetToken( &server, &token, &client, 0 ) ) ) { - ap_log_error( APLOG_MARK, APLOG_ERR, r->server, - "mod_waklog: settoken returned %d", rc ); + log_error( APLOG_MARK, APLOG_ERR, 0, r->server, + "mod_waklog: settoken returned %d", rc ); goto cleanup; } @@ -479,8 +522,8 @@ cleanup: if ( kcontext ) krb5_free_context( kcontext ); - ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server, - "mod_waklog: finished with waklog_aklog" ); + log_error( APLOG_MARK, APLOG_DEBUG, 0, r->server, + "mod_waklog: finished with waklog_aklog" ); return; @@ -490,8 +533,8 @@ cleanup: waklog_child_routine( void *s, child_info *pinfo ) { if ( !getuid() ) { - ap_log_error( APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, s, - "mod_waklog: waklog_child_routine called as root" ); + log_error( APLOG_MARK, APLOG_DEBUG, 0, s, + "mod_waklog: waklog_child_routine called as root" ); /* this was causing the credential file to get owned by root */ setgid(ap_group_id); @@ -500,58 +543,109 @@ waklog_child_routine( void *s, child_info *pinfo ) while( 1 ) { waklog_kinit( s ); + log_error( APLOG_MARK, APLOG_DEBUG, 0, s, + "mod_waklog: child_routine sleeping" ); sleep( SLEEP_TIME ); + log_error( APLOG_MARK, APLOG_DEBUG, 0, s, + "mod_waklog: slept, calling waklog_kinit" ); } } - +#ifdef STANDARD20_MODULE_STUFF +static int +waklog_init_handler(apr_pool_t *p, apr_pool_t *plog, + apr_pool_t *ptemp, server_rec *s) +{ + int rv; + extern char *version; + apr_proc_t *proc; + waklog_host_config *cfg; + void *data; + + getModConfig(cfg, s); + + /* initialize_module() will be called twice, and if it's a DSO + * then all static data from the first call will be lost. Only + * set up our static data on the second call. + * see http://issues.apache.org/bugzilla/show_bug.cgi?id=37519 */ + apr_pool_userdata_get(&data, userdata_key, s->process->pool); + + if (!data) { + apr_pool_userdata_set((const void *)1, userdata_key, + apr_pool_cleanup_null, s->process->pool); + } else { + log_error( APLOG_MARK, APLOG_INFO, 0, s, + "mod_waklog: version %s initialized.", version ); + + proc = (apr_proc_t *)ap_pcalloc( s->process->pool, sizeof(apr_proc_t)); + + rv = apr_proc_fork(proc, s->process->pool); + + if (rv == APR_INCHILD) { + waklog_child_routine(s, NULL); + } else { + apr_pool_note_subprocess(s->process->pool, proc, APR_KILL_ALWAYS); + } + /* parent and child */ + cfg->forked = proc->pid; + } + return 0; +} +#else static void -waklog_init( server_rec *s, pool *p ) +waklog_init( server_rec *s, MK_POOL *p ) { extern char *version; int pid; - ap_log_error( APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, s, - "mod_waklog: version %s initialized.", version ); + log_error( APLOG_MARK, APLOG_INFO, 0, s, + "mod_waklog: version %s initialized.", version ); pid = ap_bspawn_child( p, waklog_child_routine, s, kill_always, NULL, NULL, NULL ); - ap_log_error( APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, s, - "mod_waklog: ap_bspawn_child: %d.", pid ); + log_error( APLOG_MARK, APLOG_DEBUG, 0, s, + "mod_waklog: ap_bspawn_child: %d.", pid ); } - +#endif static int waklog_phase0( request_rec *r ) { waklog_host_config *cfg; - ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server, - "mod_waklog: phase0 called" ); + log_error( APLOG_MARK, APLOG_DEBUG, 0, r->server, + "mod_waklog: phase0 called" ); - cfg = (waklog_host_config *)ap_get_module_config( - r->server->module_config, &waklog_module); + getModConfig(cfg, r->server ); + log_error( APLOG_MARK, APLOG_DEBUG, 0, r->server, + "mod_waklog: phase0, checking cfg->protect" ); if ( !cfg->protect ) { - ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server, - "mod_waklog: phase0 declining" ); + log_error( APLOG_MARK, APLOG_DEBUG, 0, r->server, + "mod_waklog: phase0 declining" ); return( DECLINED ); } - /* set our environment variables */ - ap_table_set( r->subprocess_env, "KRB5CCNAME", K5PATH ); + log_error( APLOG_MARK, APLOG_DEBUG, 0, r->server, + "mod_waklog: phase0, NOT setting environment variable" ); + /* set our environment variable */ + apr_table_set( r->subprocess_env, "KRB5CCNAME", K5PATH ); + log_error( APLOG_MARK, APLOG_DEBUG, 0, r->server, + "mod_waklog: phase0, checking child.token.ticketLen" ); /* do this only if we are still unauthenticated */ if ( !child.token.ticketLen ) { - + + log_error( APLOG_MARK, APLOG_DEBUG, 0, r->server, + "mod_waklog: phase0, calling waklog_aklog" ); /* stuff the credentials into the kernel */ waklog_aklog( r ); } - ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server, - "mod_waklog: phase0 returning" ); + log_error( APLOG_MARK, APLOG_DEBUG, 0, r->server, + "mod_waklog: phase0 returning" ); return DECLINED; } @@ -561,30 +655,45 @@ waklog_phase7( request_rec *r ) { waklog_host_config *cfg; - ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server, - "mod_waklog: phase7 called" ); + log_error( APLOG_MARK, APLOG_DEBUG, 0, r->server, + "mod_waklog: phase7 called" ); - cfg = (waklog_host_config *)ap_get_module_config( - r->server->module_config, &waklog_module); + getModConfig(cfg, r->server ); if ( !cfg->protect ) { return( DECLINED ); } /* stuff the credentials into the kernel */ + + log_error( APLOG_MARK, APLOG_DEBUG, 0, r->server, + "mod_waklog: phase7, calling waklog_aklog" ); waklog_aklog( r ); - ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server, - "mod_waklog: phase7 returning" ); + log_error( APLOG_MARK, APLOG_DEBUG, 0, r->server, + "mod_waklog: phase7 returning" ); return DECLINED; } - static void -waklog_new_connection( conn_rec *c ) { - ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, c->server, - "mod_waklog: new_connection called: pid: %d", getpid() ); - return; +static +#ifdef STANDARD20_MODULE_STUFF +int +#else +void +#endif +waklog_new_connection( conn_rec *c +#ifdef STANDARD20_MODULE_STUFF + , void *dummy +#endif + ) { + log_error( APLOG_MARK, APLOG_DEBUG, 0, c->base_server, + "mod_waklog: new_connection called: pid: %d", getpid() ); + return +#ifdef STANDARD20_MODULE_STUFF + 0 +#endif + ; } @@ -601,24 +710,25 @@ waklog_new_connection( conn_rec *c ) { waklog_phase2( request_rec *r ) { - ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server, - "mod_waklog: phase2 called" ); + log_error( APLOG_MARK, APLOG_DEBUG, 0, r->server, + "mod_waklog: phase2 called" ); if ( child.token.ticketLen ) { memset( &child.token, 0, sizeof( struct ktc_token ) ); ktc_ForgetAllTokens(); - ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server, - "mod_waklog: ktc_ForgetAllTokens succeeded: pid: %d", getpid() ); + log_error( APLOG_MARK, APLOG_DEBUG, 0, r->server, + "mod_waklog: ktc_ForgetAllTokens succeeded: pid: %d", getpid() ); } - ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server, - "mod_waklog: phase2 returning" ); + log_error( APLOG_MARK, APLOG_DEBUG, 0, r->server, + "mod_waklog: phase2 returning" ); return DECLINED; } +#ifndef STANDARD20_MODULE_STUFF module MODULE_VAR_EXPORT waklog_module = { STANDARD_MODULE_STUFF, waklog_init, /* module initializer */ @@ -650,4 +760,28 @@ module MODULE_VAR_EXPORT waklog_module = { waklog_new_connection /* EAPI: new_connection */ #endif }; +#else +static void +waklog_register_hooks(apr_pool_t *p) +{ + ap_hook_fixups(waklog_phase7, NULL, NULL, APR_HOOK_FIRST); + ap_hook_header_parser(waklog_phase2, NULL, NULL, APR_HOOK_FIRST); + ap_hook_child_init(waklog_child_init, NULL, NULL, APR_HOOK_FIRST); + ap_hook_post_read_request(waklog_phase0, NULL, NULL, APR_HOOK_FIRST); + ap_hook_pre_connection(waklog_new_connection, NULL, NULL, APR_HOOK_FIRST); + ap_hook_post_config(waklog_init_handler, NULL, NULL, APR_HOOK_MIDDLE); +} + + +module AP_MODULE_DECLARE_DATA waklog_module = +{ + STANDARD20_MODULE_STUFF, + NULL, /* create per-dir conf structures */ + NULL, /* merge per-dir conf structures */ + waklog_create_server_config, /* create per-server conf structures */ + NULL, /* merge per-server conf structures */ + waklog_cmds, /* table of configuration directives */ + waklog_register_hooks /* register hooks */ +}; +#endif -- 2.20.1