Imposed some limits on request parts.

[ashd.git] / src / htparser.c

diff --git a/src/htparser.c b/src/htparser.c
index 953ddac..1ed9175 100644 (file)
--- a/src/htparser.c
+++ b/src/htparser.c
@@ -19,9 +19,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
+#include <fcntl.h>
 #include <string.h>
 #include <sys/socket.h>
 #include <pwd.h>
+#include <sys/signal.h>
 #include <errno.h>
 
 #ifdef HAVE_CONFIG_H
@@ -37,6 +39,25 @@
 #include "htparser.h"
 
 static int plex;
+static char *pidfile = NULL;
+static int daemonize, usesyslog;
+
+static void trimx(struct hthead *req)
+{
+    int i;
+    
+    i = 0;
+    while(i < req->noheaders) {
+       if(!strncasecmp(req->headers[i][0], "x-ash-", 6)) {
+           free(req->headers[i][0]);
+           free(req->headers[i][1]);
+           free(req->headers[i]);
+           memmove(req->headers + i, req->headers + i + 1, sizeof(*req->headers) * (--req->noheaders - i));
+       } else {
+           i++;
+       }
+    }
+}
 
 static struct hthead *parsereq(FILE *in)
 {
@@ -56,6 +77,8 @@ static struct hthead *parsereq(FILE *in)
            goto fail;
        } else {
            bufadd(method, c);
+           if(method.d >= 128)
+               goto fail;
        }
     }
     while(1) {
@@ -66,6 +89,8 @@ static struct hthead *parsereq(FILE *in)
            goto fail;
        } else {
            bufadd(url, c);
+           if(url.d >= 65536)
+               goto fail;
        }
     }
     while(1) {
@@ -77,6 +102,8 @@ static struct hthead *parsereq(FILE *in)
            goto fail;
        } else {
            bufadd(ver, c);
+           if(ver.d >= 128)
+               goto fail;
        }
     }
     bufadd(method, 0);
@@ -85,6 +112,7 @@ static struct hthead *parsereq(FILE *in)
     req = mkreq(method.b, url.b, ver.b);
     if(parseheaders(req, in))
        goto fail;
+    trimx(req);
     goto out;
     
 fail:
@@ -252,13 +280,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;
@@ -269,11 +303,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");
-               dlen = passdata(out, in, -1);
-               if(dlen != atoo(hd))
+           } else if((hd = getheader(resp, "content-length")) != NULL) {
+               writeresp(in, resp);
+               fprintf(in, "\r\n");
+               dlen = atoo(hd);
+               if(passdata(out, in, dlen) != dlen)
                    break;
            } else if(!getheader(resp, "transfer-encoding")) {
                headappheader(resp, "Transfer-Encoding", "chunked");
@@ -331,11 +368,31 @@ 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] PORTSPEC... -- ROOT [ARGS...]\n");
+    fprintf(out, "usage: htparser [-hSf] [-u USER] [-r ROOT] [-p PIDFILE] PORTSPEC... -- ROOT [ARGS...]\n");
     fprintf(out, "\twhere PORTSPEC is HANDLER[:PAR[=VAL][(,PAR[=VAL])...]] (try HANDLER:help)\n");
-    fprintf(out, "\tavailable handlers are `plain'.\n");
+    fprintf(out, "\tavailable handlers are `plain' and `ssl'.\n");
 }
 
 static void addport(char *spec)
@@ -370,6 +427,10 @@ static void addport(char *spec)
     /* XXX: It would be nice to decentralize this, but, meh... */
     if(!strcmp(nm, "plain")) {
        handleplain(pars.d, pars.b, vals.b);
+#ifdef HAVE_GNUTLS
+    } else if(!strcmp(nm, "ssl")) {
+       handlegnussl(pars.d, pars.b, vals.b);
+#endif
     } else {
        flog(LOG_ERR, "htparser: unknown port handler `%s'", nm);
        exit(1);
@@ -383,14 +444,14 @@ 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:")) >= 0) {
+    while((c = getopt(argc, argv, "+hSfu:r:p:")) >= 0) {
        switch(c) {
        case 'h':
            usage(stdout);
@@ -399,7 +460,7 @@ int main(int argc, char **argv)
            daemonize = 1;
            break;
        case 'S':
-           logsys = 1;
+           usesyslog = 1;
            break;
        case 'u':
            if((pwent = getpwnam(optarg)) == NULL) {
@@ -410,15 +471,14 @@ int main(int argc, char **argv)
        case 'r':
            root = optarg;
            break;
+       case 'p':
+           pidfile = optarg;
+           break;
        default:
            usage(stderr);
            exit(1);
        }
     }
-    if((argc - optind) < 3) {
-       usage(stderr);
-       exit(1);
-    }
     s1 = 0;
     for(i = optind; i < argc; i++) {
        if(!strcmp(argv[i], "--"))
@@ -430,15 +490,22 @@ 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);
     }
     mustart(plexwatch, plex);
-    if(logsys)
+    pidout = NULL;
+    if(pidfile != NULL) {
+       if((pidout = fopen(pidfile, "w")) == NULL) {
+           flog(LOG_ERR, "could not open %s for writing: %s", pidfile, strerror(errno));
+           return(1);
+       }
+    }
+    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);
        }
@@ -453,9 +520,14 @@ int main(int argc, char **argv)
            exit(1);
        }
     }
+    signal(SIGPIPE, SIG_IGN);
     if(daemonize) {
        daemon(0, 0);
     }
+    if(pidout != NULL) {
+       fprintf(pidout, "%i\n", getpid());
+       fclose(pidout);
+    }
     ioloop();
     return(0);
 }