Added config parameter with zakauthe plugin name.

diff --git a/src/Makefile.am b/src/Makefile.am
index e26c0ce6f52f58d49a905b96ed8a55f371aa3623..6f584883f7972e4e54cf163b4bb57e33f1fcff0a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,10 +6,10 @@ module: mod_authn_zakauthe.c
 
 install-exec-local: module
                mkdir -p "$(DESTDIR)`$(APXS) -q LIBEXECDIR`"
-               $(APXS) -S LIBEXECDIR="$(DESTDIR)`$(APXS) -q LIBEXECDIR`" -i `echo $(MOD_AUTHN_ZAKAUTHE_CFLAGS) $(MOD_AUTHN_ZAKAUTHE_LIBS) | sed 's/-pthread//g'` mod_authn_zakauthe.la
+               $(APXS) -S LIBEXECDIR="$(DESTDIR)`$(APXS) -q LIBEXECDIR`" -i `echo $(MOD_AUTHN_ZAKAUTHE_CFLAGS) $(MOD_AUTHN_ZAKAUTHE_LIBS) | sed 's/-pthread//g'` -n authn_zakauthe_module mod_authn_zakauthe.la
 
 install-exec-hook:
-               test -z "$(STRIP)" || $(STRIP) $(DESTDIR)`$(APXS) -q LIBEXECDIR`/mod_authn_zaktueh.so
+               test -z "$(STRIP)" || $(STRIP) $(DESTDIR)`$(APXS) -q LIBEXECDIR`/mod_authn_zakauthe.so
 
 CLEANFILES=         *.la *.lo *.o *.so *.slo .libs/*
 

diff --git a/src/mod_authn_zakauthe.c b/src/mod_authn_zakauthe.c
index de9be19b6424ddb4455a3dbd772d8d5a37f21928..71328f23d4b00926d10219031f2d8b6bc68a7c3a 100644 (file)
--- a/src/mod_authn_zakauthe.c
+++ b/src/mod_authn_zakauthe.c
@@ -35,16 +35,72 @@
 
 #include <libzakauthe/libzakauthe.h>
 
+static void register_hooks (apr_pool_t *pool);
+static void *create_authn_zakauthe_dir_config (apr_pool_t *p, char *d);
+
+/* Per-directory configuration */
+typedef struct {
+       char *plugin_name;
+} zakauthe_config;
+
+static const command_rec authn_zakauthe_cmds[] =
+{
+       AP_INIT_TAKE1 ("AuthZakAuthePlugin",
+                      ap_set_string_slot,
+                      (void *)APR_OFFSETOF (zakauthe_config, plugin_name),
+                      OR_AUTHCFG,
+                      "Plugin with full path"),
+       {NULL}
+};
+
+module AP_DECLARE_DATA authn_zakauthe_module =
+{
+       STANDARD20_MODULE_STUFF,
+       create_authn_zakauthe_dir_config,    /* dir config creater */
+       NULL,                            /* dir merger --- default is to override */
+       NULL,                            /* server config */
+       NULL,                            /* merge server config */
+       authn_zakauthe_cmds,                 /* command apr_table_t */
+       register_hooks                   /* register hooks */
+};
+
 static authn_status
-check_password (request_rec *r, const char *user,
+check_password (request_rec *r,
+                const char *user,
                 const char *password)
 {
-       return AUTH_GRANTED;
+       authn_status ret;
+
+       ZakAuthe *authe;
+       GSList *sl_authe_params;
+
+       zakauthe_config *config = (zakauthe_config *)ap_get_module_config (r->per_dir_config, &authn_zakauthe_module);
+
+       sl_authe_params = NULL;
+       sl_authe_params = g_slist_append (sl_authe_params, config->plugin_name);
+
+       authe = zak_authe_new ();
+
+       if (zak_authe_set_config (authe, sl_authe_params))
+               {
+                       ret = AUTH_GRANTED;
+               }
+       else
+               {
+                       ret = AUTH_DENIED;
+               }
+
+       g_object_unref (authe);
+       g_slist_free (sl_authe_params);
+
+       return ret;
 }
 
 static authn_status
-get_realm_hash (request_rec *r, const char *user,
-                const char *realm, char **rethash)
+get_realm_hash (request_rec *r,
+                const char *user,
+                const char *realm,
+                char **rethash)
 {
        return AUTH_GRANTED;
 }
@@ -63,13 +119,15 @@ register_hooks (apr_pool_t *pool)
                                   &authn_zakauthe_provider, AP_AUTH_INTERNAL_PER_CONF);
 }
 
-AP_DECLARE_MODULE(authn_zakauthe) =
+/*
+ * Constructor for per-directory configuration
+ */
+static void *
+create_authn_zakauthe_dir_config (apr_pool_t *p, char *d)
 {
-       STANDARD20_MODULE_STUFF,
-       NULL,    /* dir config creater */
-       NULL,                            /* dir merger --- default is to override */
-       NULL,                            /* server config */
-       NULL,                            /* merge server config */
-       NULL,                 /* command apr_table_t */
-       register_hooks                   /* register hooks */
-};
+       zakauthe_config *conf = apr_pcalloc (p, sizeof (zakauthe_config));
+
+       conf->plugin_name = NULL;
+
+       return conf;
+}