#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
#include "htparser.h"
static int plex;
+static char *pidfile = NULL;
+static int daemonize, usesyslog;
+struct mtbuf listeners;
static void trimx(struct hthead *req)
{
goto fail;
} else {
bufadd(method, c);
+ if(method.d >= 128)
+ goto fail;
}
}
while(1) {
goto fail;
} else {
bufadd(url, c);
+ if(url.d >= 65536)
+ goto fail;
}
}
while(1) {
goto fail;
} else {
bufadd(ver, c);
+ if(ver.d >= 128)
+ goto fail;
}
}
bufadd(method, 0);
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;
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];
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;
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))
/* 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");
{
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' and `ssl'.\n");
}
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);
daemonize = 1;
break;
case 'S':
- logsys = 1;
+ usesyslog = 1;
break;
case 'u':
if((pwent = getpwnam(optarg)) == NULL) {
case 'r':
root = optarg;
break;
+ case 'p':
+ pidfile = optarg;
+ break;
default:
usage(stderr);
exit(1);
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);
}
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);
}
Dolda2000 GitWeb / ashd.git / blobdiff