Added an initial implementation of HTTPS.

[ashd.git] / src / htparser.c

diff --git a/src/htparser.c b/src/htparser.c
index 0c9d6ba..4835549 100644 (file)
--- a/src/htparser.c
+++ b/src/htparser.c
@@ -21,8 +21,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
+#include <pwd.h>
 #include <errno.h>
 
 #ifdef HAVE_CONFIG_H
@@ -39,6 +38,23 @@
 
 static int plex;
 
+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)
 {
     struct hthead *req;
@@ -86,6 +102,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:
@@ -334,9 +351,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] 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 +388,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 +405,38 @@ int main(int argc, char **argv)
 {
     int c;
     int i, s1;
+    int daemonize, logsys;
+    char *root;
+    struct passwd *pwent;
     
-    while((c = getopt(argc, argv, "+h")) >= 0) {
+    daemonize = logsys = 0;
+    root = NULL;
+    pwent = NULL;
+    while((c = getopt(argc, argv, "+hSfu:r:")) >= 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;
        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], "--"))
@@ -415,6 +453,27 @@ int main(int argc, char **argv)
        return(1);
     }
     mustart(plexwatch, plex);
+    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);
+       }
+    }
+    if(daemonize) {
+       daemon(0, 0);
+    }
     ioloop();
     return(0);
 }