lighttpd
/
lighttpd1.4
2
0
Fork 0
Code Issues Releases Wiki Activity

[mod_skeleton] use config_plugin_values_init()

Browse Source
personal/stbuehler/ci-build
Glenn Strauss 3 years ago
parent 49140fe308
commit a377b159ec
1 changed files with 78 additions and 80 deletions
Show Stats Download Patch File Download Diff File

158
src/mod_skeleton.c
Unescape Escape View File

@ -25,13 +25,13 @@
/* plugin config for all request/connections */
typedef struct {
array *match;
const array *match;
} plugin_config;
typedef struct {
PLUGIN_DATA;
plugin_config **config_storage;
plugin_config conf;
PLUGIN_DATA;
plugin_config defaults;
plugin_config conf;
} plugin_data;
@ -56,93 +56,90 @@ static void handler_ctx_free(handler_ctx *hctx) {
/* init the plugin data */
INIT_FUNC(mod_skeleton_init) {
return calloc(1, sizeof(plugin_data));
return calloc(1, sizeof(plugin_data));
}
/* destroy the plugin data */
FREE_FUNC(mod_skeleton_free) {
plugin_data *p = p_d;
UNUSED(srv);
if (!p) return HANDLER_GO_ON;
if (p->config_storage) {
for (size_t i = 0; i < srv->config_context->used; i++) {
plugin_config *s = p->config_storage[i];
if (NULL == s) continue;
array_free(s->match);
free(s);
}
free(p->config_storage);
}
free(p);
return HANDLER_GO_ON;
}
/* handle plugin config and check values */
SETDEFAULTS_FUNC(mod_skeleton_set_defaults) {
plugin_data *p = p_d;
size_t i = 0;
config_values_t cv[] = {
{ "skeleton.array", NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_CONNECTION }, /* 0 */
{ 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 *));
force_assert(p->config_storage);
for (i = 0; i < srv->config_context->used; i++) {
data_config const* config = (data_config const*)srv->config_context->data[i];
plugin_config *s = calloc(1, sizeof(plugin_config));
force_assert(s);
s->match = array_init();
cv[0].destination = s->match;
plugin_data *p = p_d;
if (!p) return HANDLER_GO_ON;
UNUSED(srv);
p->config_storage[i] = s;
free(p->cvlist);
free(p);
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->match)) {
log_error_write(srv, __FILE__, __LINE__, "s",
"unexpected value for skeleton.array; expected list of \"urlpath\"");
return HANDLER_ERROR;
}
}
return HANDLER_GO_ON;
return HANDLER_GO_ON;
}
#define PATCH(x) \
p->conf.x = s->x;
static int mod_skeleton_patch_connection(server *srv, connection *con, plugin_data *p) {
plugin_config *s = p->config_storage[0];
PATCH(match);
/* skip the first, the global context */
for (size_t i = 1; i < srv->config_context->used; ++i) {
if (!config_check_cond(con, i)) continue; /* condition not matched */
/* handle plugin config and check values */
data_config *dc = (data_config *)srv->config_context->data[i];
s = p->config_storage[i];
static void mod_skeleton_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: /* skeleton.array */
pconf->match = cpv->v.a;
break;
default:/* should not happen */
return;
}
}
/* merge config */
for (size_t j = 0; j < dc->value->used; ++j) {
data_unset *du = dc->value->data[j];
static void mod_skeleton_merge_config(plugin_config * const pconf, const config_plugin_value_t *cpv) {
do {
mod_skeleton_merge_config_cpv(pconf, cpv);
} while ((++cpv)->k_id != -1);
}
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("skeleton.array"))) {
PATCH(match);
}
}
}
static void mod_skeleton_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_skeleton_merge_config(&p->conf, p->cvlist+p->cvlist[i].v.u2[0]);
}
}
return 0;
SETDEFAULTS_FUNC(mod_skeleton_set_defaults) {
static const config_plugin_keys_t cpk[] = {
{ CONST_STR_LEN("skeleton.array"),
T_CONFIG_ARRAY,
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_skeleton"))
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 \"url-path\"", cpk[cpv->k_id].k);
return HANDLER_ERROR;
}
break;
default:/* should not happen */
break;
}
}
}
/* initialize p->defaults from global config context */
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_skeleton_merge_config(&p->defaults, cpv);
}
return HANDLER_GO_ON;
}
#undef PATCH
URIHANDLER_FUNC(mod_skeleton_uri_handler) {
plugin_data *p = p_d;
@ -154,9 +151,10 @@ URIHANDLER_FUNC(mod_skeleton_uri_handler) {
if (buffer_string_is_empty(con->uri.path)) return HANDLER_GO_ON;
/* get module config for request */
mod_skeleton_patch_connection(srv, con, p);
mod_skeleton_patch_config(con, p);
if (NULL == array_match_value_suffix(p->conf.match, con->uri.path)) {
if (NULL == p->conf.match
|| NULL == array_match_value_suffix(p->conf.match, con->uri.path)) {
return HANDLER_GO_ON;
}

Write Preview
Loading…
Cancel
Save