#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
+#include <fcntl.h>
#include <string.h>
#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.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;
+
+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)
{
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);
req = mkreq(method.b, url.b, ver.b);
if(parseheaders(req, in))
goto fail;
+ trimx(req);
goto out;
fail:
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;
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");
}
}
+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 [-h] 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)
/* 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);
{
int c;
int i, s1;
+ char *root;
+ FILE *pidout;
+ struct passwd *pwent;
- while((c = getopt(argc, argv, "+h")) >= 0) {
+ 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((argc - optind) < 3) {
- usage(stderr);
- exit(1);
- }
s1 = 0;
for(i = optind; i < argc; i++) {
if(!strcmp(argv[i], "--"))
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);
+ 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(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);
}
Dolda2000 GitWeb / ashd.git / blobdiff