lighttpd 1.4.x https://www.lighttpd.net/
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

217 lines
6.9 KiB

#include "first.h"
#include "base.h"
#include "keyvalue.h"
#include "log.h"
#include "buffer.h"
#include "burl.h"
#include "http_header.h"
#include "plugin.h"
#include <stdlib.h>
#include <string.h>
typedef struct {
pcre_keyvalue_buffer *redirect;
int redirect_code;
} plugin_config;
typedef struct {
PLUGIN_DATA;
plugin_config defaults;
plugin_config conf;
} plugin_data;
INIT_FUNC(mod_redirect_init) {
return calloc(1, sizeof(plugin_data));
}
FREE_FUNC(mod_redirect_free) {
plugin_data * const p = p_d;
if (NULL == p->cvlist) return;
/* (init i to 0 if global context; to 1 to skip empty global context) */
for (int i = !p->cvlist[0].v.u2[1], used = p->nconfig; i < used; ++i) {
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: /* url.redirect */
if (cpv->vtype == T_CONFIG_LOCAL)
pcre_keyvalue_buffer_free(cpv->v.v);
break;
default:
break;
}
}
}
}
static void mod_redirect_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: /* url.redirect */
if (cpv->vtype == T_CONFIG_LOCAL)
pconf->redirect = cpv->v.v;
break;
case 1: /* url.redirect-code */
pconf->redirect_code = cpv->v.shrt;
break;
default:/* should not happen */
return;
}
}
static void mod_redirect_merge_config(plugin_config * const pconf, const config_plugin_value_t *cpv) {
do {
mod_redirect_merge_config_cpv(pconf, cpv);
} while ((++cpv)->k_id != -1);
}
static void mod_redirect_patch_config(request_st * const r, plugin_data * const p) {
p->conf = p->defaults; /* copy small struct instead of memcpy() */
/*memcpy(&p->conf, &p->defaults, sizeof(plugin_config));*/
for (int i = 1, used = p->nconfig; i < used; ++i) {
if (config_check_cond(r, (uint32_t)p->cvlist[i].k_id))
mod_redirect_merge_config(&p->conf, p->cvlist+p->cvlist[i].v.u2[0]);
}
}
static pcre_keyvalue_buffer * mod_redirect_parse_list(server *srv, const array *a, const int condidx) {
const int pcre_jit = config_feature_bool(srv, "server.pcre_jit", 1);
pcre_keyvalue_buffer * const kvb = pcre_keyvalue_buffer_init();
kvb->cfgidx = condidx;
buffer * const tb = srv->tmp_buf;
int percent = 0;
for (uint32_t j = 0; j < a->used; ++j) {
data_string *ds = (data_string *)a->data[j];
if (srv->srvconf.http_url_normalize) {
pcre_keyvalue_burl_normalize_key(&ds->key, tb);
pcre_keyvalue_burl_normalize_value(&ds->value, tb);
}
for (const char *s = ds->value.ptr; (s = strchr(s, '%')); ++s) {
if (s[1] == '%')
++s;
else if (light_isdigit(s[1]) || s[1] == '{') {
percent |= 1;
break;
}
}
if (!pcre_keyvalue_buffer_append(srv->errh, kvb, &ds->key, &ds->value,
pcre_jit)) {
log_error(srv->errh, __FILE__, __LINE__,
"pcre-compile failed for %s", ds->key.ptr);
pcre_keyvalue_buffer_free(kvb);
return NULL;
}
}
if (percent)
kvb->x0 = config_capture(srv, condidx);
return kvb;
}
SETDEFAULTS_FUNC(mod_redirect_set_defaults) {
static const config_plugin_keys_t cpk[] = {
{ CONST_STR_LEN("url.redirect"),
T_CONFIG_ARRAY_KVSTRING,
T_CONFIG_SCOPE_CONNECTION }
,{ CONST_STR_LEN("url.redirect-code"),
T_CONFIG_SHORT,
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_redirect"))
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) {
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: /* url.redirect */
cpv->v.v =
mod_redirect_parse_list(srv, cpv->v.a, p->cvlist[i].k_id);
if (NULL == cpv->v.v) return HANDLER_ERROR;
cpv->vtype = T_CONFIG_LOCAL;
break;
case 1: /* url.redirect-code */
if (cpv->v.shrt < 100 || cpv->v.shrt >= 1000) cpv->v.shrt = 301;
break;
default:/* should not happen */
break;
}
}
}
p->defaults.redirect_code = 301;
/* 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_redirect_merge_config(&p->defaults, cpv);
}
return HANDLER_GO_ON;
}
URIHANDLER_FUNC(mod_redirect_uri_handler) {
plugin_data * const p = p_d;
struct burl_parts_t burl;
pcre_keyvalue_ctx ctx;
handler_t rc;
mod_redirect_patch_config(r, p);
if (!p->conf.redirect || !p->conf.redirect->used) return HANDLER_GO_ON;
ctx.cache = NULL;
if (p->conf.redirect->x0) { /*(p->conf.redirect->x0 is capture_idx)*/
ctx.cache = r->cond_match[p->conf.redirect->x0 - 1];
}
ctx.burl = &burl;
burl.scheme = &r->uri.scheme;
burl.authority = &r->uri.authority;
burl.port = sock_addr_get_port(&r->con->srv_socket->addr);
burl.path = &r->target; /*(uri-encoded and includes query-part)*/
burl.query = &r->uri.query;
[multiple] reduce redundant NULL buffer checks This commit is a large set of code changes and results in removal of hundreds, perhaps thousands, of CPU instructions, a portion of which are on hot code paths. Most (buffer *) used by lighttpd are not NULL, especially since buffers were inlined into numerous larger structs such as request_st and chunk. In the small number of instances where that is not the case, a NULL check is often performed earlier in a function where that buffer is later used with a buffer_* func. In the handful of cases that remained, a NULL check was added, e.g. with r->http_host and r->conf.server_tag. - check for empty strings at config time and set value to NULL if blank string will be ignored at runtime; at runtime, simple pointer check for NULL can be used to check for a value that has been set and is not blank ("") - use buffer_is_blank() instead of buffer_string_is_empty(), and use buffer_is_unset() instead of buffer_is_empty(), where buffer is known not to be NULL so that NULL check can be skipped - use buffer_clen() instead of buffer_string_length() when buffer is known not to be NULL (to avoid NULL check at runtime) - use buffer_truncate() instead of buffer_string_set_length() to truncate string, and use buffer_extend() to extend Examples where buffer known not to be NULL: - cpv->v.b from config_plugin_values_init is not NULL if T_CONFIG_BOOL (though we might set it to NULL if buffer_is_blank(cpv->v.b)) - address of buffer is arg (&foo) (compiler optimizer detects this in most, but not all, cases) - buffer is checked for NULL earlier in func - buffer is accessed in same scope without a NULL check (e.g. b->ptr) internal behavior change: callers must not pass a NULL buffer to some funcs. - buffer_init_buffer() requires non-null args - buffer_copy_buffer() requires non-null args - buffer_append_string_buffer() requires non-null args - buffer_string_space() requires non-null arg
6 months ago
if (buffer_is_blank(burl.authority))
burl.authority = r->server_name;
/* redirect URL on match
* e.g. redirect /base/ to /index.php?section=base
*/
buffer * const tb = r->tmp_buf;
rc = pcre_keyvalue_buffer_process(p->conf.redirect, &ctx,
&r->target, tb);
if (HANDLER_FINISHED == rc) {
http_header_response_set(r, HTTP_HEADER_LOCATION,
CONST_STR_LEN("Location"),
[multiple] reduce redundant NULL buffer checks This commit is a large set of code changes and results in removal of hundreds, perhaps thousands, of CPU instructions, a portion of which are on hot code paths. Most (buffer *) used by lighttpd are not NULL, especially since buffers were inlined into numerous larger structs such as request_st and chunk. In the small number of instances where that is not the case, a NULL check is often performed earlier in a function where that buffer is later used with a buffer_* func. In the handful of cases that remained, a NULL check was added, e.g. with r->http_host and r->conf.server_tag. - check for empty strings at config time and set value to NULL if blank string will be ignored at runtime; at runtime, simple pointer check for NULL can be used to check for a value that has been set and is not blank ("") - use buffer_is_blank() instead of buffer_string_is_empty(), and use buffer_is_unset() instead of buffer_is_empty(), where buffer is known not to be NULL so that NULL check can be skipped - use buffer_clen() instead of buffer_string_length() when buffer is known not to be NULL (to avoid NULL check at runtime) - use buffer_truncate() instead of buffer_string_set_length() to truncate string, and use buffer_extend() to extend Examples where buffer known not to be NULL: - cpv->v.b from config_plugin_values_init is not NULL if T_CONFIG_BOOL (though we might set it to NULL if buffer_is_blank(cpv->v.b)) - address of buffer is arg (&foo) (compiler optimizer detects this in most, but not all, cases) - buffer is checked for NULL earlier in func - buffer is accessed in same scope without a NULL check (e.g. b->ptr) internal behavior change: callers must not pass a NULL buffer to some funcs. - buffer_init_buffer() requires non-null args - buffer_copy_buffer() requires non-null args - buffer_append_string_buffer() requires non-null args - buffer_string_space() requires non-null arg
6 months ago
BUF_PTR_LEN(tb));
r->http_status = p->conf.redirect_code;
r->handler_module = NULL;
r->resp_body_finished = 1;
}
else if (HANDLER_ERROR == rc) {
log_error(r->conf.errh, __FILE__, __LINE__,
"pcre_exec() error while processing uri: %s",
r->target.ptr);
}
return rc;
}
int mod_redirect_plugin_init(plugin *p);
int mod_redirect_plugin_init(plugin *p) {
p->version = LIGHTTPD_VERSION_ID;
p->name = "redirect";
p->init = mod_redirect_init;
p->handle_uri_clean = mod_redirect_uri_handler;
p->set_defaults = mod_redirect_set_defaults;
p->cleanup = mod_redirect_free;
return 0;
}