X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=blobdiff_plain;f=src%2Fhtparser.c;h=1ed91754f78f36d62c6de672fb7c1a06a9a3fff8;hp=cec52dc3984d56488ee4fab84540993a1dd33fff;hb=90b0ba0f9d93e454cc08a566b718abdcbfd0d9f6;hpb=a701d7b797668c33d90c6410331cd7b599f62830 diff --git a/src/htparser.c b/src/htparser.c index cec52dc..1ed9175 100644 --- a/src/htparser.c +++ b/src/htparser.c @@ -19,10 +19,11 @@ #include #include #include +#include #include #include -#include -#include +#include +#include #include #ifdef HAVE_CONFIG_H @@ -35,54 +36,27 @@ #include #include -static int plex; +#include "htparser.h" -static int listensock4(int port) -{ - struct sockaddr_in name; - int fd; - int valbuf; - - memset(&name, 0, sizeof(name)); - name.sin_family = AF_INET; - name.sin_port = htons(port); - if((fd = socket(PF_INET, SOCK_STREAM, 0)) < 0) - return(-1); - valbuf = 1; - setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &valbuf, sizeof(valbuf)); - if(bind(fd, (struct sockaddr *)&name, sizeof(name))) { - close(fd); - return(-1); - } - if(listen(fd, 16) < 0) { - close(fd); - return(-1); - } - return(fd); -} +static int plex; +static char *pidfile = NULL; +static int daemonize, usesyslog; -static int listensock6(int port) +static void trimx(struct hthead *req) { - struct sockaddr_in6 name; - int fd; - int valbuf; + int i; - memset(&name, 0, sizeof(name)); - name.sin6_family = AF_INET6; - name.sin6_port = htons(port); - if((fd = socket(PF_INET6, SOCK_STREAM, 0)) < 0) - return(-1); - valbuf = 1; - setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &valbuf, sizeof(valbuf)); - if(bind(fd, (struct sockaddr *)&name, sizeof(name))) { - close(fd); - return(-1); - } - if(listen(fd, 16) < 0) { - close(fd); - return(-1); + 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++; + } } - return(fd); } static struct hthead *parsereq(FILE *in) @@ -103,6 +77,8 @@ static struct hthead *parsereq(FILE *in) goto fail; } else { bufadd(method, c); + if(method.d >= 128) + goto fail; } } while(1) { @@ -113,6 +89,8 @@ static struct hthead *parsereq(FILE *in) goto fail; } else { bufadd(url, c); + if(url.d >= 65536) + goto fail; } } while(1) { @@ -124,6 +102,8 @@ static struct hthead *parsereq(FILE *in) goto fail; } else { bufadd(ver, c); + if(ver.d >= 128) + goto fail; } } bufadd(method, 0); @@ -132,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: @@ -213,7 +194,7 @@ static off_t passdata(FILE *in, FILE *out, off_t max) char buf[8192]; total = 0; - while(!feof(in) && (total < max)) { + while(!feof(in) && ((max < 0) || (total < max))) { read = sizeof(buf); if(max >= 0) read = min(max - total, read); @@ -236,7 +217,7 @@ static int passchunks(FILE *in, FILE *out) read = fread(buf, 1, sizeof(buf), in); if(ferror(in)) return(-1); - fprintf(out, "%x\r\n", read); + fprintf(out, "%zx\r\n", read); if(fwrite(buf, 1, read, out) != read) return(-1); fprintf(out, "\r\n"); @@ -253,18 +234,14 @@ static int hasheader(struct hthead *head, char *name, char *val) return(!strcasecmp(hd, val)); } -static void serve(struct muth *muth, va_list args) +void serve(FILE *in, struct conn *conn) { - vavar(int, fd); - vavar(struct sockaddr_storage, name); int pfds[2]; - FILE *in, *out; + FILE *out; struct hthead *req, *resp; - char nmbuf[256]; char *hd, *p; off_t dlen; - in = mtstdopen(fd, 1, 60, "r+"); out = NULL; req = resp = NULL; while(1) { @@ -276,14 +253,9 @@ static void serve(struct muth *muth, va_list args) if((p = strchr(req->rest, '?')) != NULL) *p = 0; - if(name.ss_family == AF_INET) { - headappheader(req, "X-Ash-Address", inet_ntop(AF_INET, &((struct sockaddr_in *)&name)->sin_addr, nmbuf, sizeof(nmbuf))); - headappheader(req, "X-Ash-Port", sprintf3("%i", ntohs(((struct sockaddr_in *)&name)->sin_port))); - } else if(name.ss_family == AF_INET6) { - headappheader(req, "X-Ash-Address", inet_ntop(AF_INET6, &((struct sockaddr_in6 *)&name)->sin6_addr, nmbuf, sizeof(nmbuf))); - headappheader(req, "X-Ash-Port", sprintf3("%i", ntohs(((struct sockaddr_in6 *)&name)->sin6_port))); - } - + if((conn->initreq != NULL) && conn->initreq(conn, req)) + break; + if(block(plex, EV_WRITE, 60) <= 0) break; if(socketpair(PF_UNIX, SOCK_STREAM, 0, pfds)) @@ -305,15 +277,22 @@ static void serve(struct muth *muth, va_list args) /* Make sure to send EOF */ shutdown(pfds[1], SHUT_WR); - resp = parseresp(out); + 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; @@ -324,11 +303,14 @@ static void serve(struct muth *muth, va_list args) 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"); @@ -364,28 +346,6 @@ static void serve(struct muth *muth, va_list args) fclose(in); } -static void listenloop(struct muth *muth, va_list args) -{ - vavar(int, ss); - int ns; - struct sockaddr_storage name; - socklen_t namelen; - - while(1) { - namelen = sizeof(name); - block(ss, EV_READ, 0); - ns = accept(ss, (struct sockaddr *)&name, &namelen); - if(ns < 0) { - flog(LOG_ERR, "accept: %s", strerror(errno)); - goto out; - } - mustart(serve, ns, name); - } - -out: - close(ss); -} - static void plexwatch(struct muth *muth, va_list args) { vavar(int, fd); @@ -408,32 +368,166 @@ static void plexwatch(struct muth *muth, va_list args) } } -int main(int argc, char **argv) +static void initroot(void *uu) { int fd; - if(argc < 2) { - fprintf(stderr, "usage: htparser ROOT [ARGS...]\n"); + 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"); + fprintf(out, "\twhere PORTSPEC is HANDLER[:PAR[=VAL][(,PAR[=VAL])...]] (try HANDLER:help)\n"); + fprintf(out, "\tavailable handlers are `plain' and `ssl'.\n"); +} + +static void addport(char *spec) +{ + char *nm, *p, *p2, *n; + struct charvbuf pars, vals; + + bufinit(pars); + bufinit(vals); + if((p = strchr(spec, ':')) == NULL) { + nm = spec; + } else { + nm = spec; + *(p++) = 0; + do { + if((n = strchr(p, ',')) != NULL) + *(n++) = 0; + if((p2 = strchr(p, '=')) != NULL) + *(p2++) = 0; + if(!*p) { + usage(stderr); + exit(1); + } + bufadd(pars, p); + if(p2) + bufadd(vals, p2); + else + bufadd(vals, ""); + } while((p = n) != NULL); + } + + /* 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); } - if((plex = stdmkchild(argv + 1)) < 0) { - flog(LOG_ERR, "could not spawn root multiplexer: %s", strerror(errno)); - return(1); + + buffree(pars); + buffree(vals); +} + +int main(int argc, char **argv) +{ + int c; + int i, s1; + char *root; + FILE *pidout; + struct passwd *pwent; + + daemonize = usesyslog = 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': + usesyslog = 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((fd = listensock6(8080)) < 0) { - flog(LOG_ERR, "could not listen on IPv6: %s", strerror(errno)); + s1 = 0; + for(i = optind; i < argc; i++) { + if(!strcmp(argv[i], "--")) + break; + s1 = 1; + addport(argv[i]); + } + if(!s1 || (i == argc)) { + usage(stderr); + exit(1); + } + if((plex = stdmkchild(argv + ++i, initroot, NULL)) < 0) { + flog(LOG_ERR, "could not spawn root multiplexer: %s", strerror(errno)); return(1); } - mustart(listenloop, fd); - if((fd = listensock4(8080)) < 0) { - if(errno != EADDRINUSE) { - flog(LOG_ERR, "could not listen on IPv4: %s", strerror(errno)); + 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); } - } else { - mustart(listenloop, fd); } - mustart(plexwatch, plex); + if(usesyslog) + opensyslog(); + if(root) { + if(chdir(root) || 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); }