#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
+#include <fcntl.h>
#include <string.h>
-#include <sys/select.h>
#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
+#include <pwd.h>
+#include <sys/signal.h>
#include <errno.h>
-#include <time.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <utils.h>
#include <mt.h>
+#include <mtio.h>
#include <log.h>
#include <req.h>
#include <proc.h>
+#include <bufio.h>
-#define EV_READ 1
-#define EV_WRITE 2
+#include "htparser.h"
-struct blocker {
- struct blocker *n, *p;
- int fd;
- int ev;
- time_t to;
- struct muth *th;
-};
-
-static struct blocker *blockers;
-int plex;
+static int plex;
+static char *pidfile = NULL;
+static int daemonize, usesyslog;
+struct mtbuf listeners;
-static int block(int fd, int ev, time_t to)
+static void trimx(struct hthead *req)
{
- struct blocker *bl;
- int rv;
+ int i;
- omalloc(bl);
- bl->fd = fd;
- bl->ev = ev;
- if(to > 0)
- bl->to = time(NULL) + to;
- bl->th = current;
- bl->n = blockers;
- if(blockers)
- blockers->p = bl;
- blockers = bl;
- rv = yield();
- if(bl->n)
- bl->n->p = bl->p;
- if(bl->p)
- bl->p->n = bl->n;
- if(bl == blockers)
- blockers = bl->n;
- return(rv);
+ 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 int listensock4(int port)
+static struct hthead *parsereq(struct bufio *in)
{
- struct sockaddr_in name;
- int fd;
- int valbuf;
+ struct hthead *req;
+ struct charbuf method, url, ver;
+ int c;
- 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);
+ req = NULL;
+ bufinit(method);
+ bufinit(url);
+ bufinit(ver);
+ while(1) {
+ c = biogetc(in);
+ if(c == ' ') {
+ break;
+ } else if((c == EOF) || (c < 32) || (c >= 128)) {
+ goto fail;
+ } else {
+ bufadd(method, c);
+ if(method.d >= 128)
+ goto fail;
+ }
}
- if(listen(fd, 16) < 0) {
- close(fd);
- return(-1);
+ while(1) {
+ c = biogetc(in);
+ if(c == ' ') {
+ break;
+ } else if((c == EOF) || (c < 32)) {
+ goto fail;
+ } else {
+ bufadd(url, c);
+ if(url.d >= 65536)
+ goto fail;
+ }
+ }
+ while(1) {
+ c = biogetc(in);
+ if(c == 10) {
+ break;
+ } else if(c == 13) {
+ } else if((c == EOF) || (c < 32) || (c >= 128)) {
+ goto fail;
+ } else {
+ bufadd(ver, c);
+ if(ver.d >= 128)
+ goto fail;
+ }
}
- return(fd);
+ bufadd(method, 0);
+ bufadd(url, 0);
+ bufadd(ver, 0);
+ req = mkreq(method.b, url.b, ver.b);
+ if(parseheadersb(req, in))
+ goto fail;
+ trimx(req);
+ goto out;
+
+fail:
+ if(req != NULL) {
+ freehthead(req);
+ req = NULL;
+ }
+out:
+ buffree(method);
+ buffree(url);
+ buffree(ver);
+ return(req);
}
-static int listensock6(int port)
+static off_t passdata(struct bufio *in, struct bufio *out, off_t max)
{
- struct sockaddr_in6 name;
- int fd;
- int valbuf;
+ ssize_t read;
+ off_t total;
- 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);
+ total = 0;
+ while(!bioeof(in) && ((max < 0) || (total < max))) {
+ if((read = biordata(in)) > 0) {
+ if(max >= 0)
+ read = min(max - total, read);
+ if((read = biowritesome(out, in->rbuf.b + in->rh, read)) < 0)
+ return(-1);
+ in->rh += read;
+ total += read;
+ }
+ if(biorspace(in) && ((max < 0) || (biordata(in) < max - total)) && (biofillsome(in) < 0))
+ return(-1);
}
- return(fd);
+ return(total);
}
-static size_t readhead(int fd, struct charbuf *buf)
+static int recvchunks(struct bufio *in, struct bufio *out)
{
- int nl;
- size_t off;
+ ssize_t read, chlen;
+ int c, r;
- int get1(void)
- {
- int ret;
-
- while(!(off < buf->d)) {
- sizebuf(*buf, buf->d + 1024);
- ret = recv(fd, buf->b + buf->d, buf->s - buf->d, MSG_DONTWAIT);
- if(ret <= 0) {
- if((ret < 0) && (errno == EAGAIN)) {
- if(block(fd, EV_READ, 60) <= 0)
- return(-1);
- continue;
- }
+ while(1) {
+ chlen = 0;
+ r = 0;
+ while(1) {
+ c = biogetc(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);
}
- buf->d += ret;
}
- return(buf->b[off++]);
- }
-
- nl = 0;
- off = 0;
- while(1) {
- switch(get1()) {
- case '\n':
- if(nl)
- return(off);
- nl = 1;
- break;
- case '\r':
- break;
- case -1:
- return(-1);
- default:
- nl = 0;
+ if(chlen == 0)
break;
+ while(chlen > 0) {
+ if((read = biordata(in)) > 0) {
+ if((read = biowritesome(out, in->rbuf.b + in->rh, min(read, chlen))) < 0)
+ return(-1);
+ in->rh += read;
+ chlen -= read;
+ }
+ if(biorspace(in) && (biordata(in) < chlen) && (biofillsome(in) <= 0))
+ return(-1);
}
+ if((biogetc(in) != 13) || (biogetc(in) != 10))
+ return(-1);
}
+ /* XXX: Technically, there may be trailers to be read, but that's
+ * just about as likely as chunk extensions. */
+ if((biogetc(in) != 13) || (biogetc(in) != 10))
+ return(-1);
+ return(0);
}
-#define SKIPNL(ptr) ({ \
- int __buf__; \
- if(*(ptr) == '\r') \
- *((ptr)++) = 0; \
- if(*(ptr) != '\n') { \
- __buf__ = 0; \
- } else { \
- *((ptr)++) = 0; \
- __buf__ = 1; \
- } \
- __buf__;})
-static struct hthead *parserawreq(char *buf)
+static int passchunks(struct bufio *in, struct bufio *out)
{
- char *p, *p2, *nl;
- char *method, *url, *ver;
- struct hthead *req;
+ size_t read;
- if((nl = strchr(buf, '\n')) == NULL)
- return(NULL);
- if(((p = strchr(buf, ' ')) == NULL) || (p > nl))
- return(NULL);
- method = buf;
- *(p++) = 0;
- if(((p2 = strchr(p, ' ')) == NULL) || (p2 > nl))
- return(NULL);
- url = p;
- p = p2;
- *(p++) = 0;
- if(strncmp(p, "HTTP/", 5))
- return(NULL);
- ver = (p += 5);
- for(; ((*p >= '0') && (*p <= '9')) || (*p == '.'); p++);
- if(!SKIPNL(p))
- return(NULL);
-
- req = mkreq(method, url, ver);
- while(1) {
- if(SKIPNL(p)) {
- if(*p)
- goto fail;
- break;
+ while(!bioeof(in)) {
+ if((read = biordata(in)) > 0) {
+ bioprintf(out, "%zx\r\n", read);
+ if(biowrite(out, in->rbuf.b + in->rh, read) != read)
+ return(-1);
+ in->rh += read;
+ bioprintf(out, "\r\n");
+ if(bioflush(out) < 0)
+ return(-1);
}
- if((nl = strchr(p, '\n')) == NULL)
- goto fail;
- if(((p2 = strchr(p, ':')) == NULL) || (p2 > nl))
- goto fail;
- *(p2++) = 0;
- for(; (*p2 == ' ') || (*p2 == '\t'); p2++);
- for(nl = p2; (*nl != '\r') && (*nl != '\n'); nl++);
- if(!SKIPNL(nl))
- goto fail;
- if(strncasecmp(p, "x-ash-", 6))
- headappheader(req, p, p2);
- p = nl;
+ if(biorspace(in) && (biofillsome(in) < 0))
+ return(-1);
}
- return(req);
-
-fail:
- freehthead(req);
- return(NULL);
+ bioprintf(out, "0\r\n\r\n");
+ return(0);
}
-static struct hthead *parserawresp(char *buf)
+static int hasheader(struct hthead *head, char *name, char *val)
{
- char *p, *p2, *nl;
- char *msg, *ver;
- int code;
- struct hthead *resp;
+ char *hd;
- if((nl = strchr(buf, '\n')) == NULL)
- return(NULL);
- p = strchr(buf, '\r');
- if((p != NULL) && (p < nl))
- nl = p;
- if(strncmp(buf, "HTTP/", 5))
- return(NULL);
- ver = p = buf + 5;
- for(; ((*p >= '0') && (*p <= '9')) || (*p == '.'); p++);
- if(*p != ' ')
- return(NULL);
- *(p++) = 0;
- if(((p2 = strchr(p, ' ')) == NULL) || (p2 > nl))
- return(NULL);
- *(p2++) = 0;
- code = atoi(p);
- if((code < 100) || (code >= 600))
- return(NULL);
- if(p2 >= nl)
- return(NULL);
- msg = p2;
- p = nl;
- if(!SKIPNL(p))
- return(NULL);
+ if((hd = getheader(head, name)) == NULL)
+ return(0);
+ return(!strcasecmp(hd, val));
+}
- resp = mkresp(code, msg, ver);
- while(1) {
- if(SKIPNL(p)) {
- if(*p)
- goto fail;
- break;
+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);
}
- if((nl = strchr(p, '\n')) == NULL)
- goto fail;
- if(((p2 = strchr(p, ':')) == NULL) || (p2 > nl))
- goto fail;
- *(p2++) = 0;
- for(; (*p2 == ' ') || (*p2 == '\t'); p2++);
- for(nl = p2; (*nl != '\r') && (*nl != '\n'); nl++);
- if(!SKIPNL(nl))
- goto fail;
- headappheader(resp, p, p2);
- p = nl;
}
- return(resp);
+ return(0);
+}
+
+static int http10keep(struct hthead *req, struct hthead *resp)
+{
+ int fc;
-fail:
- freehthead(resp);
- return(NULL);
+ 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);
+ }
}
-static off_t passdata(int src, int dst, struct charbuf *buf, off_t max)
+static char *connid(void)
{
- size_t dataoff, smax;
- off_t sent;
- int eof, ret;
+ static struct charbuf cur;
+ int i;
+ char *ret;
+
+ for(i = 0; i < cur.d; i++) {
+ if((++cur.b[i]) > 'Z')
+ cur.b[i] = 'A';
+ else
+ goto done;
+ }
+ bufadd(cur, 'A');
+done:
+ ret = memcpy(smalloc(cur.d + 1), cur.b, cur.d);
+ ret[cur.d] = 0;
+ return(ret);
+}
- sent = 0;
- eof = 0;
- while(!eof || (buf->d > 0)) {
- if(!eof && (buf->d < buf->s) && ((max < 0) || (sent + buf->d < max))) {
- while(1) {
- ret = recv(src, buf->b + buf->d, buf->s - buf->d, MSG_DONTWAIT);
- if((ret < 0) && (errno == EAGAIN)) {
- } else if(ret < 0) {
- return(-1);
- } else if(ret == 0) {
- eof = 1;
- break;
- } else {
- buf->d += ret;
- break;
- }
- if(buf->d > 0)
- break;
- if(block(src, EV_READ, 0) <= 0)
- return(-1);
- }
+static void passduplex(struct bufio *a, int afd, struct bufio *b, int bfd)
+{
+ struct selected pfd[4], sel;
+ struct bufio *sio;
+ int n, ev;
+
+ while(!bioeof(a) && !bioeof(b)) {
+ biocopybuf(b, a);
+ biocopybuf(a, b);
+ n = 0;
+ if(!a->eof) {
+ ev = 0;
+ if(biorspace(a))
+ ev |= EV_READ;
+ if(biowdata(a))
+ ev |= EV_WRITE;
+ if(ev)
+ pfd[n++] = (struct selected){.fd = afd, .ev = ev};
}
- for(dataoff = 0; (dataoff < buf->d) && ((max < 0) || (sent < max));) {
- if(block(dst, EV_WRITE, 120) <= 0)
- return(-1);
- smax = buf->d - dataoff;
- if(sent + smax > max)
- smax = max - sent;
- ret = send(dst, buf->b + dataoff, smax, MSG_NOSIGNAL | MSG_DONTWAIT);
- if(ret < 0)
- return(-1);
- dataoff += ret;
- sent += ret;
+ if(!b->eof) {
+ ev = 0;
+ if(!b->eof && biorspace(b))
+ ev |= EV_READ;
+ if(biowdata(b))
+ ev |= EV_WRITE;
+ if(ev)
+ pfd[n++] = (struct selected){.fd = bfd, .ev = ev};
}
- bufeat(*buf, dataoff);
+ sel = mblock(600, n, pfd);
+ if(sel.fd == afd)
+ sio = a;
+ else if(sel.fd == bfd)
+ sio = b;
+ else
+ break;
+ if((sel.ev & EV_READ) && (biofillsome(sio) < 0))
+ break;
+ if((sel.ev & EV_WRITE) && (bioflushsome(sio) < 0))
+ break;
}
- return(sent);
}
-static void serve(struct muth *muth, va_list args)
+void serve(struct bufio *in, int infd, struct conn *conn)
{
- vavar(int, fd);
- vavar(struct sockaddr_storage, name);
- int cfd;
- char old;
- char *hd;
- struct charbuf inbuf, outbuf;
+ int pfds[2];
+ struct bufio *out, *dout;
+ struct stdiofd *outi;
struct hthead *req, *resp;
- off_t dlen, sent;
- size_t headoff;
- char nmbuf[256];
+ char *hd, *id;
+ off_t dlen;
+ int keep, duplex;
- bufinit(inbuf);
- bufinit(outbuf);
- cfd = -1;
- req = NULL;
- while(1) {
- /*
- * First, find and decode the header:
- */
- if((headoff = readhead(fd, &inbuf)) < 0)
- goto out;
- if(headoff > 65536) {
- /* We cannot handle arbitrarily large headers, as they
- * need to fit within a single Unix datagram. This is
- * probably a safe limit, and larger packets than this are
- * most likely erroneous (or malicious) anyway. */
- goto out;
- }
- old = inbuf.b[headoff];
- inbuf.b[headoff] = 0;
- if((req = parserawreq(inbuf.b)) == NULL)
- goto out;
- inbuf.b[headoff] = old;
- bufeat(inbuf, headoff);
- /* We strip off the leading slash from the rest string, so
- * that multiplexers can parse coherently. */
- if(req->rest[0] == '/')
- replrest(req, req->rest + 1);
+ id = connid();
+ out = NULL;
+ req = resp = NULL;
+ while(plex >= 0) {
+ bioflush(in);
+ if((req = parsereq(in)) == NULL)
+ break;
+ if(!canonreq(req))
+ break;
- /*
- * Add metainformation and then send the request to the root
- * multiplexer:
- */
- 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)));
- }
- cfd = sendreq(plex, req);
+ headappheader(req, "X-Ash-Connection-ID", id);
+ if((conn->initreq != NULL) && conn->initreq(conn, req))
+ break;
+
+ if((plex < 0) || block(plex, EV_WRITE, 60) <= 0)
+ break;
+ if(socketpair(PF_UNIX, SOCK_STREAM, 0, pfds))
+ break;
+ if(sendreq(plex, req, pfds[0]))
+ break;
+ close(pfds[0]);
+ out = mtbioopen(pfds[1], 1, 600, "r+", &outi);
- /*
- * If there is message data, pass it:
- */
- if((hd = getheader(req, "content-length")) != NULL) {
- dlen = atoo(hd);
- if(dlen > 0)
- passdata(fd, cfd, &inbuf, 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(bioflush(out))
+ break;
+ /* Make sure to send EOF */
+ shutdown(pfds[1], SHUT_WR);
- /*
- * Find and decode the response header:
- */
- outbuf.d = 0;
- headoff = readhead(cfd, &outbuf);
- hd = memcpy(smalloc(headoff + 1), outbuf.b, headoff);
- hd[headoff] = 0;
- if((resp = parserawresp(hd)) == NULL)
- goto out;
-
- /*
- * Pass the actual output:
- */
- sizebuf(outbuf, 65536);
- sent = passdata(cfd, fd, &outbuf, -1);
- sent -= headoff;
+ if((resp = parseresponseb(out)) == NULL)
+ break;
+ replstr(&resp->ver, req->ver);
- /*
- * Check for connection expiry
- */
- if(strcasecmp(req->method, "head")) {
- if((hd = getheader(resp, "content-length")) != NULL) {
- if(sent != atoo(hd)) {
- /* Exit because of error */
- goto out;
- }
- } else {
- if(((hd = getheader(resp, "transfer-encoding")) == NULL) || !strcasecmp(hd, "identity"))
+ if(!getheader(resp, "server"))
+ headappheader(resp, "Server", sprintf3("ashd/%s", VERSION));
+ duplex = hasheader(resp, "x-ash-switch", "duplex");
+ trimx(resp);
+
+ if(duplex) {
+ if(outi->rights < 0)
+ break;
+ writerespb(in, resp);
+ bioprintf(in, "\r\n");
+ dout = mtbioopen(outi->rights, 1, 600, "r+", NULL);
+ passduplex(in, infd, dout, outi->rights);
+ outi->rights = -1;
+ bioclose(dout);
+ break;
+ } else if(!strcasecmp(req->ver, "HTTP/1.0")) {
+ if(!strcasecmp(req->method, "head")) {
+ keep = http10keep(req, resp);
+ writerespb(in, resp);
+ bioprintf(in, "\r\n");
+ } else if((hd = getheader(resp, "content-length")) != NULL) {
+ keep = http10keep(req, resp);
+ dlen = atoo(hd);
+ writerespb(in, resp);
+ bioprintf(in, "\r\n");
+ if(passdata(out, in, dlen) != dlen)
break;
+ } else {
+ headrmheader(resp, "connection");
+ writerespb(in, resp);
+ bioprintf(in, "\r\n");
+ passdata(out, in, -1);
+ break;
}
- if(((hd = getheader(req, "connection")) != NULL) && !strcasecmp(hd, "close"))
+ if(!keep)
break;
- if(((hd = getheader(resp, "connection")) != NULL) && !strcasecmp(hd, "close"))
+ } else if(!strcasecmp(req->ver, "HTTP/1.1")) {
+ if(!strcasecmp(req->method, "head")) {
+ writerespb(in, resp);
+ bioprintf(in, "\r\n");
+ } else if((hd = getheader(resp, "content-length")) != NULL) {
+ writerespb(in, resp);
+ bioprintf(in, "\r\n");
+ dlen = atoo(hd);
+ if(passdata(out, in, dlen) != dlen)
+ break;
+ } else if(!getheader(resp, "transfer-encoding")) {
+ headappheader(resp, "Transfer-Encoding", "chunked");
+ writerespb(in, resp);
+ bioprintf(in, "\r\n");
+ if(passchunks(out, in))
+ break;
+ } else {
+ writerespb(in, resp);
+ bioprintf(in, "\r\n");
+ passdata(out, in, -1);
break;
+ }
+ if(hasheader(req, "connection", "close") || hasheader(resp, "connection", "close"))
+ break;
+ } else {
+ break;
}
-
- close(cfd);
- cfd = -1;
+
+ bioclose(out);
+ out = NULL;
freehthead(req);
- req = NULL;
freehthead(resp);
- resp = NULL;
+ req = resp = NULL;
}
-out:
- if(cfd >= 0)
- close(cfd);
+ if(out != NULL)
+ bioclose(out);
if(req != NULL)
freehthead(req);
if(resp != NULL)
freehthead(resp);
- buffree(inbuf);
- buffree(outbuf);
- close(fd);
+ bioclose(in);
+ free(id);
}
-static void listenloop(struct muth *muth, va_list args)
+static void plexwatch(struct muth *muth, va_list args)
{
- vavar(int, ss);
- int ns;
- struct sockaddr_storage name;
- socklen_t namelen;
+ vavar(int, fd);
+ char *buf;
+ int i, s, ret;
+ s = 0;
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;
+ 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) {
+ s = 1;
+ free(buf);
+ break;
}
- mustart(serve, ns, name);
+ /* 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);
+ }
+ if(s) {
+ flog(LOG_INFO, "root handler exited, so shutting down listening...");
+ while(listeners.d > 0)
+ resume(listeners.b[0], 0);
}
-
-out:
- close(ss);
}
-static void ioloop(void)
+static void initroot(void *uu)
{
- int ret;
- fd_set rfds, wfds, efds;
- struct blocker *bl, *nbl;
- struct timeval toval;
- time_t now, timeout;
- int maxfd;
- int ev;
+ int fd;
- while(blockers != NULL) {
- FD_ZERO(&rfds);
- FD_ZERO(&wfds);
- FD_ZERO(&efds);
- maxfd = 0;
- now = time(NULL);
- timeout = 0;
- for(bl = blockers; bl; bl = bl->n) {
- if(bl->ev & EV_READ)
- FD_SET(bl->fd, &rfds);
- if(bl->ev & EV_WRITE)
- FD_SET(bl->fd, &wfds);
- FD_SET(bl->fd, &efds);
- if(bl->fd > maxfd)
- maxfd = bl->fd;
- if((bl->to != 0) && ((timeout == 0) || (timeout > bl->to)))
- timeout = bl->to;
+ setsid();
+ if(daemonize) {
+ chdir("/");
+ if((fd = open("/dev/null", O_RDWR)) >= 0) {
+ dup2(fd, 0);
+ dup2(fd, 1);
+ dup2(fd, 2);
+ close(fd);
}
- toval.tv_sec = timeout - now;
- toval.tv_usec = 0;
- ret = select(maxfd + 1, &rfds, &wfds, &efds, timeout?(&toval):NULL);
- if(ret < 0) {
- if(errno != EINTR) {
- flog(LOG_CRIT, "ioloop: select errored out: %s", strerror(errno));
- /* To avoid CPU hogging in case it's bad, which it
- * probably is. */
- sleep(1);
+ }
+ 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);
}
- }
- now = time(NULL);
- for(bl = blockers; bl; bl = nbl) {
- nbl = bl->n;
- ev = 0;
- if(FD_ISSET(bl->fd, &rfds))
- ev |= EV_READ;
- if(FD_ISSET(bl->fd, &wfds))
- ev |= EV_WRITE;
- if(FD_ISSET(bl->fd, &efds))
- ev = -1;
- if(ev != 0)
- resume(bl->th, ev);
- else if((bl->to != 0) && (bl->to <= now))
- resume(bl->th, 0);
- }
+ 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);
+ }
+
+ buffree(pars);
+ buffree(vals);
+}
+
+static void sighandler(int sig)
+{
+ exitioloop(1);
}
int main(int argc, char **argv)
{
- int fd;
+ int c, d;
+ int i, s1;
+ char *root;
+ FILE *pidout;
+ struct passwd *pwent;
- if(argc < 2) {
- fprintf(stderr, "usage: htparser ROOT [ARGS...]\n");
+ 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);
+ }
+ }
+ 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 + 1)) < 0) {
+ if((plex = stdmkchild(argv + ++i, initroot, NULL)) < 0) {
flog(LOG_ERR, "could not spawn root multiplexer: %s", strerror(errno));
return(1);
}
- if((fd = listensock6(8080)) < 0) {
- flog(LOG_ERR, "could not listen on IPv6: %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));
+ 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);
}
- } else {
- mustart(listenloop, fd);
}
- ioloop();
+ 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);
+ signal(SIGCHLD, SIG_IGN);
+ signal(SIGINT, sighandler);
+ signal(SIGTERM, sighandler);
+ if(daemonize) {
+ daemon(0, 0);
+ }
+ 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);
}