htparser: Handle absolute-URI requests.

[ashd.git] / src / htparser.c

diff --git a/src/htparser.c b/src/htparser.c
index c8064f2..bc8f7fd 100644 (file)
--- a/src/htparser.c
+++ b/src/htparser.c
@@ -19,6 +19,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
+#include <fcntl.h>
 #include <string.h>
 #include <sys/socket.h>
 #include <pwd.h>
@@ -39,6 +40,7 @@
 
 static int plex;
 static char *pidfile = NULL;
+static int daemonize, usesyslog;
 
 static void trimx(struct hthead *req)
 {
@@ -75,6 +77,8 @@ static struct hthead *parsereq(FILE *in)
            goto fail;
        } else {
            bufadd(method, c);
+           if(method.d >= 128)
+               goto fail;
        }
     }
     while(1) {
@@ -85,6 +89,8 @@ static struct hthead *parsereq(FILE *in)
            goto fail;
        } else {
            bufadd(url, c);
+           if(url.d >= 65536)
+               goto fail;
        }
     }
     while(1) {
@@ -96,6 +102,8 @@ static struct hthead *parsereq(FILE *in)
            goto fail;
        } else {
            bufadd(ver, c);
+           if(ver.d >= 128)
+               goto fail;
        }
     }
     bufadd(method, 0);
@@ -138,6 +146,8 @@ static struct hthead *parseresp(FILE *in)
            goto fail;
        } else {
            bufadd(ver, c);
+           if(ver.d >= 128)
+               goto fail;
        }
     }
     while(1) {
@@ -148,6 +158,8 @@ static struct hthead *parseresp(FILE *in)
            goto fail;
        } else {
            code = (code * 10) + (c - '0');
+           if(code >= 10000)
+               goto fail;
        }
     }
     while(1) {
@@ -159,6 +171,8 @@ static struct hthead *parseresp(FILE *in)
            goto fail;
        } else {
            bufadd(msg, c);
+           if(msg.d >= 512)
+               goto fail;
        }
     }
     bufadd(msg, 0);
@@ -226,12 +240,50 @@ static int hasheader(struct hthead *head, char *name, char *val)
     return(!strcasecmp(hd, val));
 }
 
+static int canonreq(struct hthead *req)
+{
+    char *p, *p2, *r;
+    int n;
+
+    if(req->url[0] == '/') {
+       replrest(req, req->url + 1);
+       if((p = strchr(req->rest, '?')) != NULL)
+           *p = 0;
+       return(1);
+    }
+    if((p = strstr(req->url, "://")) != NULL) {
+       n = p - req->url;
+       if(((n == 4) && !strncasecmp(req->url, "http", 4)) ||
+          ((n == 5) && !strncasecmp(req->url, "https", 5))) {
+           if(getheader(req, "host"))
+               return(0);
+           p += 3;
+           if((p2 = strchr(p, '/')) == NULL) {
+               headappheader(req, "Host", p);
+               free(req->url);
+               req->url = sstrdup("/");
+           } else {
+               r = sstrdup(p2);
+               *(p2++) = 0;
+               headappheader(req, "Host", p);
+               free(req->url);
+               req->url = r;
+           }
+           replrest(req, req->url + 1);
+           if((p = strchr(req->rest, '?')) != NULL)
+               *p = 0;
+           return(1);
+       }
+    }
+    return(0);
+}
+
 void serve(FILE *in, struct conn *conn)
 {
     int pfds[2];
     FILE *out;
     struct hthead *req, *resp;
-    char *hd, *p;
+    char *hd;
     off_t dlen;
     
     out = NULL;
@@ -239,11 +291,8 @@ void serve(FILE *in, struct conn *conn)
     while(1) {
        if((req = parsereq(in)) == NULL)
            break;
-       replrest(req, req->url);
-       if(req->rest[0] == '/')
-           replrest(req, req->rest + 1);
-       if((p = strchr(req->rest, '?')) != NULL)
-           *p = 0;
+       if(!canonreq(req))
+           break;
        
        if((conn->initreq != NULL) && conn->initreq(conn, req))
            break;
@@ -272,13 +321,19 @@ void serve(FILE *in, struct conn *conn)
        if((resp = parseresp(out)) == NULL)
            break;
        replstr(&resp->ver, req->ver);
+       
+       if(!getheader(resp, "server"))
+           headappheader(resp, "Server", sprintf3("ashd/%s", VERSION));
 
        if(!strcmp(req->ver, "HTTP/1.0")) {
            writeresp(in, resp);
            fprintf(in, "\r\n");
-           if((hd = getheader(resp, "content-length")) != NULL) {
-               dlen = passdata(out, in, -1);
-               if(dlen != atoo(hd))
+           if(!strcasecmp(req->method, "head")) {
+               if(!hasheader(req, "connection", "keep-alive"))
+                   break;
+           } else if((hd = getheader(resp, "content-length")) != NULL) {
+               dlen = atoo(hd);
+               if(passdata(out, in, dlen) != dlen)
                    break;
                if(!hasheader(req, "connection", "keep-alive"))
                    break;
@@ -289,11 +344,14 @@ void serve(FILE *in, struct conn *conn)
            if(hasheader(req, "connection", "close") || hasheader(resp, "connection", "close"))
                break;
        } else if(!strcmp(req->ver, "HTTP/1.1")) {
-           if((hd = getheader(resp, "content-length")) != NULL) {
+           if(!strcasecmp(req->method, "head")) {
+               writeresp(in, resp);
+               fprintf(in, "\r\n");
+           } else if((hd = getheader(resp, "content-length")) != NULL) {
                writeresp(in, resp);
                fprintf(in, "\r\n");
-               dlen = passdata(out, in, -1);
-               if(dlen != atoo(hd))
+               dlen = atoo(hd);
+               if(passdata(out, in, dlen) != dlen)
                    break;
            } else if(!getheader(resp, "transfer-encoding")) {
                headappheader(resp, "Transfer-Encoding", "chunked");
@@ -351,6 +409,26 @@ static void plexwatch(struct muth *muth, va_list args)
     }
 }
 
+static void initroot(void *uu)
+{
+    int fd;
+    
+    if(daemonize) {
+       setsid();
+       chdir("/");
+       if((fd = open("/dev/null", O_RDWR)) >= 0) {
+           dup2(fd, 0);
+           dup2(fd, 1);
+           dup2(fd, 2);
+           close(fd);
+       }
+    }
+    if(usesyslog)
+       putenv("ASHD_USESYSLOG=1");
+    else
+       unsetenv("ASHD_USESYSLOG");
+}
+
 static void usage(FILE *out)
 {
     fprintf(out, "usage: htparser [-hSf] [-u USER] [-r ROOT] [-p PIDFILE] PORTSPEC... -- ROOT [ARGS...]\n");
@@ -407,12 +485,11 @@ int main(int argc, char **argv)
 {
     int c;
     int i, s1;
-    int daemonize, logsys;
     char *root;
     FILE *pidout;
     struct passwd *pwent;
     
-    daemonize = logsys = 0;
+    daemonize = usesyslog = 0;
     root = NULL;
     pwent = NULL;
     while((c = getopt(argc, argv, "+hSfu:r:p:")) >= 0) {
@@ -424,7 +501,7 @@ int main(int argc, char **argv)
            daemonize = 1;
            break;
        case 'S':
-           logsys = 1;
+           usesyslog = 1;
            break;
        case 'u':
            if((pwent = getpwnam(optarg)) == NULL) {
@@ -454,7 +531,7 @@ int main(int argc, char **argv)
        usage(stderr);
        exit(1);
     }
-    if((plex = stdmkchild(argv + ++i)) < 0) {
+    if((plex = stdmkchild(argv + ++i, initroot, NULL)) < 0) {
        flog(LOG_ERR, "could not spawn root multiplexer: %s", strerror(errno));
        return(1);
     }
@@ -466,10 +543,10 @@ int main(int argc, char **argv)
            return(1);
        }
     }
-    if(logsys)
+    if(usesyslog)
        opensyslog();
     if(root) {
-       if(chroot(root)) {
+       if(chdir(root) || chroot(root)) {
            flog(LOG_ERR, "could not chroot to %s: %s", root, strerror(errno));
            exit(1);
        }