X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=blobdiff_plain;f=src%2Fhtparser.c;h=bc8f7fd3a5f7be4fe27509bdf9d29eaa7ef34cd2;hp=953ddac89f5faaa64ccb2691b50682c98b1f16de;hb=64a9096a7cd4acf3bbf4a7bf4a214f4b5cca7fdc;hpb=f0cbd8d7d17f9da506af58f1ce5364ade86d574e diff --git a/src/htparser.c b/src/htparser.c index 953ddac..bc8f7fd 100644 --- a/src/htparser.c +++ b/src/htparser.c @@ -19,9 +19,11 @@ #include #include #include +#include #include #include #include +#include #include #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: @@ -118,6 +146,8 @@ static struct hthead *parseresp(FILE *in) goto fail; } else { bufadd(ver, c); + if(ver.d >= 128) + goto fail; } } while(1) { @@ -128,6 +158,8 @@ static struct hthead *parseresp(FILE *in) goto fail; } else { code = (code * 10) + (c - '0'); + if(code >= 10000) + goto fail; } } while(1) { @@ -139,6 +171,8 @@ static struct hthead *parseresp(FILE *in) goto fail; } else { bufadd(msg, c); + if(msg.d >= 512) + goto fail; } } bufadd(msg, 0); @@ -206,12 +240,50 @@ 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); +} + void serve(FILE *in, struct conn *conn) { int pfds[2]; FILE *out; struct hthead *req, *resp; - char *hd, *p; + char *hd; off_t dlen; out = NULL; @@ -219,11 +291,8 @@ void serve(FILE *in, struct conn *conn) while(1) { 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; @@ -252,13 +321,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 +344,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 +409,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 +468,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 +485,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 +501,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 +512,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 +531,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 +561,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); }