X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fdirplex.c;h=46342830c55b380499b8b068a431577f2e9287b9;hb=d58ed97c97e7e9b58eec06c02254b35a22ab4969;hp=063fbb4135812c8a95e8ca1474fd0682d397e73f;hpb=cceb36110d6caa3a44827652d836ac6862d17ff9;p=ashd.git

diff --git a/src/dirplex.c b/src/dirplex.c
index 063fbb4..4634283 100644
--- a/src/dirplex.c
+++ b/src/dirplex.c
@@ -35,9 +35,7 @@
 #include <req.h>
 #include <proc.h>
 #include <resp.h>
-
-#define CH_SOCKET 0
-#define CH_FORK 1
+#include <cf.h>
 
 #define PAT_BASENAME 0
 #define PAT_PATHNAME 1
@@ -52,14 +50,6 @@ struct config {
     struct pattern *patterns;
 };
 
-struct child {
-    struct child *next;
-    char *name;
-    int type;
-    char **argv;
-    int fd;
-};
-
 struct rule {
     int type;
     char *pattern;
@@ -73,17 +63,6 @@ struct pattern {
 
 struct config *cflist;
 
-static void freechild(struct child *ch)
-{
-    if(ch->fd != -1)
-	close(ch->fd);
-    if(ch->name != NULL)
-	free(ch->name);
-    if(ch->argv != NULL)
-	freeca(ch->argv);
-    free(ch);
-}
-
 static void freepattern(struct pattern *pat)
 {
     struct rule **rule;
@@ -121,17 +100,6 @@ static void freeconfig(struct config *cf)
     free(cf);
 }
 
-static struct child *newchild(char *name, int type)
-{
-    struct child *ch;
-    
-    omalloc(ch);
-    ch->name = sstrdup(name);
-    ch->type = type;
-    ch->fd = -1;
-    return(ch);
-}
-
 static struct child *getchild(struct config *cf, char *name)
 {
     struct child *ch;
@@ -164,165 +132,109 @@ static struct pattern *newpattern(void)
     return(pat);
 }
 
+static struct pattern *parsepattern(struct cfstate *s)
+{
+    struct pattern *pat;
+    struct rule *rule;
+    int sl;
+
+    if(!strcmp(s->argv[0], "match")) {
+	s->expstart = 1;
+	pat = newpattern();
+    } else {
+	return(NULL);
+    }
+    
+    sl = s->lno;
+    while(1) {
+	getcfline(s);
+	if(!strcmp(s->argv[0], "filename")) {
+	    if(s->argc < 2) {
+		flog(LOG_WARNING, "%s:%i: missing pattern for `filename' match", s->file, s->lno);
+		continue;
+	    }
+	    rule = newrule(pat);
+	    rule->type = PAT_BASENAME;
+	    rule->pattern = sstrdup(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);
+		continue;
+	    }
+	    rule = newrule(pat);
+	    rule->type = PAT_PATHNAME;
+	    rule->pattern = sstrdup(s->argv[1]);
+	} else if(!strcmp(s->argv[0], "all")) {
+	    newrule(pat)->type = PAT_ALL;
+	} else if(!strcmp(s->argv[0], "default")) {
+	    newrule(pat)->type = PAT_DEFAULT;
+	} 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);
+		continue;
+	    }
+	    if(pat->childnm != NULL)
+		free(pat->childnm);
+	    pat->childnm = sstrdup(s->argv[1]);
+	} else if(!strcmp(s->argv[0], "end") || !strcmp(s->argv[0], "eof")) {
+	    break;
+	} else {
+	    flog(LOG_WARNING, "%s:%i: unknown directive `%s' in pattern declaration", s->file, s->lno, s->argv[0]);
+	}
+    }
+    
+    if(pat->rules[0] == NULL) {
+	flog(LOG_WARNING, "%s:%i: missing rules in match declaration", s->file, sl);
+	freepattern(pat);
+	return(NULL);
+    }
+    if(pat->childnm == NULL) {
+	flog(LOG_WARNING, "%s:%i: missing handler in match declaration", s->file, sl);
+	freepattern(pat);
+	return(NULL);
+    }
+    return(pat);
+}
+
 static struct config *readconfig(char *path)
 {
-    int i;
+    struct cfstate *s;
+    FILE *in;
     struct config *cf;
-    FILE *s;
-    char line[1024];
-    char *p, **w;
-    int ind, eof;
-    int lno;
-    int state;
-    int rv;
-    int argc;
     struct child *child;
     struct pattern *pat;
-    struct rule *rule;
     struct stat sb;
+    char *p;
     
     p = sprintf3("%s/.htrc", path);
     if(stat(p, &sb))
 	return(NULL);
-    if((s = fopen(p, "r")) == NULL)
+    if((in = fopen(p, "r")) == NULL) {
+	flog(LOG_WARNING, "%s: %s", p, strerror(errno));
 	return(NULL);
+    }
+    s = mkcfparser(in, p);
     omalloc(cf);
     cf->mtime = sb.st_mtime;
     cf->path = sstrdup(path);
-    eof = 0;
-    state = 0;
-    w = NULL;
-    lno = 0;
-    do {
-	if(fgets(line, sizeof(line), s) == NULL) {
-	    eof = 1;
-	    line[0] = 0;
-	}
-	lno++;
-	for(p = line; *p; p++) {
-	    if(*p == '#')
-		continue;
-	    if(!isspace(*p))
-		break;
-	}
-	ind = isspace(line[0]);
-	w = tokenize(line);
-	argc = calen(w);
-	
-    retry:
-	if(state == 0) {
-	    if(ind) {
-		flog(LOG_WARNING, "%s%i: unexpected line indentation in global scope", path, lno);
-		goto next;
-	    } else {
-		if(!w[0]) {
-		} else if(!strcmp(w[0], "child")) {
-		    if(argc < 2) {
-			flog(LOG_WARNING, "%s:%i: missing name in child declaration", path, lno);
-			goto next;
-		    }
-		    child = newchild(w[1], CH_SOCKET);
-		    state = 1;
-		} else if(!strcmp(w[0], "fchild")) {
-		    if(argc < 2) {
-			flog(LOG_WARNING, "%s:%i: missing name in child declaration", path, lno);
-			goto next;
-		    }
-		    child = newchild(w[1], CH_FORK);
-		    state = 1;
-		} else if(!strcmp(w[0], "match")) {
-		    pat = newpattern();
-		    state = 2;
-		} else {
-		    flog(LOG_WARNING, "%s:%i: unknown directive %s", path, lno, w[0]);
-		}
-	    }
-	} else if(state == 1) {
-	    if(ind) {
-		if(!w[0]) {
-		} else if(!strcmp(w[0], "exec")) {
-		    if(argc < 2) {
-			flog(LOG_WARNING, "%s:%i: too few parameters to `exec'", path, lno);
-			goto next;
-		    }
-		    child->argv = szmalloc(sizeof(*child->argv) * argc);
-		    for(i = 0; i < argc - 1; i++)
-			child->argv[i] = sstrdup(w[i + 1]);
-		} else {
-		    flog(LOG_WARNING, "%s:%i: unknown directive %s", path, lno, w[0]);
-		}
-	    } else {
-		state = 0;
-		if(child->argv == NULL) {
-		    flog(LOG_WARNING, "%s:%i: missing `exec' in child declaration %s", path, lno, child->name);
-		    freechild(child);
-		    goto retry;
-		}
-		child->next = cf->children;
-		cf->children = child;
-		goto retry;
-	    }
-	} else if(state == 2) {
-	    if(ind) {
-		if(!w[0]) {
-		} else if(!strcmp(w[0], "filename")) {
-		    if(argc < 2) {
-			flog(LOG_WARNING, "%s:%i: missing pattern for `filename' match", path, lno);
-			goto next;
-		    }
-		    rule = newrule(pat);
-		    rule->type = PAT_BASENAME;
-		    rule->pattern = sstrdup(w[1]);
-		} else if(!strcmp(w[0], "pathname")) {
-		    if(argc < 2) {
-			flog(LOG_WARNING, "%s:%i: missing pattern for `pathname' match", path, lno);
-			goto next;
-		    }
-		    rule = newrule(pat);
-		    rule->type = PAT_PATHNAME;
-		    rule->pattern = sstrdup(w[1]);
-		} else if(!strcmp(w[0], "all")) {
-		    newrule(pat)->type = PAT_ALL;
-		} else if(!strcmp(w[0], "default")) {
-		    newrule(pat)->type = PAT_DEFAULT;
-		} else if(!strcmp(w[0], "handler")) {
-		    if(argc < 2) {
-			flog(LOG_WARNING, "%s:%i: missing child name for `handler' directive", path, lno);
-			goto next;
-		    }
-		    if(pat->childnm != NULL)
-			free(pat->childnm);
-		    pat->childnm = sstrdup(w[1]);
-		} else {
-		    flog(LOG_WARNING, "%s:%i: unknown directive %s", path, lno, w[0]);
-		}
-	    } else {
-		state = 0;
-		if(pat->rules[0] == NULL) {
-		    flog(LOG_WARNING, "%s:%i: missing rules in match declaration", path, lno);
-		    freepattern(pat);
-		    goto retry;
-		}
-		if(pat->childnm == NULL) {
-		    flog(LOG_WARNING, "%s:%i: missing handler in match declaration", path, lno);
-		    freepattern(pat);
-		    goto retry;
-		}
-		pat->next = cf->patterns;
-		cf->patterns = pat;
-		goto retry;
-	    }
+    
+    while(1) {
+	getcfline(s);
+	if((child = parsechild(s)) != NULL) {
+	    child->next = cf->children;
+	    cf->children = child;
+	} else if((pat = parsepattern(s)) != NULL) {
+	    pat->next = cf->patterns;
+	    cf->patterns = pat;
+	} else if(!strcmp(s->argv[0], "eof")) {
+	    break;
+	} else {
+	    flog(LOG_WARNING, "%s:%i: unknown directive `%s'", s->file, s->lno, s->argv[0]);
 	}
-	
-    next:
-	freeca(w);
-	w = NULL;
-    } while(!eof);
-    rv = 0;
+    }
     
-    if(w != NULL)
-	freeca(w);
-    fclose(s);
+    freecfparser(s);
+    fclose(in);
     return(cf);
 }
 
@@ -349,36 +261,53 @@ static struct config *getconfig(char *path)
     return(cf);
 }
 
-static struct child *findchild(char *file, char *name)
+static struct config **getconfigs(char *file)
 {
-    char *buf, *p;
+    static struct config **ret = NULL;
+    struct {
+	struct config **b;
+	size_t s, d;
+    } buf;
     struct config *cf;
-    struct child *ch;
-
-    buf = sstrdup(file);
+    char *tmp, *p;
+    
+    if(ret != NULL)
+	free(ret);
+    bufinit(buf);
+    tmp = sstrdup(file);
     while(1) {
-	ch = NULL;
-	if(!strcmp(buf, "."))
+	if((p = strrchr(tmp, '/')) == NULL)
 	    break;
-	if((p = strrchr(buf, '/')) != NULL)
-	    *p = 0;
-	else
-	    strcpy(buf, ".");
-	cf = getconfig(buf);
-	if(cf == NULL)
-	    continue;
-	if((ch = getchild(cf, name)) != NULL)
+	*p = 0;
+	if((cf = getconfig(tmp)) != NULL)
+	    bufadd(buf, cf);
+    }
+    free(tmp);
+    if((cf = getconfig(".")) != NULL)
+	bufadd(buf, cf);
+    bufadd(buf, NULL);
+    return(ret = buf.b);
+}
+
+static struct child *findchild(char *file, char *name)
+{
+    int i;
+    struct config **cfs;
+    struct child *ch;
+    
+    cfs = getconfigs(file);
+    for(i = 0; cfs[i] != NULL; i++) {
+	if((ch = getchild(cfs[i], name)) != NULL)
 	    break;
     }
-    free(buf);
     return(ch);
 }
 
 static struct pattern *findmatch(char *file, int trydefault)
 {
-    int i;
-    char *buf, *p, *bn;
-    struct config *cf;
+    int i, c;
+    char *bn;
+    struct config **cfs;
     struct pattern *pat;
     struct rule *rule;
     
@@ -386,19 +315,9 @@ static struct pattern *findmatch(char *file, int trydefault)
 	bn++;
     else
 	bn = file;
-    buf = sstrdup(file);
-    while(1) {
-	pat = NULL;
-	if(!strcmp(buf, "."))
-	    break;
-	if((p = strrchr(buf, '/')) != NULL)
-	    *p = 0;
-	else
-	    strcpy(buf, ".");
-	cf = getconfig(buf);
-	if(cf == NULL)
-	    continue;
-	for(pat = cf->patterns; pat != NULL; pat = pat->next) {
+    cfs = getconfigs(file);
+    for(c = 0; cfs[c] != NULL; c++) {
+	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))
@@ -413,35 +332,10 @@ static struct pattern *findmatch(char *file, int trydefault)
 		}
 	    }
 	    if(!rule)
-		goto out;
+		return(pat);
 	}
     }
-
-out:
-    free(buf);
-    return(pat);
-}
-
-static void forkchild(struct child *ch)
-{
-    ch->fd = stdmkchild(ch->argv);
-}
-
-static void passreq(struct child *ch, struct hthead *req, int fd)
-{
-    if(ch->fd < 0)
-	forkchild(ch);
-    if(sendreq(ch->fd, req, fd)) {
-	if(errno == EPIPE) {
-	    /* Assume that the child has crashed and restart it. */
-	    forkchild(ch);
-	    if(!sendreq(ch->fd, req, fd))
-		return;
-	}
-	flog(LOG_ERR, "could not pass on request to child %s: %s", ch->name, strerror(errno));
-	close(ch->fd);
-	ch->fd = -1;
-    }
+    return(NULL);
 }
 
 static void handlefile(struct hthead *req, int fd, char *path)
@@ -451,7 +345,7 @@ static void handlefile(struct hthead *req, int fd, char *path)
 
     headappheader(req, "X-Ash-File", path);
     if(((pat = findmatch(path, 0)) == NULL) && ((pat = findmatch(path, 1)) == NULL)) {
-	/* XXX: Send a 500 error? 404? */
+	simpleerror(fd, 404, "Not Found", "The requested URL has no corresponding resource.");
 	return;
     }
     if((ch = findchild(path, pat->childnm)) == NULL) {
@@ -460,17 +354,14 @@ static void handlefile(struct hthead *req, int fd, char *path)
 	return;
     }
     
-    if(ch->type == CH_SOCKET) {
-	passreq(ch, req, fd);
-    } else if(ch->type == CH_FORK) {
-	stdforkserve(ch->argv, req, fd);
-    }
+    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");
+    simpleerror(fd, 403, "Not Authorized", "Will not send directory listings or indices yet.");
 }
 
 static int checkdir(struct hthead *req, int fd, char *path)
@@ -526,6 +417,10 @@ static void serve(struct hthead *req, int fd)
 		else
 		    path = sprintf2("%s/%s", path, p);
 		free(tmp);
+		if(p2 == NULL) {
+		    stdredir(req, fd, 301, sprintf3("%s/", p));
+		    goto out;
+		}
 		if(checkdir(req, fd, path))
 		    break;
 		goto next;