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

[mod_indexfile] use config_plugin_values_init()

personal/stbuehler/ci-build
Glenn Strauss 2 years ago
parent
d5782eba65
commit
362ccedc41
4 changed files with 93 additions and 127 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 212
      src/mod_indexfile.c
  2. 4
      tests/fastcgi-10.conf
  3. 2
      tests/fastcgi-responder.conf
  4. 2
      tests/lighttpd.conf

212
src/mod_indexfile.c
View File

@ -16,143 +16,114 @@
/* plugin config for all request/connections */
typedef struct {
array *indexfiles;
const array *indexfiles;
} plugin_config;
typedef struct {
PLUGIN_DATA;
buffer *tmp_buf;
plugin_config **config_storage;
plugin_config conf;
PLUGIN_DATA;
plugin_config defaults;
plugin_config conf;
} plugin_data;
/* init the plugin data */
INIT_FUNC(mod_indexfile_init) {
plugin_data *p;
p = calloc(1, sizeof(*p));
p->tmp_buf = buffer_init();
return p;
return calloc(1, sizeof(plugin_data));
}
/* detroy the plugin data */
FREE_FUNC(mod_indexfile_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];
if (NULL == s) continue;
array_free(s->indexfiles);
free(s);
}
free(p->config_storage);
}
plugin_data *p = p_d;
if (!p) return HANDLER_GO_ON;
UNUSED(srv);
buffer_free(p->tmp_buf);
free(p->cvlist);
free(p);
free(p);
return HANDLER_GO_ON;
return HANDLER_GO_ON;
}
/* handle plugin config and check values */
SETDEFAULTS_FUNC(mod_indexfile_set_defaults) {
plugin_data *p = p_d;
size_t i = 0;
config_values_t cv[] = {
{ "index-file.names", NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_CONNECTION }, /* 0 */
{ "server.indexfiles", NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_CONNECTION }, /* 1 */
{ 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->indexfiles = array_init();
cv[0].destination = s->indexfiles;
cv[1].destination = s->indexfiles; /* old name for [0] */
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->indexfiles)) {
log_error_write(srv, __FILE__, __LINE__, "s",
"unexpected value for index-file.names; expected list of \"file\"");
return HANDLER_ERROR;
}
}
return HANDLER_GO_ON;
static void mod_indexfile_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: /* index-file.names */
case 1: /* server.indexfiles */
pconf->indexfiles = cpv->v.a;
break;
default:/* should not happen */
return;
}
}
#define PATCH(x) \
p->conf.x = s->x;
static int mod_indexfile_patch_connection(server *srv, connection *con, plugin_data *p) {
size_t i, j;
plugin_config *s = p->config_storage[0];
PATCH(indexfiles);
/* 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];
static void mod_indexfile_merge_config(plugin_config * const pconf, const config_plugin_value_t *cpv) {
do {
mod_indexfile_merge_config_cpv(pconf, cpv);
} while ((++cpv)->k_id != -1);
}
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("server.indexfiles"))) {
PATCH(indexfiles);
} else if (buffer_is_equal_string(&du->key, CONST_STR_LEN("index-file.names"))) {
PATCH(indexfiles);
}
}
}
static void mod_indexfile_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_indexfile_merge_config(&p->conf,p->cvlist+p->cvlist[i].v.u2[0]);
}
}
return 0;
SETDEFAULTS_FUNC(mod_indexfile_set_defaults) {
static const config_plugin_keys_t cpk[] = {
{ CONST_STR_LEN("index-file.names"),
T_CONFIG_ARRAY,
T_CONFIG_SCOPE_CONNECTION }
,{ CONST_STR_LEN("server.indexfiles"),
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_indexfile"))
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: /* index-file.names */
case 1: /* server.indexfiles */
if (!array_is_vlist(cpv->v.a)) {
log_error(srv->errh, __FILE__, __LINE__,
"unexpected value for %s; "
"expected list of \"file\"", 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_indexfile_merge_config(&p->defaults, cpv);
}
return HANDLER_GO_ON;
}
#undef PATCH
URIHANDLER_FUNC(mod_indexfile_subrequest) {
plugin_data *p = p_d;
size_t k;
stat_cache_entry *sce = NULL;
if (con->mode != DIRECT) return HANDLER_GO_ON;
if (buffer_is_empty(con->uri.path)) return HANDLER_GO_ON;
if (con->uri.path->ptr[buffer_string_length(con->uri.path) - 1] != '/') return HANDLER_GO_ON;
mod_indexfile_patch_connection(srv, con, p);
mod_indexfile_patch_config(con, p);
if (NULL == p->conf.indexfiles) return HANDLER_GO_ON;
if (con->conf.log_request_handling) {
log_error_write(srv, __FILE__, __LINE__, "s", "-- handling the request as Indexfile");
@ -160,39 +131,36 @@ URIHANDLER_FUNC(mod_indexfile_subrequest) {
}
/* indexfile */
for (k = 0; k < p->conf.indexfiles->used; k++) {
data_string *ds = (data_string *)p->conf.indexfiles->data[k];
buffer * const b = srv->tmp_buf;
for (uint32_t k = 0; k < p->conf.indexfiles->used; ++k) {
const data_string * const ds = (data_string *)p->conf.indexfiles->data[k];
if (ds->value.ptr[0] == '/') {
/* if the index-file starts with a prefix as use this file as
* index-generator */
buffer_copy_buffer(p->tmp_buf, con->physical.doc_root);
buffer_copy_buffer(b, con->physical.doc_root);
} else {
buffer_copy_buffer(p->tmp_buf, con->physical.path);
buffer_copy_buffer(b, con->physical.path);
}
buffer_append_string_buffer(p->tmp_buf, &ds->value);
buffer_append_string_buffer(b, &ds->value);
if (HANDLER_ERROR == stat_cache_get_entry(srv, con, p->tmp_buf, &sce)) {
stat_cache_entry *sce = NULL;
if (HANDLER_ERROR == stat_cache_get_entry(srv, con, b, &sce)) {
if (errno == EACCES) {
con->http_status = 403;
buffer_reset(con->physical.path);
return HANDLER_FINISHED;
}
if (errno != ENOENT &&
errno != ENOTDIR) {
/* we have no idea what happend. let's tell the user so. */
con->http_status = 500;
log_error_write(srv, __FILE__, __LINE__, "ssbsb",
"file not found ... or so: ", strerror(errno),
con->uri.path,
"->", con->physical.path);
buffer_reset(con->physical.path);
return HANDLER_FINISHED;
}
continue;
@ -207,8 +175,7 @@ URIHANDLER_FUNC(mod_indexfile_subrequest) {
buffer_append_string_buffer(con->uri.path, &ds->value);
}
buffer_copy_buffer(con->physical.path, p->tmp_buf);
buffer_copy_buffer(con->physical.path, b);
return HANDLER_GO_ON;
}
@ -216,7 +183,6 @@ URIHANDLER_FUNC(mod_indexfile_subrequest) {
return HANDLER_GO_ON;
}
/* this function is called at dlopen() time and inits the callbacks */
int mod_indexfile_plugin_init(plugin *p);
int mod_indexfile_plugin_init(plugin *p) {

4
tests/fastcgi-10.conf
View File

@ -17,7 +17,7 @@ server.modules = (
"mod_accesslog",
)
server.indexfiles = (
index-file.names = (
"index.php",
"index.html",
)
@ -62,6 +62,6 @@ $HTTP["host"] == "auth.example.org" {
$HTTP["host"] == "www.example.org" {
$HTTP["url"] == "/go/" {
server.indexfiles = ( "cgi.php" )
index-file.names = ( "cgi.php" )
}
}

2
tests/fastcgi-responder.conf
View File

@ -19,7 +19,7 @@ server.modules = (
"mod_accesslog",
)
server.indexfiles = (
index-file.names = (
"index.php",
"index.html",
)

2
tests/lighttpd.conf
View File

@ -30,7 +30,7 @@ server.modules = (
"mod_accesslog",
)
server.indexfiles = (
index-file.names = (
"index.html",
)

Write Preview
Loading…
Cancel
Save