htparser: Handle HEAD requests properly.

[ashd.git] / src / htparser.c

diff --git a/src/htparser.c b/src/htparser.c
index 0c9d6ba..4325e97 100644 (file)
--- a/src/htparser.c
+++ b/src/htparser.c
@@ -21,8 +21,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
+#include <pwd.h>
+#include <sys/signal.h>
 #include <errno.h>
 
 #ifdef HAVE_CONFIG_H
@@ -38,6 +38,24 @@
 #include "htparser.h"
 
 static int plex;
+static char *pidfile = NULL;
+
+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)
 {
@@ -86,6 +104,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:
@@ -257,7 +276,10 @@ void serve(FILE *in, struct conn *conn)
        if(!strcmp(req->ver, "HTTP/1.0")) {
            writeresp(in, resp);
            fprintf(in, "\r\n");
-           if((hd = getheader(resp, "content-length")) != NULL) {
+           if(!strcasecmp(req->method, "head")) {
+               if(!hasheader(req, "connection", "keep-alive"))
+                   break;
+           } else if((hd = getheader(resp, "content-length")) != NULL) {
                dlen = passdata(out, in, -1);
                if(dlen != atoo(hd))
                    break;
@@ -270,7 +292,10 @@ 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);
@@ -334,9 +359,9 @@ static void plexwatch(struct muth *muth, va_list args)
 
 static void usage(FILE *out)
 {
-    fprintf(out, "usage: htparser [-h] 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)
@@ -371,6 +396,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);
@@ -384,21 +413,42 @@ int main(int argc, char **argv)
 {
     int c;
     int i, s1;
+    int daemonize, logsys;
+    char *root;
+    FILE *pidout;
+    struct passwd *pwent;
     
-    while((c = getopt(argc, argv, "+h")) >= 0) {
+    daemonize = logsys = 0;
+    root = NULL;
+    pwent = NULL;
+    while((c = getopt(argc, argv, "+hSfu:r:p:")) >= 0) {
        switch(c) {
        case 'h':
            usage(stdout);
            exit(0);
+       case 'f':
+           daemonize = 1;
+           break;
+       case 'S':
+           logsys = 1;
+           break;
+       case 'u':
+           if((pwent = getpwnam(optarg)) == NULL) {
+               flog(LOG_ERR, "could not find user %s", optarg);
+               exit(1);
+           }
+           break;
+       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], "--"))
@@ -410,11 +460,44 @@ int main(int argc, char **argv)
        usage(stderr);
        exit(1);
     }
-    if((plex = stdmkchild(argv + ++i)) < 0) {
+    if((plex = stdmkchild(argv + ++i, NULL, NULL)) < 0) {
        flog(LOG_ERR, "could not spawn root multiplexer: %s", strerror(errno));
        return(1);
     }
     mustart(plexwatch, plex);
+    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(logsys)
+       opensyslog();
+    if(root) {
+       if(chroot(root)) {
+           flog(LOG_ERR, "could not chroot to %s: %s", root, strerror(errno));
+           exit(1);
+       }
+    }
+    if(pwent) {
+       if(setgid(pwent->pw_gid)) {
+           flog(LOG_ERR, "could not switch group to %i: %s", (int)pwent->pw_gid, strerror(errno));
+           exit(1);
+       }
+       if(setuid(pwent->pw_uid)) {
+           flog(LOG_ERR, "could not switch user to %i: %s", (int)pwent->pw_uid, strerror(errno));
+           exit(1);
+       }
+    }
+    signal(SIGPIPE, SIG_IGN);
+    if(daemonize) {
+       daemon(0, 0);
+    }
+    if(pidout != NULL) {
+       fprintf(pidout, "%i\n", getpid());
+       fclose(pidout);
+    }
     ioloop();
     return(0);
 }