|
|
|
/*
|
|
|
|
* http_auth - HTTP authentication and authorization
|
|
|
|
*
|
|
|
|
* Largely-rewritten from original
|
|
|
|
* Copyright(c) 2016,2021 Glenn Strauss gstrauss()gluelogic.com All rights reserved
|
|
|
|
* License: BSD 3-clause (same as lighttpd)
|
|
|
|
*/
|
|
|
|
#include "first.h"
|
|
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
#include "mod_auth_api.h"
|
|
|
|
#include "sys-crypto-md.h" /* USE_LIB_CRYPTO */
|
|
|
|
|
|
|
|
#include "base.h"
|
|
|
|
#include "ck.h"
|
|
|
|
#include "http_header.h"
|
|
|
|
#include "log.h"
|
|
|
|
#include "algo_splaytree.h"
|
|
|
|
#include "plugin.h"
|
|
|
|
#include "plugin_config.h"
|
|
|
|
|
|
|
|
/**
|
|
|
|
* auth framework
|
|
|
|
*/
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
splay_tree *sptree; /* data in nodes of tree are (http_auth_cache_entry *)*/
|
|
|
|
time_t max_age;
|
|
|
|
} http_auth_cache;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
const http_auth_backend_t *auth_backend;
|
|
|
|
const array *auth_require;
|
|
|
|
http_auth_cache *auth_cache;
|
|
|
|
unsigned int auth_extern_authn;
|
|
|
|
} plugin_config;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
PLUGIN_DATA;
|
|
|
|
plugin_config defaults;
|
|
|
|
plugin_config conf;
|
|
|
|
} plugin_data;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
const struct http_auth_require_t *require;
|
|
|
|
unix_time64_t ctime;
|
|
|
|
int dalgo;
|
|
|
|
uint32_t dlen;
|
|
|
|
uint32_t ulen;
|
|
|
|
char *username;
|
|
|
|
char *pwdigest;
|
|
|
|
} http_auth_cache_entry;
|
|
|
|
|
|
|
|
static http_auth_cache_entry *
|
|
|
|
http_auth_cache_entry_init (const struct http_auth_require_t * const require, const int dalgo, const char *username, const uint32_t ulen, const char *pw, const uint32_t pwlen)
|
|
|
|
{
|
|
|
|
/*(similar to buffer_copy_string_len() for each element,
|
|
|
|
* but allocate exact lengths in single chunk of memory
|
|
|
|
* for cache to avoid wasting space and for memory locality)*/
|
|
|
|
/* http_auth_require_t is stored instead of copying realm
|
|
|
|
*(store pointer to http_auth_require_t, which is persistent
|
|
|
|
* and will be different for each realm + permissions combo)*/
|
|
|
|
http_auth_cache_entry * const ae =
|
|
|
|
malloc(sizeof(http_auth_cache_entry) + ulen + pwlen);
|
|
|
|
force_assert(ae);
|
|
|
|
ae->require = require;
|
|
|
|
ae->ctime = log_monotonic_secs;
|
|
|
|
ae->dalgo = dalgo;
|
|
|
|
ae->ulen = ulen;
|
|
|
|
ae->dlen = pwlen;
|
|
|
|
ae->username = (char *)(ae + 1);
|
|
|
|
ae->pwdigest = ae->username + ulen;
|
|
|
|
memcpy(ae->username, username, ulen);
|
|
|
|
memcpy(ae->pwdigest, pw, pwlen);
|
|
|
|
return ae;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
http_auth_cache_entry_free (void *data)
|
|
|
|
{
|
|
|
|
http_auth_cache_entry * const ae = data;
|
|
|
|
ck_memzero(ae->pwdigest, ae->dlen);
|
|
|
|
free(ae);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
http_auth_cache_free (http_auth_cache *ac)
|
|
|
|
{
|
|
|
|
splay_tree *sptree = ac->sptree;
|
|
|
|
while (sptree) {
|
|
|
|
http_auth_cache_entry_free(sptree->data);
|
|
|
|
sptree = splaytree_delete(sptree, sptree->key);
|
|
|
|
}
|
|
|
|
free(ac);
|
|
|
|
}
|
|
|
|
|
|
|
|
static http_auth_cache *
|
|
|
|
http_auth_cache_init (const array *opts)
|
|
|
|
{
|
|
|
|
http_auth_cache *ac = malloc(sizeof(http_auth_cache));
|
|
|
|
force_assert(ac);
|
|
|
|
ac->sptree = NULL;
|
|
|
|
ac->max_age = 600; /* 10 mins */
|
|
|
|
for (uint32_t i = 0, used = opts->used; i < used; ++i) {
|
|
|
|
data_unset *du = opts->data[i];
|
|
|
|
if (buffer_is_equal_string(&du->key, CONST_STR_LEN("max-age")))
|
|
|
|
ac->max_age = (time_t)config_plugin_value_to_int32(du, ac->max_age);
|
|
|
|
}
|
|
|
|
return ac;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
http_auth_cache_hash (const struct http_auth_require_t * const require, const char *username, const uint32_t ulen)
|
|
|
|
{
|
|
|
|
uint32_t h = /*(hash pointer value, which includes realm and permissions)*/
|
|
|
|
djbhash((char *)(intptr_t)require, sizeof(intptr_t), DJBHASH_INIT);
|
|
|
|
h = djbhash(username, ulen, h);
|
|
|
|
/* strip highest bit of hash value for splaytree (see splaytree_djbhash())*/
|
|
|
|
return (int32_t)(h & ~(((uint32_t)1) << 31));
|
|
|
|
}
|
|
|
|
|
|
|
|
static http_auth_cache_entry *
|
|
|
|
http_auth_cache_query (splay_tree ** const sptree, const int ndx)
|
|
|
|
{
|
|
|
|
*sptree = splaytree_splay(*sptree, ndx);
|
|
|
|
return (*sptree && (*sptree)->key == ndx) ? (*sptree)->data : NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
http_auth_cache_insert (splay_tree ** const sptree, const int ndx, void * const data, void(data_free_fn)(void *))
|
|
|
|
{
|
|
|
|
/*(not necessary to re-splay (with current usage) since single-threaded
|
|
|
|
* and splaytree has not been modified since http_auth_cache_query())*/
|
|
|
|
/* *sptree = splaytree_splay(*sptree, ndx); */
|
|
|
|
if (NULL == *sptree || (*sptree)->key != ndx)
|
|
|
|
*sptree = splaytree_insert(*sptree, ndx, data);
|
|
|
|
else { /* collision; replace old entry */
|
|
|
|
data_free_fn((*sptree)->data);
|
|
|
|
(*sptree)->data = data;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* walk though cache, collect expired ids, and remove them in a second loop */
|
|
|
|
static void
|
|
|
|
mod_auth_tag_old_entries (splay_tree * const t, int * const keys, int * const ndx, const time_t max_age, const unix_time64_t cur_ts)
|
|
|
|
{
|
|
|
|
if (*ndx == 8192) return; /*(must match num array entries in keys[])*/
|
|
|
|
if (t->left)
|
|
|
|
mod_auth_tag_old_entries(t->left, keys, ndx, max_age, cur_ts);
|
|
|
|
if (t->right)
|
|
|
|
mod_auth_tag_old_entries(t->right, keys, ndx, max_age, cur_ts);
|
|
|
|
if (*ndx == 8192) return; /*(must match num array entries in keys[])*/
|
|
|
|
|
|
|
|
const http_auth_cache_entry * const ae = t->data;
|
|
|
|
if (cur_ts - ae->ctime > max_age)
|
|
|
|
keys[(*ndx)++] = t->key;
|
|
|
|
}
|
|
|
|
|
|
|
|
__attribute_noinline__
|
|
|
|
static void
|
|
|
|
mod_auth_periodic_cleanup(splay_tree **sptree_ptr, const time_t max_age, const unix_time64_t cur_ts)
|
|
|
|
{
|
|
|
|
splay_tree *sptree = *sptree_ptr;
|
|
|
|
int max_ndx, i;
|
|
|
|
int keys[8192]; /* 32k size on stack */
|
|
|
|
do {
|
|
|
|
if (!sptree) break;
|
|
|
|
max_ndx = 0;
|
|
|
|
mod_auth_tag_old_entries(sptree, keys, &max_ndx, max_age, cur_ts);
|
|
|
|
for (i = 0; i < max_ndx; ++i) {
|
|
|
|
int ndx = keys[i];
|
|
|
|
sptree = splaytree_splay(sptree, ndx);
|
|
|
|
if (sptree && sptree->key == ndx) {
|
|
|
|
http_auth_cache_entry_free(sptree->data);
|
|
|
|
sptree = splaytree_delete(sptree, ndx);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} while (max_ndx == sizeof(keys)/sizeof(int));
|
|
|
|
*sptree_ptr = sptree;
|
|
|
|
}
|
|
|
|
|
|
|
|
TRIGGER_FUNC(mod_auth_periodic)
|
|
|
|
{
|
|
|
|
const plugin_data * const p = p_d;
|
|
|
|
const unix_time64_t cur_ts = log_monotonic_secs;
|
|
|
|
if (cur_ts & 0x7) return HANDLER_GO_ON; /*(continue once each 8 sec)*/
|
|
|
|
UNUSED(srv);
|
|
|
|
|
|
|
|
/* future: might construct array of (http_auth_cache *) at startup
|
|
|
|
* to avoid the need to search for them here */
|
|
|
|
/* (init i to 0 if global context; to 1 to skip empty global context) */
|
|
|
|
if (NULL == p->cvlist) return HANDLER_GO_ON;
|
|
|
|
for (int i = !p->cvlist[0].v.u2[1], used = p->nconfig; i < used; ++i) {
|
|
|
|
const config_plugin_value_t *cpv = p->cvlist + p->cvlist[i].v.u2[0];
|
|
|
|
for (; cpv->k_id != -1; ++cpv) {
|
|
|
|
if (cpv->k_id != 3) continue; /* k_id == 3 for auth.cache */
|
|
|
|
if (cpv->vtype != T_CONFIG_LOCAL) continue;
|
|
|
|
http_auth_cache *ac = cpv->v.v;
|
|
|
|
mod_auth_periodic_cleanup(&ac->sptree, ac->max_age, cur_ts);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return HANDLER_GO_ON;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static handler_t mod_auth_check_basic(request_st *r, void *p_d, const struct http_auth_require_t *require, const struct http_auth_backend_t *backend);
|
|
|
|
static handler_t mod_auth_check_digest(request_st *r, void *p_d, const struct http_auth_require_t *require, const struct http_auth_backend_t *backend);
|
|
|
|
static handler_t mod_auth_check_extern(request_st *r, void *p_d, const struct http_auth_require_t *require, const struct http_auth_backend_t *backend);
|
|
|
|
|
|
|
|
INIT_FUNC(mod_auth_init) {
|
|
|
|
static http_auth_scheme_t http_auth_scheme_basic = { "basic", mod_auth_check_basic, NULL };
|
|
|
|
static http_auth_scheme_t http_auth_scheme_digest = { "digest", mod_auth_check_digest, NULL };
|
|
|
|
static const http_auth_scheme_t http_auth_scheme_extern = { "extern", mod_auth_check_extern, NULL };
|
|
|
|
plugin_data *p = calloc(1, sizeof(*p));
|
|
|
|
force_assert(p);
|
|
|
|
|
|
|
|
/* register http_auth_scheme_* */
|
|
|
|
http_auth_scheme_basic.p_d = p;
|
|
|
|
http_auth_scheme_set(&http_auth_scheme_basic);
|
|
|
|
http_auth_scheme_digest.p_d = p;
|
|
|
|
http_auth_scheme_set(&http_auth_scheme_digest);
|
|
|
|
http_auth_scheme_set(&http_auth_scheme_extern);
|
|
|
|
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
FREE_FUNC(mod_auth_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) {
|
|
|
|
if (cpv->vtype != T_CONFIG_LOCAL || NULL == cpv->v.v) continue;
|
|
|
|
switch (cpv->k_id) {
|
|
|
|
case 1: /* auth.require */
|
|
|
|
array_free(cpv->v.v);
|
|
|
|
break;
|
|
|
|
case 3: /* auth.cache */
|
|
|
|
http_auth_cache_free(cpv->v.v);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
http_auth_dumbdata_reset();
|
|
|
|
}
|
|
|
|
|
|
|
|
/* data type for mod_auth structured data
|
|
|
|
* (parsed from auth.require array of strings) */
|
|
|
|
typedef struct {
|
|
|
|
DATA_UNSET;
|
|
|
|
http_auth_require_t *require;
|
|
|
|
} data_auth;
|
|
|
|
|
|
|
|
static void data_auth_free(data_unset *d)
|
|
|
|
{
|
|
|
|
data_auth * const dauth = (data_auth *)d;
|
|
|
|
free(dauth->key.ptr);
|
|
|
|
http_auth_require_free(dauth->require);
|
|
|
|
free(dauth);
|
|
|
|
}
|
|
|
|
|
|
|
|
static data_auth *data_auth_init(void)
|
|
|
|
{
|
|
|
|
static const struct data_methods fn = {
|
|
|
|
NULL, /* copy must not be called on this data */
|
|
|
|
data_auth_free,
|
|
|
|
NULL, /* insert_dup must not be called on this data */
|
|
|
|
};
|
|
|
|
data_auth * const dauth = calloc(1, sizeof(*dauth));
|
|
|
|
force_assert(NULL != dauth);
|
|
|
|
dauth->type = TYPE_OTHER;
|
|
|
|
dauth->fn = &fn;
|
|
|
|
|
|
|
|
dauth->require = http_auth_require_init();
|
|
|
|
|
|
|
|
return dauth;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int mod_auth_algorithm_parse(http_auth_info_t *ai, const char *s, size_t len) {
|
|
|
|
if (0 == len) {
|
|
|
|
ai->dalgo = HTTP_AUTH_DIGEST_MD5;
|
|
|
|
ai->dlen = HTTP_AUTH_DIGEST_MD5_BINLEN;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (len > 5
|
|
|
|
&& (s[len-5] ) == '-'
|
|
|
|
&& (s[len-4] | 0x20) == 's'
|
|
|
|
&& (s[len-3] | 0x20) == 'e'
|
|
|
|
&& (s[len-2] | 0x20) == 's'
|
|
|
|
&& (s[len-1] | 0x20) == 's') {
|
|
|
|
ai->dalgo = HTTP_AUTH_DIGEST_SESS;
|
|
|
|
len -= 5;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
ai->dalgo = HTTP_AUTH_DIGEST_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (3 == len
|
|
|
|
&& 'm' == (s[0] | 0x20)
|
|
|
|
&& 'd' == (s[1] | 0x20)
|
|
|
|
&& '5' == (s[2] )) {
|
|
|
|
ai->dalgo |= HTTP_AUTH_DIGEST_MD5;
|
|
|
|
ai->dlen = HTTP_AUTH_DIGEST_MD5_BINLEN;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
#ifdef USE_LIB_CRYPTO
|
|
|
|
else if (len >= 7
|
|
|
|
&& 's' == (s[0] | 0x20)
|
|
|
|
&& 'h' == (s[1] | 0x20)
|
|
|
|
&& 'a' == (s[2] | 0x20)
|
|
|
|
&& '-' == (s[3] )) {
|
|
|
|
if (len == 7 && s[4] == '2' && s[5] == '5' && s[6] == '6') {
|
|
|
|
ai->dalgo |= HTTP_AUTH_DIGEST_SHA256;
|
|
|
|
ai->dlen = HTTP_AUTH_DIGEST_SHA256_BINLEN;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
#ifdef USE_LIB_CRYPTO_SHA512_256
|
|
|
|
if (len == 11 && 0 == memcmp(s+4, "512-256", 7)) {
|
|
|
|
ai->dalgo |= HTTP_AUTH_DIGEST_SHA512_256;
|
|
|
|
ai->dlen = HTTP_AUTH_DIGEST_SHA512_256_BINLEN;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
return 0; /*(error)*/
|
|
|
|
}
|
|
|
|
|
|
|
|
static int mod_auth_algorithms_parse(int *algorithm, buffer *algos) {
|
|
|
|
for (const char *s = algos->ptr, *p; s; s = p ? p+1 : NULL) {
|
|
|
|
http_auth_info_t ai;
|
|
|
|
p = strchr(s, '|');
|
|
|
|
if (!mod_auth_algorithm_parse(&ai, s, p ? (size_t)(p - s) : strlen(s)))
|
|
|
|
return 0;
|
|
|
|
*algorithm |= ai.dalgo;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int mod_auth_require_parse (http_auth_require_t * const require, const buffer *b, log_error_st *errh)
|
|
|
|
{
|
|
|
|
/* user=name1|user=name2|group=name3|host=name4 */
|
|
|
|
|
|
|
|
const char *str = b->ptr;
|
|
|
|
const char *p;
|
|
|
|
|
|
|
|
if (buffer_is_equal_string(b, CONST_STR_LEN("valid-user"))) {
|
|
|
|
require->valid_user = 1;
|
|
|
|
return 1; /* success */
|
|
|
|
}
|
|
|
|
|
|
|
|
do {
|
|
|
|
const char *eq;
|
|
|
|
size_t len;
|
|
|
|
p = strchr(str, '|');
|
|
|
|
len = NULL != p ? (size_t)(p - str) : strlen(str);
|
|
|
|
eq = memchr(str, '=', len);
|
|
|
|
if (NULL == eq) {
|
|
|
|
log_error(errh, __FILE__, __LINE__,
|
|
|
|
"error parsing auth.require 'require' field: missing '=' "
|
|
|
|
"(expecting \"valid-user\" or \"user=a|user=b|group=g|host=h\"). "
|
|
|
|
"error value: %s error near: %s", b->ptr, str);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (eq[1] == '|' || eq[1] == '\0') {
|
|
|
|
log_error(errh, __FILE__, __LINE__,
|
|
|
|
"error parsing auth.require 'require' field: "
|
|
|
|
"missing token after '=' "
|
|
|
|
"(expecting \"valid-user\" or \"user=a|user=b|group=g|host=h\"). "
|
|
|
|
"error value: %s error near: %s", b->ptr, str);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch ((int)(eq - str)) {
|
|
|
|
case 4:
|
|
|
|
if (0 == memcmp(str, CONST_STR_LEN("user"))) {
|
|
|
|
/*("user=" is 5)*/
|
|
|
|
array_set_key_value(&require->user, str+5, len-5, CONST_STR_LEN(""));
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
else if (0 == memcmp(str, CONST_STR_LEN("host"))) {
|
|
|
|
/*("host=" is 5)*/
|
|
|
|
array_set_key_value(&require->host, str+5, len-5, CONST_STR_LEN(""));
|
|
|
|
log_error(errh, __FILE__, __LINE__,
|
|
|
|
"warning parsing auth.require 'require' field: "
|
|
|
|
"'host' not implemented; field value: %s", b->ptr);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
break; /* to error */
|
|
|
|
case 5:
|
|
|
|
if (0 == memcmp(str, CONST_STR_LEN("group"))) {
|
|
|
|
/*("group=" is 6)*/
|
|
|
|
array_set_key_value(&require->group, str+6, len-6, CONST_STR_LEN(""));
|
|
|
|
#if 0/*(supported by mod_authn_ldap, but not all other backends)*/
|
|
|
|
log_error(errh, __FILE__, __LINE__,
|
|
|
|
"warning parsing auth.require 'require' field: "
|
|
|
|
"'group' not implemented; field value: %s", b->ptr);
|
|
|
|
#endif
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
break; /* to error */
|
|
|
|
case 10:
|
|
|
|
if (0 == memcmp(str, CONST_STR_LEN("valid-user"))) {
|
|
|
|
log_error(errh, __FILE__, __LINE__,
|
|
|
|
"error parsing auth.require 'require' field: "
|
|
|
|
"valid user can not be combined with other require rules "
|
|
|
|
"(expecting \"valid-user\" or "
|
|
|
|
"\"user=a|user=b|group=g|host=h\"). error value: %s", b->ptr);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
break; /* to error */
|
|
|
|
default:
|
|
|
|
break; /* to error */
|
|
|
|
}
|
|
|
|
|
|
|
|
log_error(errh, __FILE__, __LINE__,
|
|
|
|
"error parsing auth.require 'require' field: "
|
|
|
|
"invalid/unsupported token "
|
|
|
|
"(expecting \"valid-user\" or \"user=a|user=b|group=g|host=h\"). "
|
|
|
|
"error value: %s error near: %s", b->ptr, str);
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
} while (p && *((str = p+1)));
|
|
|
|
|
|
|
|
return 1; /* success */
|
|
|
|
}
|
|
|
|
|
|
|
|
static handler_t mod_auth_require_parse_array(const array *value, array * const auth_require, log_error_st *errh)
|
|
|
|
{
|
|
|
|
for (uint32_t n = 0; n < value->used; ++n) {
|
|
|
|
size_t m;
|
|
|
|
data_array *da_file = (data_array *)value->data[n];
|
|
|
|
const buffer *method = NULL, *realm = NULL, *require = NULL;
|
|
|
|
const buffer *nonce_secret = NULL;
|
|
|
|
const http_auth_scheme_t *auth_scheme;
|
|
|
|
buffer *algos = NULL;
|
|
|
|
int algorithm = HTTP_AUTH_DIGEST_SESS;
|
|
|
|
|
|
|
|
if (!array_is_kvstring(&da_file->value)) {
|
|
|
|
log_error(errh, __FILE__, __LINE__,
|
|
|
|
"unexpected value for auth.require; expected "
|
|
|
|
"auth.require = ( \"urlpath\" => ( \"option\" => \"value\" ) )");
|
|
|
|
|
|
|
|
return HANDLER_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (m = 0; m < da_file->value.used; m++) {
|
|
|
|
if (da_file->value.data[m]->type == TYPE_STRING) {
|
|
|
|
data_string *ds = (data_string *)da_file->value.data[m];
|
|
|
|
if (buffer_is_equal_string(&ds->key, CONST_STR_LEN("method"))) {
|
|
|
|
method = &ds->value;
|
|
|
|
} else if (buffer_is_equal_string(&ds->key, CONST_STR_LEN("realm"))) {
|
|
|
|
realm = &ds->value;
|
|
|
|
} else if (buffer_is_equal_string(&ds->key, CONST_STR_LEN("require"))) {
|
|
|
|
require = &ds->value;
|
|
|
|
} else if (buffer_is_equal_string(&ds->key, CONST_STR_LEN("algorithm"))) {
|
|
|
|
algos = &ds->value;
|
|
|
|
} else if (buffer_is_equal_string(&ds->key, CONST_STR_LEN("nonce_secret"))
|
|
|
|
|| buffer_is_equal_string(&ds->key, CONST_STR_LEN("nonce-secret"))) {
|
|
|
|
nonce_secret = &ds->value;
|
|
|
|
} else {
|
|
|
|
log_error(errh, __FILE__, __LINE__,
|
|
|
|
"the field is unknown in: "
|
|
|
|
"auth.require = ( \"...\" => ( ..., -> \"%s\" <- => \"...\" ) )",
|
|
|
|
da_file->value.data[m]->key.ptr);
|
|
|
|
|
|
|
|
return HANDLER_ERROR;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
log_error(errh, __FILE__, __LINE__,
|
|
|
|
"a string was expected for: "
|
|
|
|
"auth.require = ( \"...\" => ( ..., -> \"%s\" <- => \"...\" ) )",
|
|
|
|
da_file->value.data[m]->key.ptr);
|
|
|
|
|
|
|
|
return HANDLER_ERROR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
[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
1 year ago
|
|
|
if (!method || buffer_is_blank(method)) {
|
|
|
|
log_error(errh, __FILE__, __LINE__,
|
|
|
|
"the method field is missing or blank in: "
|
|
|
|
"auth.require = ( \"...\" => ( ..., \"method\" => \"...\" ) )");
|
|
|
|
return HANDLER_ERROR;
|
|
|
|
} else {
|
|
|
|
auth_scheme = http_auth_scheme_get(method);
|
|
|
|
if (NULL == auth_scheme) {
|
|
|
|
log_error(errh, __FILE__, __LINE__,
|
|
|
|
"unknown method %s (e.g. \"basic\", \"digest\" or \"extern\") in "
|
|
|
|
"auth.require = ( \"...\" => ( ..., \"method\" => \"...\") )", method->ptr);
|
|
|
|
return HANDLER_ERROR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
[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
1 year ago
|
|
|
if (!realm) {
|
|
|
|
log_error(errh, __FILE__, __LINE__,
|
|
|
|
"the realm field is missing in: "
|
|
|
|
"auth.require = ( \"...\" => ( ..., \"realm\" => \"...\" ) )");
|
|
|
|
return HANDLER_ERROR;
|
|
|
|
}
|
|
|
|
|
[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
1 year ago
|
|
|
if (!require || buffer_is_blank(require)) {
|
|
|
|
log_error(errh, __FILE__, __LINE__,
|
|
|
|
"the require field is missing or blank in: "
|
|
|
|
"auth.require = ( \"...\" => ( ..., \"require\" => \"...\" ) )");
|
|
|
|
return HANDLER_ERROR;
|
|
|
|
}
|
|
|
|
|
[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
1 year ago
|
|
|
if (!algos || buffer_is_blank(algos)) {
|
|
|
|
algorithm |= HTTP_AUTH_DIGEST_MD5;
|
|
|
|
} else if (!mod_auth_algorithms_parse(&algorithm, algos)) {
|
|
|
|
log_error(errh, __FILE__, __LINE__,
|
|
|
|
"invalid algorithm in: "
|
|
|
|
"auth.require = ( \"...\" => ( ..., \"algorithm\" => \"...\" ) )");
|
|
|
|
return HANDLER_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (require) { /*(always true at this point)*/
|
|
|
|
data_auth * const dauth = data_auth_init();
|
|
|
|
buffer_copy_buffer(&dauth->key, &da_file->key);
|
|
|
|
dauth->require->scheme = auth_scheme;
|
|
|
|
dauth->require->algorithm = algorithm;
|
|
|
|
dauth->require->realm = realm;
|
|
|
|
dauth->require->nonce_secret = nonce_secret; /*(NULL is ok)*/
|
|
|
|
if (!mod_auth_require_parse(dauth->require, require, errh)) {
|
|
|
|
dauth->fn->free((data_unset *)dauth);
|
|
|
|
return HANDLER_ERROR;
|
|
|
|
}
|
|
|
|
array_insert_unique(auth_require, (data_unset *)dauth);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return HANDLER_GO_ON;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void mod_auth_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: /* auth.backend */
|
|
|
|
if (cpv->vtype == T_CONFIG_LOCAL)
|
|
|
|
pconf->auth_backend = cpv->v.v;
|
|
|
|
break;
|
|
|
|
case 1: /* auth.require */
|
|
|
|
if (cpv->vtype == T_CONFIG_LOCAL)
|
|
|
|
pconf->auth_require = cpv->v.v;
|
|
|
|
break;
|
|
|
|
case 2: /* auth.extern-authn */
|
|
|
|
pconf->auth_extern_authn = cpv->v.u;
|
|
|
|
break;
|
|
|
|
case 3: /* auth.cache */
|
|
|
|
if (cpv->vtype == T_CONFIG_LOCAL)
|
|
|
|
pconf->auth_cache = cpv->v.v;
|
|
|
|
break;
|
|
|
|
default:/* should not happen */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void mod_auth_merge_config(plugin_config * const pconf, const config_plugin_value_t *cpv) {
|
|
|
|
do {
|
|
|
|
mod_auth_merge_config_cpv(pconf, cpv);
|
|
|
|
} while ((++cpv)->k_id != -1);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void mod_auth_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_auth_merge_config(&p->conf, p->cvlist + p->cvlist[i].v.u2[0]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
SETDEFAULTS_FUNC(mod_auth_set_defaults) {
|
|
|
|
static const config_plugin_keys_t cpk[] = {
|
|
|
|
{ CONST_STR_LEN("auth.backend"),
|
|
|
|
T_CONFIG_STRING,
|
|
|
|
T_CONFIG_SCOPE_CONNECTION }
|
|
|
|
,{ CONST_STR_LEN("auth.require"),
|
|
|
|
T_CONFIG_ARRAY_KVARRAY,
|
|
|
|
T_CONFIG_SCOPE_CONNECTION }
|
|
|
|
,{ CONST_STR_LEN("auth.extern-authn"),
|
|
|
|
T_CONFIG_BOOL,
|
|
|
|
T_CONFIG_SCOPE_CONNECTION }
|
|
|
|
,{ CONST_STR_LEN("auth.cache"),
|
|
|
|
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_auth"))
|
|
|
|
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: /* auth.backend */
|
[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
1 year ago
|
|
|
if (!buffer_is_blank(cpv->v.b)) {
|
|
|
|
const http_auth_backend_t * const auth_backend =
|
|
|
|
http_auth_backend_get(cpv->v.b);
|
|
|
|
if (NULL == auth_backend) {
|
|
|
|
log_error(srv->errh, __FILE__, __LINE__,
|
|
|
|
"auth.backend not supported: %s", cpv->v.b->ptr);
|
|
|
|
return HANDLER_ERROR;
|
|
|
|
}
|
|
|
|
*(const http_auth_backend_t **)&cpv->v.v = auth_backend;
|
|
|
|
cpv->vtype = T_CONFIG_LOCAL;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 1: /* auth.require */
|
|
|
|
{
|
|
|
|
array * const a = array_init(4);
|
|
|
|
if (HANDLER_GO_ON !=
|
|
|
|
mod_auth_require_parse_array(cpv->v.a, a, srv->errh)) {
|
|
|
|
array_free(a);
|
|
|
|
return HANDLER_ERROR;
|
|
|
|
}
|
|
|
|
cpv->v.a = a;
|
|
|
|
cpv->vtype = T_CONFIG_LOCAL;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 2: /* auth.extern-authn */
|
|
|
|
break;
|
|
|
|
case 3: /* auth.cache */
|
|
|
|
cpv->v.v = http_auth_cache_init(cpv->v.a);
|
|
|
|
cpv->vtype = T_CONFIG_LOCAL;
|
|
|
|
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_auth_merge_config(&p->defaults, cpv);
|
|
|
|
}
|
|
|
|
|
|
|
|
return HANDLER_GO_ON;
|
|
|
|
}
|
|
|
|
|
|
|
|
static handler_t mod_auth_uri_handler(request_st * const r, void *p_d) {
|
|
|
|
plugin_data *p |