#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
+#include <fcntl.h>
#include <string.h>
#include <sys/socket.h>
#include <pwd.h>
static int plex;
static char *pidfile = NULL;
+static int daemonize, usesyslog;
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(!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) {
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;
/* 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->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) {
+ 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");
}
}
+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] [-p PIDFILE] PORTSPEC... -- ROOT [ARGS...]\n");
{
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:p:")) >= 0) {
daemonize = 1;
break;
case 'S':
- logsys = 1;
+ usesyslog = 1;
break;
case 'u':
if((pwent = getpwnam(optarg)) == NULL) {
usage(stderr);
exit(1);
}
- if((plex = stdmkchild(argv + ++i, NULL, NULL)) < 0) {
+ if((plex = stdmkchild(argv + ++i, initroot, NULL)) < 0) {
flog(LOG_ERR, "could not spawn root multiplexer: %s", strerror(errno));
return(1);
}
return(1);
}
}
- if(logsys)
+ 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);
}