#include <utils.h>
#include <log.h>
#include <cf.h>
+#include <resp.h>
#include "dirplex.h"
static void freepattern(struct pattern *pat)
{
struct rule **rule;
+ struct headmod *head;
for(rule = pat->rules; *rule; rule++)
freerule(*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);
freeca(pat->fchild);
freepattern(pat);
}
freeca(cf->index);
+ if(cf->capture != NULL)
+ free(cf->capture);
free(cf);
}
{
struct pattern *pat;
struct rule *rule;
+ struct headmod *head;
int sl;
if(!strcmp(s->argv[0], "match")) {
newrule(pat)->type = PAT_ALL;
} else if(!strcmp(s->argv[0], "default")) {
newrule(pat)->type = PAT_DEFAULT;
+ } else if(!strcmp(s->argv[0], "local")) {
+ newrule(pat)->type = PAT_LOCAL;
} 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);
pat->childnm = sstrdup(s->argv[1]);
} else if(!strcmp(s->argv[0], "fork")) {
pat->fchild = cadup(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 {
cf->index = NULL;
if(s->argc > 1)
cf->index = cadup(s->argv + 1);
+ } else if(!strcmp(s->argv[0], "capture")) {
+ if(s->argc < 2) {
+ flog(LOG_WARNING, "%s:%i: missing argument to capture declaration", s->file, s->lno);
+ continue;
+ }
+ if(cf->capture != NULL)
+ free(cf->capture);
+ cf->capture = sstrdup(s->argv[1]);
} else if(!strcmp(s->argv[0], "eof")) {
break;
} else {
return(cf);
}
-static void mergechildren(struct config *dst, struct config *src)
-{
- struct child *ch1, *ch2;
-
- for(ch1 = dst->children; ch1 != NULL; ch1 = ch1->next) {
- for(ch2 = src->children; ch2 != NULL; ch2 = ch2->next) {
- if(!strcmp(ch1->name, ch2->name)) {
- ch1->fd = ch2->fd;
- ch2->fd = -1;
- break;
- }
- }
- }
-}
-
struct config *getconfig(char *path)
{
struct config *cf, *ocf;
for(cf = cflist; cf != NULL; cf = cf->next) {
if(!strcmp(cf->path, path)) {
if(now - cf->lastck > 5) {
+ cf->lastck = now;
if(stat(fn, &sb) || (sb.st_mtime != cf->mtime))
break;
}
- cf->lastck = now;
return(cf);
}
}
mtime = sb.st_mtime;
}
if(ocf != NULL) {
- mergechildren(cf, ocf);
+ mergechildren(cf->children, ocf->children);
freeconfig(ocf);
}
cf->path = sstrdup(path);
if(ret != NULL)
free(ret);
bufinit(buf);
+ if(!strncmp(file, "./", 2))
+ file += 2;
tmp = sstrdup(file);
while(1) {
if((p = strrchr(tmp, '/')) == NULL)
return(ret = buf.b);
}
-struct child *findchild(char *file, char *name)
+struct child *findchild(char *file, char *name, struct config **cf)
{
int i;
struct config **cfs;
struct child *ch;
+ if(cf != NULL)
+ *cf = NULL;
cfs = getconfigs(file);
for(i = 0; cfs[i] != NULL; i++) {
- if((ch = getchild(cfs[i], name)) != NULL)
- break;
+ if((ch = getchild(cfs[i], name)) != NULL) {
+ if(cf != NULL)
+ *cf = cfs[i];
+ return(ch);
+ }
}
- return(ch);
+ if(!strcmp(name, ".notfound"))
+ return(notfound);
+ return(NULL);
}
struct pattern *findmatch(char *file, int trydefault, int dir)
{
int i, o, c;
- char *bn;
+ char *bn, *ln;
struct config **cfs;
struct pattern *pat;
struct rule *rule;
+ size_t pl;
if((bn = strrchr(file, '/')) != NULL)
bn++;
bn = file;
cfs = getconfigs(file);
for(c = 0; cfs[c] != NULL; c++) {
+ if(cfs[c]->path == NULL) {
+ ln = file;
+ } else {
+ pl = strlen(cfs[c]->path);
+ if((strlen(file) > pl) && !strncmp(file, cfs[c]->path, pl) && (file[pl] == '/'))
+ ln = file + pl + 1;
+ else
+ ln = file; /* This should only happen in the base directory. */
+ }
for(pat = cfs[c]->patterns; pat != NULL; pat = pat->next) {
if(!dir && (pat->type == PT_DIR))
continue;
break;
} else if(rule->type == PAT_PATHNAME) {
for(o = 0; rule->patterns[o] != NULL; o++) {
- if(!fnmatch(rule->patterns[o], file, FNM_PATHNAME))
+ if(!fnmatch(rule->patterns[o], ln, FNM_PATHNAME))
break;
}
if(rule->patterns[o] == NULL)
} else if(rule->type == PAT_DEFAULT) {
if(!trydefault)
break;
+ } else if(rule->type == PAT_LOCAL) {
+ if(strchr(ln, '/'))
+ break;
}
}
if(!rule)
return(findmatch(file, 1, dir));
return(NULL);
}
+
+static int donotfound(struct child *ch, struct hthead *req, int fd, void (*chinit)(void *), void *idata)
+{
+ simpleerror(fd, 404, "Not Found", "The requested URL has no corresponding resource.");
+ return(0);
+}
+
+static struct chandler i_notfound = {
+ .handle = donotfound,
+};
+
+static struct child s_notfound = {
+ .name = ".notfound",
+ .iface = &i_notfound,
+};
+struct child *notfound = &s_notfound;