#include <errno.h>
#include <ctype.h>
#include <regex.h>
+#include <limits.h>
+#include <sys/wait.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
#define PAT_METHOD 2
#define PAT_HEADER 3
#define PAT_ALL 4
-#define PAT_DEFAULT 5
#define PATFL_MSS 1
+#define PATFL_UNQ 2
+
+#define HND_CHILD 1
+#define HND_REPARSE 2
struct config {
struct child *children;
regex_t *pattern;
};
+struct headmod {
+ struct headmod *next;
+ char *name, *value;
+};
+
struct pattern {
struct pattern *next;
+ struct headmod *headers;
char *childnm;
struct rule **rules;
char *restpat;
+ int handler, prio, disable;
};
static struct config *gconfig, *lconfig;
static void freepattern(struct pattern *pat)
{
struct rule **rule;
+ struct headmod *head;
for(rule = pat->rules; *rule; rule++) {
if((*rule)->header != NULL)
}
free(*rule);
}
+ while((head = pat->headers) != NULL) {
+ pat->headers = head->next;
+ free(head->name);
+ free(head->value);
+ free(head);
+ }
if(pat->childnm != NULL)
free(pat->childnm);
free(pat);
struct pattern *pat;
int sl;
struct rule *rule;
+ struct headmod *head;
regex_t *regex;
int rxfl;
flog(LOG_WARNING, "%s:%i: missing pattern for `%s' match", s->file, s->lno, s->argv[0]);
continue;
}
+ rxfl = 0;
if(s->argc >= 3) {
if(strchr(s->argv[2], 'i'))
rxfl |= REG_ICASE;
if(s->argc >= 3) {
if(strchr(s->argv[2], 's'))
rule->fl |= PATFL_MSS;
+ if(strchr(s->argv[2], 'q'))
+ rule->fl |= PATFL_UNQ;
}
} else if(!strcmp(s->argv[0], "header")) {
if(s->argc < 3) {
flog(LOG_WARNING, "%s:%i: missing header name or pattern for `header' match", s->file, s->lno);
continue;
}
+ rxfl = 0;
if(s->argc >= 4) {
if(strchr(s->argv[3], 'i'))
rxfl |= REG_ICASE;
} else if(!strcmp(s->argv[0], "all")) {
newrule(pat)->type = PAT_ALL;
} else if(!strcmp(s->argv[0], "default")) {
- newrule(pat)->type = PAT_DEFAULT;
+ newrule(pat)->type = PAT_ALL;
+ pat->prio = -10;
+ } else if(!strcmp(s->argv[0], "order") || !strcmp(s->argv[0], "priority")) {
+ if(s->argc < 2) {
+ flog(LOG_WARNING, "%s:%i: missing specification for `%s' directive", s->file, s->lno, s->argv[0]);
+ continue;
+ }
+ pat->prio = atoi(s->argv[1]);
} else if(!strcmp(s->argv[0], "handler")) {
if(s->argc < 2) {
flog(LOG_WARNING, "%s:%i: missing child name for `handler' directive", s->file, s->lno);
if(pat->childnm != NULL)
free(pat->childnm);
pat->childnm = sstrdup(s->argv[1]);
+ pat->handler = HND_CHILD;
+ } else if(!strcmp(s->argv[0], "reparse")) {
+ pat->handler = HND_REPARSE;
} else if(!strcmp(s->argv[0], "restpat")) {
if(s->argc < 2) {
flog(LOG_WARNING, "%s:%i: missing pattern for `restpat' directive", s->file, s->lno);
if(pat->restpat != NULL)
free(pat->restpat);
pat->restpat = sstrdup(s->argv[1]);
+ } else if(!strcmp(s->argv[0], "set") || !strcmp(s->argv[0], "xset")) {
+ if(s->argc < 3) {
+ flog(LOG_WARNING, "%s:%i: missing header name or pattern for `%s' directive", s->file, s->lno, s->argv[0]);
+ continue;
+ }
+ omalloc(head);
+ if(!strcmp(s->argv[0], "xset"))
+ head->name = sprintf2("X-Ash-%s", s->argv[1]);
+ else
+ head->name = sstrdup(s->argv[1]);
+ head->value = sstrdup(s->argv[2]);
+ head->next = pat->headers;
+ pat->headers = head;
} else if(!strcmp(s->argv[0], "end") || !strcmp(s->argv[0], "eof")) {
break;
} else {
freepattern(pat);
return(NULL);
}
- if(pat->childnm == NULL) {
+ if(pat->handler == 0) {
flog(LOG_WARNING, "%s:%i: missing handler in match declaration", s->file, sl);
freepattern(pat);
return(NULL);
buffree(buf);
}
-static char *findmatch(struct config *cf, struct hthead *req, int trydefault)
+static void qoffsets(char *buf, int *obuf, char *pstr, int unquote)
+{
+ int i, o, d1, d2;
+
+ if(unquote) {
+ i = o = 0;
+ while(pstr[i]) {
+ obuf[o] = i;
+ if((pstr[i] == '%') && ((d1 = hexdigit(pstr[i + 1])) >= 0) && ((d2 = hexdigit(pstr[i + 2])) >= 0)) {
+ buf[o] = (d1 << 4) | d2;
+ i += 3;
+ } else {
+ buf[o] = pstr[i];
+ i++;
+ }
+ o++;
+ }
+ buf[o] = 0;
+ obuf[o] = i;
+ } else {
+ for(i = 0; pstr[i]; i++) {
+ buf[i] = pstr[i];
+ obuf[i] = i;
+ }
+ buf[i] = 0;
+ obuf[i] = i;
+ }
+}
+
+struct match {
+ struct pattern *pat;
+ char **mstr;
+ int rmo;
+};
+
+static void freematch(struct match *match)
+{
+ freeca(match->mstr);
+ free(match);
+}
+
+static struct match *findmatch(struct config *cf, struct hthead *req, struct match *match)
{
int i, o;
struct pattern *pat;
struct rule *rule;
- int rmo, matched;
+ int rmo;
+ regex_t *rx;
char *pstr;
char **mstr;
regmatch_t gr[10];
mstr = NULL;
for(pat = cf->patterns; pat != NULL; pat = pat->next) {
+ if(pat->disable || (match && (pat->prio <= match->pat->prio)))
+ continue;
rmo = -1;
for(i = 0; (rule = pat->rules[i]) != NULL; i++) {
- matched = 0;
+ rx = NULL;
if(rule->type == PAT_REST) {
- if((matched = !regexec(rule->pattern, pstr = req->rest, 10, gr, 0)))
- rmo = gr[0].rm_eo;
- else
- break;
+ rx = rule->pattern;
+ pstr = req->rest;
} else if(rule->type == PAT_URL) {
- if(!(matched = !regexec(rule->pattern, pstr = req->url, 10, gr, 0)))
- break;
+ rx = rule->pattern;
+ pstr = req->url;
} else if(rule->type == PAT_METHOD) {
- if(!(matched = !regexec(rule->pattern, pstr = req->method, 10, gr, 0)))
- break;
+ rx = rule->pattern;
+ pstr = req->method;
} else if(rule->type == PAT_HEADER) {
+ rx = rule->pattern;
if(!(pstr = getheader(req, rule->header)))
break;
- if(!(matched = !regexec(rule->pattern, pstr, 10, gr, 0)))
- break;
- } else if(rule->type == PAT_ALL) {
- } else if(rule->type == PAT_DEFAULT) {
- if(!trydefault)
- break;
}
- if(matched && (rule->fl & PATFL_MSS)) {
- if(mstr) {
- flog(LOG_WARNING, "two pattern rules marked with `s' flag found (for handler %s)", pat->childnm);
- freeca(mstr);
- }
- for(o = 0; o < 10; o++) {
- if(gr[o].rm_so < 0)
- break;
- }
- mstr = szmalloc((o + 1) * sizeof(*mstr));
- for(o = 0; o < 10; o++) {
- if(gr[o].rm_so < 0)
- break;
- mstr[o] = smalloc(gr[o].rm_eo - gr[o].rm_so + 1);
- memcpy(mstr[o], pstr + gr[o].rm_so, gr[o].rm_eo - gr[o].rm_so);
- mstr[o][gr[o].rm_eo - gr[o].rm_so] = 0;
+ if(rx != NULL) {
+ char pbuf[strlen(pstr) + 1];
+ int obuf[strlen(pstr) + 1];
+ qoffsets(pbuf, obuf, pstr, !!(rule->fl & PATFL_UNQ));
+ if(regexec(rx, pbuf, 10, gr, 0))
+ break;
+ else if(rule->type == PAT_REST)
+ rmo = obuf[gr[0].rm_eo];
+ if(rule->fl & PATFL_MSS) {
+ if(mstr) {
+ flog(LOG_WARNING, "two pattern rules marked with `s' flag found (for handler %s)", pat->childnm);
+ freeca(mstr);
+ }
+ for(o = 0; o < 10; o++) {
+ if(gr[o].rm_so < 0)
+ break;
+ }
+ mstr = szmalloc((o + 1) * sizeof(*mstr));
+ for(o = 0; o < 10; o++) {
+ if(gr[o].rm_so < 0)
+ break;
+ mstr[o] = smalloc(obuf[gr[o].rm_eo] - obuf[gr[o].rm_so] + 1);
+ memcpy(mstr[o], pstr + obuf[gr[o].rm_so], obuf[gr[o].rm_eo] - obuf[gr[o].rm_so]);
+ mstr[o][obuf[gr[o].rm_eo] - obuf[gr[o].rm_so]] = 0;
+ }
}
+ } else if(rule->type == PAT_ALL) {
}
}
if(!rule) {
- if(pat->restpat) {
- exprestpat(req, pat, mstr);
- } else if(rmo != -1) {
- replrest(req, req->rest + rmo);
- }
- if(mstr)
- freeca(mstr);
- return(pat->childnm);
- }
- if(mstr) {
- freeca(mstr);
- mstr = NULL;
+ if(match)
+ freematch(match);
+ omalloc(match);
+ match->pat = pat;
+ match->mstr = mstr;
+ match->rmo = rmo;
}
}
- return(NULL);
+ return(match);
+}
+
+static void execmatch(struct hthead *req, struct match *match)
+{
+ struct headmod *head;
+
+ if(match->pat->restpat)
+ exprestpat(req, match->pat, match->mstr);
+ else if(match->rmo != -1)
+ replrest(req, req->rest + match->rmo);
+ for(head = match->pat->headers; head != NULL; head = head->next) {
+ headrmheader(req, head->name);
+ headappheader(req, head->name, head->value);
+ }
+}
+
+static void childerror(struct hthead *req, int fd)
+{
+ if(errno == EAGAIN)
+ simpleerror(fd, 500, "Server Error", "The request handler is overloaded.");
+ else
+ simpleerror(fd, 500, "Server Error", "The request handler crashed.");
}
static void serve(struct hthead *req, int fd)
{
- char *chnm;
+ struct match *match;
struct child *ch;
- chnm = NULL;
- if(chnm == NULL)
- chnm = findmatch(lconfig, req, 0);
- if(chnm == NULL)
- chnm = findmatch(lconfig, req, 1);
- if(gconfig != NULL) {
- if(chnm == NULL)
- chnm = findmatch(gconfig, req, 0);
- if(chnm == NULL)
- chnm = findmatch(gconfig, req, 1);
- }
- if(chnm == NULL) {
+ match = NULL;
+ match = findmatch(lconfig, req, match);
+ if(gconfig != NULL)
+ match = findmatch(gconfig, req, match);
+ if(match == NULL) {
simpleerror(fd, 404, "Not Found", "The requested resource could not be found on this server.");
return;
}
- ch = NULL;
- if(ch == NULL)
- ch = getchild(lconfig, chnm);
- if(gconfig != NULL) {
+ execmatch(req, match);
+ switch(match->pat->handler) {
+ case HND_CHILD:
+ ch = NULL;
if(ch == NULL)
- ch = getchild(gconfig, chnm);
- }
- if(ch == NULL) {
- flog(LOG_ERR, "child %s requested, but was not declared", chnm);
- simpleerror(fd, 500, "Configuration Error", "The server is erroneously configured. Handler %s was requested, but not declared.", chnm);
- return;
+ ch = getchild(lconfig, match->pat->childnm);
+ if((ch == NULL) && (gconfig != NULL))
+ ch = getchild(gconfig, match->pat->childnm);
+ if(ch == NULL) {
+ flog(LOG_ERR, "child %s requested, but was not declared", match->pat->childnm);
+ simpleerror(fd, 500, "Configuration Error", "The server is erroneously configured. Handler %s was requested, but not declared.", match->pat->childnm);
+ break;
+ }
+ if(childhandle(ch, req, fd, NULL, NULL))
+ childerror(req, fd);
+ break;
+ case HND_REPARSE:
+ match->pat->disable = 1;
+ serve(req, fd);
+ match->pat->disable = 0;
+ break;
+ default:
+ abort();
}
-
- if(childhandle(ch, req, fd, NULL, NULL))
- simpleerror(fd, 500, "Server Error", "The request handler crashed.");
+ freematch(match);
}
static void reloadconf(char *nm)
{
struct config *cf;
- struct child *ch1, *ch2;
if((cf = readconfig(nm)) == NULL) {
flog(LOG_WARNING, "could not reload configuration file `%s'", nm);
return;
}
- for(ch1 = cf->children; ch1 != NULL; ch1 = ch1->next) {
- for(ch2 = lconfig->children; ch2 != NULL; ch2 = ch2->next) {
- if(!strcmp(ch1->name, ch2->name)) {
- ch1->fd = ch2->fd;
- ch2->fd = -1;
- break;
- }
- }
- }
+ mergechildren(cf->children, lconfig->children);
freeconfig(lconfig);
lconfig = cf;
}
+static void chldhandler(int sig)
+{
+ pid_t pid;
+ int st;
+
+ while((pid = waitpid(-1, &st, WNOHANG)) > 0) {
+ if(WCOREDUMP(st))
+ flog(LOG_WARNING, "child process %i dumped core", pid);
+ }
+}
+
static void sighandler(int sig)
{
if(sig == SIGHUP)
{
int c;
int nodef;
- char *gcf;
+ char *gcf, *lcf;
struct hthead *req;
int fd;
free(gcf);
}
}
- if((lconfig = readconfig(argv[optind])) == NULL) {
- flog(LOG_ERR, "could not read `%s'", argv[optind]);
+ if((strchr(lcf = argv[optind], '/')) == NULL) {
+ if((lcf = findstdconf(sprintf3("ashd/%s", lcf))) == NULL) {
+ flog(LOG_ERR, "could not find requested configuration file `%s'", argv[optind]);
+ exit(1);
+ }
+ }
+ if((lconfig = readconfig(lcf)) == NULL) {
+ flog(LOG_ERR, "could not read `%s'", lcf);
exit(1);
}
- signal(SIGCHLD, SIG_IGN);
+ signal(SIGCHLD, chldhandler);
signal(SIGHUP, sighandler);
+ signal(SIGPIPE, sighandler);
while(1) {
if(reload) {
- reloadconf(argv[optind]);
+ reloadconf(lcf);
reload = 0;
}
if((fd = recvreq(0, &req)) < 0) {
Dolda2000 GitWeb / ashd.git / blobdiff