dirplex: Improved 404 handling.

diff --git a/src/dirplex/conf.c b/src/dirplex/conf.c
index dec84b57287dba25f267c7d740864e1b303f8e87..95f643a4ab068b031bc09ea9d9b0ed28871a3598 100644 (file)
--- a/src/dirplex/conf.c
+++ b/src/dirplex/conf.c
@@ -150,6 +150,10 @@ static struct pattern *parsepattern(struct cfstate *s)
     
     if((s->argc > 1) && !strcmp(s->argv[1], "directory"))
        pat->type = PT_DIR;
+    else if((s->argc > 1) && !strcmp(s->argv[1], "notfound"))
+       pat->type = PT_NOTFOUND;
+    else
+       pat->type = PT_FILE;
     sl = s->lno;
     while(1) {
        getcfline(s);
@@ -374,7 +378,7 @@ struct child *findchild(char *file, char *name, struct config **cf)
     return(NULL);
 }
 
-struct pattern *findmatch(char *file, int trydefault, int dir)
+struct pattern *findmatch(char *file, int trydefault, int type)
 {
     int i, o, c;
     char *bn, *ln;
@@ -399,9 +403,7 @@ struct pattern *findmatch(char *file, int trydefault, int dir)
                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;
-           if(dir && (pat->type != PT_DIR))
+           if(pat->type != type)
                continue;
            for(i = 0; (rule = pat->rules[i]) != NULL; i++) {
                if(rule->type == PAT_BASENAME) {
@@ -432,7 +434,7 @@ struct pattern *findmatch(char *file, int trydefault, int dir)
        }
     }
     if(!trydefault)
-       return(findmatch(file, 1, dir));
+       return(findmatch(file, 1, type));
     return(NULL);
 }
 

diff --git a/src/dirplex/dirplex.c b/src/dirplex/dirplex.c
index f6002f3361d752173b06f41e75ce9a3e75840fa5..65f09f715209c948f1fe723560e53501c246b8a2 100644 (file)
--- a/src/dirplex/dirplex.c
+++ b/src/dirplex/dirplex.c
@@ -107,20 +107,24 @@ static void handle404(struct hthead *req, int fd, char *path)
 {
     struct child *ch;
     struct config *ccf;
-    char *tmp;
+    struct pattern *pat;
     
-    tmp = sstrdup(path);
-    ch = findchild(tmp, ".notfound", &ccf);
-    if(childhandle(ch, req, fd, chinit, ccf?ccf->path:NULL))
-       childerror(req, fd);
-    free(tmp);
+    char tmp[strlen(path) + 1];
+    strcpy(tmp, path);
+    if((pat = findmatch(tmp, 0, PT_NOTFOUND)) != NULL) {
+       handle(req, fd, tmp, pat);
+    } else {
+       ch = findchild(tmp, ".notfound", &ccf);
+       if(childhandle(ch, req, fd, chinit, ccf?ccf->path:NULL))
+           childerror(req, fd);
+    }
 }
 
 static void handlefile(struct hthead *req, int fd, char *path)
 {
     struct pattern *pat;
 
-    if((pat = findmatch(path, 0, 0)) == NULL) {
+    if((pat = findmatch(path, 0, PT_FILE)) == NULL) {
        handle404(req, fd, path);
        return;
     }
@@ -194,7 +198,7 @@ static void handledir(struct hthead *req, int fd, char *path)
            break;
        }
     }
-    if((pat = findmatch(cpath, 0, 1)) != NULL) {
+    if((pat = findmatch(cpath, 0, PT_DIR)) != NULL) {
        handle(req, fd, cpath, pat);
        goto out;
     }
@@ -204,18 +208,16 @@ out:
     free(cpath);
 }
 
-static int checkpath(struct hthead *req, int fd, char *path, char *rest);
+static int checkpath(struct hthead *req, int fd, char *path, char *rest, int final);
 
-static int checkentry(struct hthead *req, int fd, char *path, char *rest, char *el)
+static int checkentry(struct hthead *req, int fd, char *path, char *rest, char *el, int final)
 {
     struct stat sb;
     char *newpath;
     int rv;
     
-    if(*el == '.') {
-       handle404(req, fd, sprintf3("%s/", path));
-       return(1);
-    }
+    if(*el == '.')
+       return(0);
     if(!stat(sprintf3("%s/%s", path, el), &sb)) {
        if(S_ISDIR(sb.st_mode)) {
            if(!*rest) {
@@ -223,7 +225,7 @@ static int checkentry(struct hthead *req, int fd, char *path, char *rest, char *
                return(1);
            }
            newpath = sprintf2("%s/%s", path, el);
-           rv = checkpath(req, fd, newpath, rest + 1);
+           rv = checkpath(req, fd, newpath, rest + 1, final);
            free(newpath);
            return(rv);
        } else if(S_ISREG(sb.st_mode)) {
@@ -271,7 +273,7 @@ static int checkdir(struct hthead *req, int fd, char *path, char *rest)
     return(0);
 }
 
-static int checkpath(struct hthead *req, int fd, char *path, char *rest)
+static int checkpath(struct hthead *req, int fd, char *path, char *rest, int final)
 {
     char *p, *el;
     int rv;
@@ -300,8 +302,7 @@ static int checkpath(struct hthead *req, int fd, char *path, char *rest)
        goto out;
     }
     if(strchr(el, '/') || (!*el && *rest)) {
-       handle404(req, fd, sprintf3("%s/", path));
-       rv = 1;
+       rv = 0;
        goto out;
     }
     if(!*el) {
@@ -310,9 +311,13 @@ static int checkpath(struct hthead *req, int fd, char *path, char *rest)
        rv = 1;
        goto out;
     }
-    rv = checkentry(req, fd, path, rest, el);
+    rv = checkentry(req, fd, path, rest, el, final);
     
 out:
+    if(final && !rv) {
+       handle404(req, fd, sprintf3("%s/", path));
+       rv = 1;
+    }
     if(el != NULL)
        free(el);
     return(rv);
@@ -321,8 +326,7 @@ out:
 static void serve(struct hthead *req, int fd)
 {
     now = time(NULL);
-    if(!checkpath(req, fd, ".", req->rest))
-       handle404(req, fd, ".");
+    checkpath(req, fd, ".", req->rest, 1);
 }
 
 static void chldhandler(int sig)

diff --git a/src/dirplex/dirplex.h b/src/dirplex/dirplex.h
index 14b5454a75200f4515bc8f337c0887406543a968..77caa649d37bb1944fdc0001811a9750705d504a 100644 (file)
--- a/src/dirplex/dirplex.h
+++ b/src/dirplex/dirplex.h
@@ -9,6 +9,7 @@
 
 #define PT_FILE 0
 #define PT_DIR 1
+#define PT_NOTFOUND 2
 
 struct config {
     struct config *next, *prev;
@@ -45,7 +46,7 @@ struct config *readconfig(char *file);
 struct config *getconfig(char *path);
 struct config **getconfigs(char *file);
 struct child *findchild(char *file, char *name, struct config **cf);
-struct pattern *findmatch(char *file, int trydefault, int dir);
+struct pattern *findmatch(char *file, int trydefault, int type);
 void modheaders(struct hthead *req, struct pattern *pat);
 
 extern time_t now;