[mod_staticfile] use config_plugin_values_init()

1 files changed, 89 insertions, 118 deletions

diff --git a/src/mod_staticfile.c b/src/mod_staticfile.c
index 59701748..cedf43f7 100644
--- a/src/mod_staticfile.c
+++ b/src/mod_staticfile.c
@@ -6,8 +6,6 @@
 
 #include "plugin.h"
 
-#include "etag.h"
-#include "http_chunk.h"
 #include "response.h"
 
 #include <stdlib.h>
@@ -19,146 +17,120 @@
  */
 
 
-
-/* plugin config for all request/connections */
-
 typedef struct {
-	array *exclude_ext;
+	const array *exclude_ext;
 	unsigned short etags_used;
 	unsigned short disable_pathinfo;
 } plugin_config;
 
 typedef struct {
-	PLUGIN_DATA;
-
-	plugin_config **config_storage;
-
-	plugin_config conf;
+    PLUGIN_DATA;
+    plugin_config defaults;
+    plugin_config conf;
 } plugin_data;
 
-/* init the plugin data */
 INIT_FUNC(mod_staticfile_init) {
-	plugin_data *p;
-
-	p = calloc(1, sizeof(*p));
-
-	return p;
+    return calloc(1, sizeof(plugin_data));
 }
 
-/* detroy the plugin data */
 FREE_FUNC(mod_staticfile_free) {
-	plugin_data *p = p_d;
-
-	UNUSED(srv);
-
-	if (!p) return HANDLER_GO_ON;
-
-	if (p->config_storage) {
-		size_t i;
-		for (i = 0; i < srv->config_context->used; i++) {
-			plugin_config *s = p->config_storage[i];
+    plugin_data *p = p_d;
+    if (!p) return HANDLER_GO_ON;
+    UNUSED(srv);
 
-			if (NULL == s) continue;
+    free(p->cvlist);
+    free(p);
 
-			array_free(s->exclude_ext);
-
-			free(s);
-		}
-		free(p->config_storage);
-	}
-
-	free(p);
-
-	return HANDLER_GO_ON;
+    return HANDLER_GO_ON;
 }
 
-/* handle plugin config and check values */
-
-SETDEFAULTS_FUNC(mod_staticfile_set_defaults) {
-	plugin_data *p = p_d;
-	size_t i = 0;
-
-	config_values_t cv[] = {
-		{ "static-file.exclude-extensions", NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_CONNECTION },       /* 0 */
-		{ "static-file.etags",    NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 1 */
-		{ "static-file.disable-pathinfo", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 2 */
-		{ NULL,                         NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET }
-	};
-
-	if (!p) return HANDLER_ERROR;
-
-	p->config_storage = calloc(srv->config_context->used, sizeof(plugin_config *));
-
-	for (i = 0; i < srv->config_context->used; i++) {
-		data_config const* config = (data_config const*)srv->config_context->data[i];
-		plugin_config *s;
-
-		s = calloc(1, sizeof(plugin_config));
-		s->exclude_ext    = array_init();
-		s->etags_used     = 1;
-		s->disable_pathinfo = 0;
-
-		cv[0].destination = s->exclude_ext;
-		cv[1].destination = &(s->etags_used);
-		cv[2].destination = &(s->disable_pathinfo);
-
-		p->config_storage[i] = s;
-
-		if (0 != config_insert_values_global(srv, config->value, cv, i == 0 ? T_CONFIG_SCOPE_SERVER : T_CONFIG_SCOPE_CONNECTION)) {
-			return HANDLER_ERROR;
-		}
-
-		if (!array_is_vlist(s->exclude_ext)) {
-			log_error_write(srv, __FILE__, __LINE__, "s",
-					"unexpected value for static-file.exclude-extensions; expected list of \"ext\"");
-			return HANDLER_ERROR;
-		}
-	}
+static void mod_staticfile_merge_config_cpv(plugin_config * const pconf, const config_plugin_value_t * const cpv) {
+    switch (cpv->k_id) { /* index into static config_plugin_keys_t cpk[] */
+      case 0: /* static-file.exclude-extensions */
+        pconf->exclude_ext = cpv->v.a;
+        break;
+      case 1: /* static-file.etags */
+        pconf->etags_used = cpv->v.u;
+        break;
+      case 2: /* static-file.disable-pathinfo */
+        pconf->disable_pathinfo = cpv->v.u;
+        break;
+      default:/* should not happen */
+        return;
+    }
+}
 
-	return HANDLER_GO_ON;
+static void mod_staticfile_merge_config(plugin_config * const pconf, const config_plugin_value_t *cpv) {
+    do {
+        mod_staticfile_merge_config_cpv(pconf, cpv);
+    } while ((++cpv)->k_id != -1);
 }
 
-#define PATCH(x) \
-	p->conf.x = s->x;
-static int mod_staticfile_patch_connection(server *srv, connection *con, plugin_data *p) {
-	size_t i, j;
-	plugin_config *s = p->config_storage[0];
-
-	PATCH(exclude_ext);
-	PATCH(etags_used);
-	PATCH(disable_pathinfo);
-
-	/* skip the first, the global context */
-	for (i = 1; i < srv->config_context->used; i++) {
-		if (!config_check_cond(con, i)) continue; /* condition not matched */
-
-		data_config *dc = (data_config *)srv->config_context->data[i];
-		s = p->config_storage[i];
-
-		/* merge config */
-		for (j = 0; j < dc->value->used; j++) {
-			data_unset *du = dc->value->data[j];
-
-			if (buffer_is_equal_string(&du->key, CONST_STR_LEN("static-file.exclude-extensions"))) {
-				PATCH(exclude_ext);
-			} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("static-file.etags"))) {
-				PATCH(etags_used);
-			} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("static-file.disable-pathinfo"))) {
-				PATCH(disable_pathinfo);
-			}
-		}
-	}
+static void mod_staticfile_patch_config(connection * const con, plugin_data * const p) {
+    memcpy(&p->conf, &p->defaults, sizeof(plugin_config));
+    for (int i = 1, used = p->nconfig; i < used; ++i) {
+        if (config_check_cond(con, (uint32_t)p->cvlist[i].k_id))
+            mod_staticfile_merge_config(&p->conf,
+                                        p->cvlist + p->cvlist[i].v.u2[0]);
+    }
+}
 
-	return 0;
+SETDEFAULTS_FUNC(mod_staticfile_set_defaults) {
+    static const config_plugin_keys_t cpk[] = {
+      { CONST_STR_LEN("static-file.exclude-extensions"),
+        T_CONFIG_ARRAY,
+        T_CONFIG_SCOPE_CONNECTION }
+     ,{ CONST_STR_LEN("static-file.etags"),
+        T_CONFIG_BOOL,
+        T_CONFIG_SCOPE_CONNECTION }
+     ,{ CONST_STR_LEN("static-file.disable-pathinfo"),
+        T_CONFIG_BOOL,
+        T_CONFIG_SCOPE_CONNECTION }
+     ,{ NULL, 0,
+        T_CONFIG_UNSET,
+        T_CONFIG_SCOPE_UNSET }
+    };
+
+    plugin_data * const p = p_d;
+    if (!config_plugin_values_init(srv, p, cpk, "mod_staticfile"))
+        return HANDLER_ERROR;
+
+    /* process and validate config directives
+     * (init i to 0 if global context; to 1 to skip empty global context) */
+    for (int i = !p->cvlist[0].v.u2[1]; i < p->nconfig; ++i) {
+        const config_plugin_value_t *cpv = p->cvlist + p->cvlist[i].v.u2[0];
+        for (; -1 != cpv->k_id; ++cpv) {
+            switch (cpv->k_id) {
+              case 0: /* static-file.exclude-extensions */
+                if (!array_is_vlist(cpv->v.a)) {
+                    log_error(srv->errh, __FILE__, __LINE__,
+                      "unexpected value for %s; "
+                      "expected list of \"ext\"", cpk[cpv->k_id].k);
+                    return HANDLER_ERROR;
+                }
+                break;
+              default:/* should not happen */
+                break;
+            }
+        }
+    }
+
+    /* initialize p->defaults from global config context */
+    p->defaults.etags_used = 1; /* etags enabled */
+    if (p->nconfig > 0 && p->cvlist->v.u2[1]) {
+        const config_plugin_value_t *cpv = p->cvlist + p->cvlist->v.u2[0];
+        if (-1 != cpv->k_id)
+            mod_staticfile_merge_config(&p->defaults, cpv);
+    }
+
+    return HANDLER_GO_ON;
 }
-#undef PATCH
 
 URIHANDLER_FUNC(mod_staticfile_subrequest) {
 	plugin_data *p = p_d;
 
 	/* someone else has done a decision for us */
 	if (con->http_status != 0) return HANDLER_GO_ON;
-	if (buffer_is_empty(con->uri.path)) return HANDLER_GO_ON;
 	if (buffer_is_empty(con->physical.path)) return HANDLER_GO_ON;
 
 	/* someone else has handled this request */
@@ -174,7 +146,7 @@ URIHANDLER_FUNC(mod_staticfile_subrequest) {
 		return HANDLER_GO_ON;
 	}
 
-	mod_staticfile_patch_connection(srv, con, p);
+	mod_staticfile_patch_config(con, p);
 
 	if (p->conf.disable_pathinfo && !buffer_string_is_empty(con->request.pathinfo)) {
 		if (con->conf.log_request_handling) {
@@ -184,7 +156,7 @@ URIHANDLER_FUNC(mod_staticfile_subrequest) {
 	}
 
 	/* ignore certain extensions */
-	if (0 != p->conf.exclude_ext->used && array_match_value_suffix(p->conf.exclude_ext, con->physical.path)) {
+	if (p->conf.exclude_ext && array_match_value_suffix(p->conf.exclude_ext, con->physical.path)) {
 			if (con->conf.log_request_handling) {
 				log_error_write(srv, __FILE__, __LINE__,  "s",  "-- NOT handling file as static file, extension forbidden");
 			}
@@ -202,7 +174,6 @@ URIHANDLER_FUNC(mod_staticfile_subrequest) {
 	return HANDLER_FINISHED;
 }
 
-/* this function is called at dlopen() time and inits the callbacks */
 
 int mod_staticfile_plugin_init(plugin *p);
 int mod_staticfile_plugin_init(plugin *p) {