X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=blobdiff_plain;f=src%2Fhtparser.c;h=de5bbc2a61f32f93fa1ebe1db51c197fcd857840;hp=f489b2cfddeee7ae7595aacba94d2c5887d80899;hb=ecd4208b888be7f60bc2ae013b799861959b7cb9;hpb=61a14ba835c8f072bde823fdbd63d503687685e0

diff --git a/src/htparser.c b/src/htparser.c
index f489b2c..de5bbc2 100644
--- 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,26 @@
 #include "htparser.h"
 
 static int plex;
+static char *pidfile = NULL;
+static int daemonize, usesyslog;
+struct mtbuf listeners;
+
+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 +78,8 @@ static struct hthead *parsereq(FILE *in)
 	    goto fail;
 	} else {
 	    bufadd(method, c);
+	    if(method.d >= 128)
+		goto fail;
 	}
     }
     while(1) {
@@ -66,6 +90,8 @@ static struct hthead *parsereq(FILE *in)
 	    goto fail;
 	} else {
 	    bufadd(url, c);
+	    if(url.d >= 65536)
+		goto fail;
 	}
     }
     while(1) {
@@ -77,6 +103,8 @@ static struct hthead *parsereq(FILE *in)
 	    goto fail;
 	} else {
 	    bufadd(ver, c);
+	    if(ver.d >= 128)
+		goto fail;
 	}
     }
     bufadd(method, 0);
@@ -85,6 +113,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:
@@ -99,66 +128,6 @@ out:
     return(req);
 }
 
-static struct hthead *parseresp(FILE *in)
-{
-    struct hthead *req;
-    int code;
-    struct charbuf ver, msg;
-    int c;
-    
-    req = NULL;
-    bufinit(ver);
-    bufinit(msg);
-    code = 0;
-    while(1) {
-	c = getc(in);
-	if(c == ' ') {
-	    break;
-	} else if((c == EOF) || (c < 32) || (c >= 128)) {
-	    goto fail;
-	} else {
-	    bufadd(ver, c);
-	}
-    }
-    while(1) {
-	c = getc(in);
-	if(c == ' ') {
-	    break;
-	} else if((c == EOF) || (c < '0') || (c > '9')) {
-	    goto fail;
-	} else {
-	    code = (code * 10) + (c - '0');
-	}
-    }
-    while(1) {
-	c = getc(in);
-	if(c == 10) {
-	    break;
-	} else if(c == 13) {
-	} else if((c == EOF) || (c < 32)) {
-	    goto fail;
-	} else {
-	    bufadd(msg, c);
-	}
-    }
-    bufadd(msg, 0);
-    bufadd(ver, 0);
-    req = mkresp(code, msg.b, ver.b);
-    if(parseheaders(req, in))
-	goto fail;
-    goto out;
-    
-fail:
-    if(req != NULL) {
-	freehthead(req);
-	req = NULL;
-    }
-out:
-    buffree(msg);
-    buffree(ver);
-    return(req);
-}
-
 static off_t passdata(FILE *in, FILE *out, off_t max)
 {
     size_t read;
@@ -180,6 +149,59 @@ static off_t passdata(FILE *in, FILE *out, off_t max)
     return(total);
 }
 
+static int recvchunks(FILE *in, FILE *out)
+{
+    char buf[8192];
+    size_t read, chlen;
+    int c, r;
+    
+    while(1) {
+	chlen = 0;
+	r = 0;
+	while(1) {
+	    c = getc(in);
+	    if(c == 10) {
+		if(!r)
+		    return(-1);
+		break;
+	    } else if(c == 13) {
+	    } else if((c >= '0') && (c <= '9')) {
+		chlen = (chlen << 4) + (c - '0');
+		r = 1;
+	    } else if((c >= 'A') && (c <= 'F')) {
+		chlen = (chlen << 4) + (c + 10 - 'A');
+		r = 1;
+	    } else if((c >= 'a') && (c <= 'f')) {
+		chlen = (chlen << 4) + (c + 10 - 'a');
+		r = 1;
+	    } else {
+		/* XXX: Technically, there may be chunk extensions to
+		 * be read, but since that will likely never actually
+		 * happen in practice, I can just as well add support
+		 * for that if it actually does become relevant. */
+		return(-1);
+	    }
+	}
+	if(chlen == 0)
+	    break;
+	while(chlen > 0) {
+	    read = fread(buf, 1, min(sizeof(buf), chlen), in);
+	    if(feof(in) || ferror(in))
+		return(-1);
+	    if(fwrite(buf, 1, read, out) != read)
+		return(-1);
+	    chlen -= read;
+	}
+	if((getc(in) != 13) || (getc(in) != 10))
+	    return(-1);
+    }
+    /* XXX: Technically, there may be trailers to be read, but that's
+     * just about as likely as chunk extensions. */
+    if((getc(in) != 13) || (getc(in) != 10))
+	return(-1);
+    return(0);
+}
+
 static int passchunks(FILE *in, FILE *out)
 {
     char buf[8192];
@@ -206,29 +228,79 @@ 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);
+}
+
+static int http10keep(struct hthead *req, struct hthead *resp)
+{
+    int fc;
+    
+    fc = hasheader(resp, "connection", "close");
+    headrmheader(resp, "connection");
+    if(!fc && hasheader(req, "connection", "keep-alive")) {
+	headappheader(resp, "Connection", "Keep-Alive");
+	return(1);
+    } else {
+	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;
+    int keep;
     
     out = NULL;
     req = resp = NULL;
-    while(1) {
+    while(plex >= 0) {
 	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;
 	
-	if(block(plex, EV_WRITE, 60) <= 0)
+	if((plex < 0) || block(plex, EV_WRITE, 60) <= 0)
 	    break;
 	if(socketpair(PF_UNIX, SOCK_STREAM, 0, pfds))
 	    break;
@@ -237,11 +309,19 @@ void serve(FILE *in, struct conn *conn)
 	close(pfds[0]);
 	out = mtstdopen(pfds[1], 1, 600, "r+");
 
-	if((hd = getheader(req, "content-length")) != NULL) {
-	    dlen = atoo(hd);
-	    if(dlen > 0) {
-		if(passdata(in, out, dlen) != dlen)
+	if(getheader(req, "content-type") != NULL) {
+	    if((hd = getheader(req, "content-length")) != NULL) {
+		dlen = atoo(hd);
+		if(dlen > 0) {
+		    if(passdata(in, out, dlen) != dlen)
+			break;
+		}
+	    } else if(((hd = getheader(req, "transfer-encoding")) != NULL) && !strcasecmp(hd, "chunked")) {
+		if(recvchunks(in, out))
 		    break;
+	    } else {
+		/* Ignore rather than abort, to be kinder to broken clients. */
+		headrmheader(req, "content-type");
 	    }
 	}
 	if(fflush(out))
@@ -249,31 +329,43 @@ void serve(FILE *in, struct conn *conn)
 	/* Make sure to send EOF */
 	shutdown(pfds[1], SHUT_WR);
 	
-	if((resp = parseresp(out)) == NULL)
+	if((resp = parseresponse(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))
-		    break;
-		if(!hasheader(req, "connection", "keep-alive"))
+	if(!strcasecmp(req->ver, "HTTP/1.0")) {
+	    if(!strcasecmp(req->method, "head")) {
+		keep = http10keep(req, resp);
+		writeresp(in, resp);
+		fprintf(in, "\r\n");
+	    } else if((hd = getheader(resp, "content-length")) != NULL) {
+		keep = http10keep(req, resp);
+		dlen = atoo(hd);
+		writeresp(in, resp);
+		fprintf(in, "\r\n");
+		if(passdata(out, in, dlen) != dlen)
 		    break;
 	    } else {
+		headrmheader(resp, "connection");
+		writeresp(in, resp);
+		fprintf(in, "\r\n");
 		passdata(out, in, -1);
 		break;
 	    }
-	    if(hasheader(req, "connection", "close") || hasheader(resp, "connection", "close"))
+	    if(!keep)
 		break;
-	} else if(!strcmp(req->ver, "HTTP/1.1")) {
-	    if((hd = getheader(resp, "content-length")) != NULL) {
+	} else if(!strcasecmp(req->ver, "HTTP/1.1")) {
+	    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");
@@ -313,29 +405,59 @@ static void plexwatch(struct muth *muth, va_list args)
 {
     vavar(int, fd);
     char *buf;
-    int ret;
+    int i, ret;
     
     while(1) {
-	block(fd, EV_READ, 0);
+	if(block(fd, EV_READ, 0) == 0)
+	    break;
 	buf = smalloc(65536);
 	ret = recv(fd, buf, 65536, 0);
 	if(ret < 0) {
 	    flog(LOG_WARNING, "received error on rootplex read channel: %s", strerror(errno));
 	    exit(1);
 	} else if(ret == 0) {
-	    exit(0);
+	    free(buf);
+	    break;
 	}
 	/* Maybe I'd like to implement some protocol in this direction
 	 * some day... */
 	free(buf);
     }
+    shutdown(plex, SHUT_RDWR);
+    for(i = 0; i < listeners.d; i++) {
+	if(listeners.b[i] == muth)
+	    bufdel(listeners, i);
+    }
+    flog(LOG_INFO, "root handler exited, so shutting down listening...");
+    while(listeners.d > 0)
+	resume(listeners.b[0], 0);
+}
+
+static void initroot(void *uu)
+{
+    int fd;
+    
+    setsid();
+    if(daemonize) {
+	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 +492,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);
@@ -379,18 +505,23 @@ static void addport(char *spec)
     buffree(vals);
 }
 
+static void sighandler(int sig)
+{
+    exitioloop(1);
+}
+
 int main(int argc, char **argv)
 {
-    int c;
+    int c, d;
     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 +530,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,6 +541,9 @@ int main(int argc, char **argv)
 	case 'r':
 	    root = optarg;
 	    break;
+	case 'p':
+	    pidfile = optarg;
+	    break;
 	default:
 	    usage(stderr);
 	    exit(1);
@@ -426,15 +560,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)
+    bufadd(listeners, 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(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);
 	}
@@ -449,9 +590,33 @@ int main(int argc, char **argv)
 	    exit(1);
 	}
     }
+    signal(SIGPIPE, SIG_IGN);
+    signal(SIGCHLD, SIG_IGN);
+    signal(SIGINT, sighandler);
+    signal(SIGTERM, sighandler);
     if(daemonize) {
 	daemon(0, 0);
     }
-    ioloop();
+    if(pidout != NULL) {
+	fprintf(pidout, "%i\n", getpid());
+	fclose(pidout);
+    }
+    d = 0;
+    while(!d) {
+	switch(ioloop()) {
+	case 0:
+	    d = 1;
+	    break;
+	case 1:
+	    if(listeners.d > 0) {
+		while(listeners.d > 0)
+		    resume(listeners.b[0], 0);
+		flog(LOG_INFO, "no longer listening");
+	    } else {
+		d = 1;
+	    }
+	    break;
+	}
+    }
     return(0);
 }