time_t mtime, lastck;
struct child *children;
struct pattern *patterns;
+ char **index;
};
struct rule {
int type;
- char *pattern;
+ char **patterns;
};
struct pattern {
struct pattern *next;
char *childnm;
+ char **fchild;
struct rule **rules;
};
static struct config *gconfig, *lconfig;
static time_t now;
+static void freerule(struct rule *rule)
+{
+ freeca(rule->patterns);
+ free(rule);
+}
+
static void freepattern(struct pattern *pat)
{
struct rule **rule;
- for(rule = pat->rules; *rule; rule++) {
- if((*rule)->pattern != NULL)
- free((*rule)->pattern);
- free(*rule);
- }
+ for(rule = pat->rules; *rule; rule++)
+ freerule(*rule);
if(pat->childnm != NULL)
free(pat->childnm);
+ freeca(pat->fchild);
free(pat);
}
npat = pat->next;
freepattern(pat);
}
+ freeca(cf->index);
free(cf);
}
return(pat);
}
+static char **cadup(char **w)
+{
+ char **ret;
+ int i, l;
+
+ l = calen(w);
+ ret = smalloc(sizeof(*ret) * (l + 1));
+ for(i = 0; i < l; i++)
+ ret[i] = sstrdup(w[i]);
+ ret[i] = NULL;
+ return(ret);
+}
+
static struct pattern *parsepattern(struct cfstate *s)
{
struct pattern *pat;
}
rule = newrule(pat);
rule->type = PAT_BASENAME;
- rule->pattern = sstrdup(s->argv[1]);
+ rule->patterns = cadup(s->argv + 1);
} else if(!strcmp(s->argv[0], "pathname")) {
if(s->argc < 2) {
flog(LOG_WARNING, "%s:%i: missing pattern for `pathname' match", s->file, s->lno);
}
rule = newrule(pat);
rule->type = PAT_PATHNAME;
- rule->pattern = sstrdup(s->argv[1]);
+ rule->patterns = cadup(s->argv + 1);
} else if(!strcmp(s->argv[0], "all")) {
newrule(pat)->type = PAT_ALL;
} else if(!strcmp(s->argv[0], "default")) {
if(pat->childnm != NULL)
free(pat->childnm);
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], "end") || !strcmp(s->argv[0], "eof")) {
break;
} else {
freepattern(pat);
return(NULL);
}
- if(pat->childnm == NULL) {
+ if((pat->childnm == NULL) && (pat->fchild == NULL)) {
flog(LOG_WARNING, "%s:%i: missing handler in match declaration", s->file, sl);
freepattern(pat);
return(NULL);
} else if((pat = parsepattern(s)) != NULL) {
pat->next = cf->patterns;
cf->patterns = pat;
+ } else if(!strcmp(s->argv[0], "index-file")) {
+ freeca(cf->index);
+ cf->index = NULL;
+ if(s->argc > 1)
+ cf->index = cadup(s->argv + 1);
} else if(!strcmp(s->argv[0], "eof")) {
break;
} else {
cf->mtime = mtime;
cf->lastck = now;
cf->next = cflist;
+ cf->prev = NULL;
+ if(cflist != NULL)
+ cflist->prev = cf;
cflist = cf;
return(cf);
}
static struct pattern *findmatch(char *file, int trydefault)
{
- int i, c;
+ int i, o, c;
char *bn;
struct config **cfs;
struct pattern *pat;
for(pat = cfs[c]->patterns; pat != NULL; pat = pat->next) {
for(i = 0; (rule = pat->rules[i]) != NULL; i++) {
if(rule->type == PAT_BASENAME) {
- if(fnmatch(rule->pattern, bn, 0))
+ for(o = 0; rule->patterns[o] != NULL; o++) {
+ if(!fnmatch(rule->patterns[o], bn, 0))
+ break;
+ }
+ if(rule->patterns[o] == NULL)
break;
} else if(rule->type == PAT_PATHNAME) {
- if(fnmatch(rule->pattern, file, FNM_PATHNAME))
+ for(o = 0; rule->patterns[o] != NULL; o++) {
+ if(!fnmatch(rule->patterns[o], file, FNM_PATHNAME))
+ break;
+ }
+ if(rule->patterns[o] == NULL)
break;
} else if(rule->type == PAT_ALL) {
} else if(rule->type == PAT_DEFAULT) {
simpleerror(fd, 404, "Not Found", "The requested URL has no corresponding resource.");
return;
}
- if((ch = findchild(path, pat->childnm)) == NULL) {
- flog(LOG_ERR, "child %s requested, but was not declared", pat->childnm);
- simpleerror(fd, 500, "Configuration Error", "The server is erroneously configured. Handler %s was requested, but not declared.", pat->childnm);
- return;
+ if(pat->fchild) {
+ stdforkserve(pat->fchild, req, fd);
+ } else {
+ if((ch = findchild(path, pat->childnm)) == NULL) {
+ flog(LOG_ERR, "child %s requested, but was not declared", pat->childnm);
+ simpleerror(fd, 500, "Configuration Error", "The server is erroneously configured. Handler %s was requested, but not declared.", pat->childnm);
+ return;
+ }
+ if(childhandle(ch, req, fd))
+ simpleerror(fd, 500, "Server Error", "The request handler crashed.");
}
-
- if(childhandle(ch, req, fd))
- simpleerror(fd, 500, "Server Error", "The request handler crashed.");
}
static void handledir(struct hthead *req, int fd, char *path)
{
- /* XXX: Todo */
- simpleerror(fd, 403, "Not Authorized", "Will not send directory listings or indices yet.");
+ struct config **cfs;
+ int i, o;
+ struct stat sb;
+ char *inm, *ipath, *p;
+ DIR *dir;
+ struct dirent *dent;
+
+ cfs = getconfigs(sprintf3("%s/", path));
+ for(i = 0; cfs[i] != NULL; i++) {
+ if(cfs[i]->index != NULL) {
+ for(o = 0; cfs[i]->index[o] != NULL; o++) {
+ inm = cfs[i]->index[o];
+ ipath = sprintf2("%s/%s", path, inm);
+ if(!stat(ipath, &sb) && S_ISREG(sb.st_mode)) {
+ handlefile(req, fd, ipath);
+ free(ipath);
+ return;
+ }
+ free(ipath);
+
+ ipath = NULL;
+ if(!strchr(inm, '.') && ((dir = opendir(path)) != NULL)) {
+ while((dent = readdir(dir)) != NULL) {
+ if((p = strchr(dent->d_name, '.')) == NULL)
+ continue;
+ if(strncmp(dent->d_name, inm, strlen(inm)))
+ continue;
+ ipath = sprintf2("%s/%s", path, dent->d_name);
+ if(stat(ipath, &sb) || !S_ISREG(sb.st_mode)) {
+ free(ipath);
+ ipath = NULL;
+ continue;
+ }
+ break;
+ }
+ closedir(dir);
+ }
+ if(ipath != NULL) {
+ handlefile(req, fd, ipath);
+ free(ipath);
+ return;
+ }
+ }
+ break;
+ }
+ }
+ /* XXX: Directory listings */
+ simpleerror(fd, 403, "Not Authorized", "Will not send listings for this directory.");
}
static int checkdir(struct hthead *req, int fd, char *path)
} else {
*(p2++) = 0;
}
+ if((tmp = unquoteurl(p)) == NULL) {
+ simpleerror(fd, 400, "Bad Request", "The requested URL contains an invalid escape sequence.");
+ goto fail;
+ }
+ strcpy(p, tmp);
+ free(tmp);
if(!*p) {
if(p2 == NULL) {
Dolda2000 GitWeb / ashd.git / blobdiff