#include <ctype.h>
#include <dirent.h>
#include <time.h>
+#include <sys/wait.h>
#include <sys/signal.h>
#ifdef HAVE_CONFIG_H
time_t now;
+static void chinit(void *idata)
+{
+ char *twd = idata;
+
+ if(twd != NULL) {
+ /* This should never be able to fail other than for critical
+ * I/O errors or some such, since the path has already been
+ * traversed. */
+ if(chdir(twd))
+ exit(127);
+ }
+}
+
static void handle(struct hthead *req, int fd, char *path, struct pattern *pat)
{
struct child *ch;
+ struct config *ccf;
+ struct headmod *head;
+ char *twd;
- headappheader(req, "X-Ash-File", path);
+ for(head = pat->headers; head != NULL; head = head->next) {
+ headrmheader(req, head->name);
+ headappheader(req, head->name, head->value);
+ }
+ if(!strncmp(path, "./", 2) && path[2])
+ path += 2;
if(pat->fchild) {
+ headappheader(req, "X-Ash-File", path);
stdforkserve(pat->fchild, req, fd, NULL, NULL);
} else {
- if((ch = findchild(path, pat->childnm)) == NULL) {
+ if((ch = findchild(path, pat->childnm, &ccf)) == NULL) {
flog(LOG_ERR, "child %s requested, but was not declared", pat->childnm);
simpleerror(fd, 500, "Configuration Error", "The server is erroneously configured. Handler %s was requested, but not declared.", pat->childnm);
return;
}
- if(childhandle(ch, req, fd, NULL, NULL))
+ if((twd = ccf?ccf->path:NULL) != NULL) {
+ if(!strcmp(twd, ".")) {
+ twd = NULL;
+ } else if(strncmp(path, twd, strlen(twd)) || (path[strlen(twd)] != '/')) {
+ /* Should be an impossible case under the current (and
+ * foreseeable) scheme. */
+ simpleerror(fd, 500, "Server Error", "An internal server error occurred.");
+ return;
+ } else {
+ path = path + strlen(twd) + 1;
+ }
+ }
+ headappheader(req, "X-Ash-File", path);
+ if(childhandle(ch, req, fd, chinit, twd))
simpleerror(fd, 500, "Server Error", "The request handler crashed.");
}
}
+static void handle404(struct hthead *req, int fd, char *path)
+{
+ struct child *ch;
+ struct config *ccf;
+ char *tmp;
+
+ tmp = sstrdup(path);
+ ch = findchild(tmp, ".notfound", &ccf);
+ if(childhandle(ch, req, fd, chinit, ccf?ccf->path:NULL))
+ simpleerror(fd, 500, "Server Error", "The request handler crashed.");
+ free(tmp);
+}
+
static void handlefile(struct hthead *req, int fd, char *path)
{
struct pattern *pat;
if((pat = findmatch(path, 0, 0)) == NULL) {
- simpleerror(fd, 404, "Not Found", "The requested URL has no corresponding resource.");
+ handle404(req, fd, path);
return;
}
handle(req, fd, path, pat);
char *newpath;
int rv;
- if(!el == '.') {
- simpleerror(fd, 404, "Not Found", "The requested URL has no corresponding resource.");
+ if(*el == '.') {
+ handle404(req, fd, sprintf3("%s/", path));
return(1);
}
if(!stat(sprintf3("%s/%s", path, el), &sb)) {
free(newpath);
return(1);
}
- simpleerror(fd, 404, "Not Found", "The requested URL has no corresponding resource.");
+ handle404(req, fd, sprintf3("%s/", path));
return(1);
}
if(!strchr(el, '.') && ((newpath = findfile(path, el, NULL)) != NULL)) {
return(0);
}
+static int checkdir(struct hthead *req, int fd, char *path, char *rest)
+{
+ char *cpath;
+ struct config *cf, *ccf;
+ struct child *ch;
+
+ cf = getconfig(path);
+ if((cf->capture != NULL) && (cf->caproot || !cf->path || strcmp(cf->path, "."))) {
+ cpath = sprintf2("%s/", path);
+ if((ch = findchild(cpath, cf->capture, &ccf)) == NULL) {
+ free(cpath);
+ flog(LOG_ERR, "child %s requested for capture, but was not declared", cf->capture);
+ simpleerror(fd, 500, "Configuration Error", "The server is erroneously configured. Handler %s was requested, but not declared.", cf->capture);
+ return(1);
+ }
+ free(cpath);
+ if(*rest == '/')
+ rest++;
+ replrest(req, rest);
+ if(childhandle(ch, req, fd, chinit, ccf?ccf->path:NULL))
+ simpleerror(fd, 500, "Server Error", "The request handler crashed.");
+ return(1);
+ }
+ return(0);
+}
+
static int checkpath(struct hthead *req, int fd, char *path, char *rest)
{
- struct config *cf;
char *p, *el;
int rv;
if(!strncmp(path, "./", 2))
path += 2;
- cf = getconfig(path);
+ if(checkdir(req, fd, path, rest))
+ return(1);
if((p = strchr(rest, '/')) == NULL) {
el = unquoteurl(rest);
goto out;
}
if(strchr(el, '/') || (!*el && *rest)) {
- simpleerror(fd, 404, "Not Found", "The requested URL has no corresponding resource.");
+ handle404(req, fd, sprintf3("%s/", path));
rv = 1;
goto out;
}
if(!*el) {
replrest(req, rest);
handledir(req, fd, path);
- return(1);
+ rv = 1;
+ goto out;
}
rv = checkentry(req, fd, path, rest, el);
{
now = time(NULL);
if(!checkpath(req, fd, ".", req->rest))
- simpleerror(fd, 404, "Not Found", "The requested URL has no corresponding resource.");
+ handle404(req, fd, ".");
+}
+
+static void chldhandler(int sig)
+{
+ pid_t pid;
+ int st;
+
+ while((pid = waitpid(-1, &st, WNOHANG)) > 0) {
+ if(WCOREDUMP(st))
+ flog(LOG_WARNING, "child process %i dumped core", pid);
+ }
+}
+
+static void sighandler(int sig)
+{
}
static void usage(FILE *out)
flog(LOG_ERR, "could not change directory to %s: %s", argv[optind], strerror(errno));
exit(1);
}
- signal(SIGCHLD, SIG_IGN);
+ signal(SIGCHLD, chldhandler);
+ signal(SIGPIPE, sighandler);
while(1) {
if((fd = recvreq(0, &req)) < 0) {
if(errno != 0)
Dolda2000 GitWeb / ashd.git / blobdiff