X-Git-Url: http://dolda2000.com/gitweb/?p=ashd.git;a=blobdiff_plain;f=src%2Fcallscgi.c;h=6d72f0e7c4786eaf23aeb421076ef7103a71f770;hp=5965b5fbbf1d0147c3253fc7e08260a6842555aa;hb=d06b6013fea7b2c01e75c5fe8bf98ab7caf1346c;hpb=2d65add085285c9df22b9c9bf7d5f2521d9f61cd diff --git a/src/callscgi.c b/src/callscgi.c index 5965b5f..6d72f0e 100644 --- a/src/callscgi.c +++ b/src/callscgi.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #ifdef HAVE_CONFIG_H @@ -40,6 +40,7 @@ #endif #include #include +#include #include #include #include @@ -195,7 +196,7 @@ static void startlisten(void) close(i); execvp(*progspec, progspec); flog(LOG_ERR, "callscgi: %s: %s", *progspec, strerror(errno)); - exit(127); + _exit(127); } close(fd); } @@ -213,13 +214,13 @@ static void startnolisten(void) close(i); if((fd = open("/dev/null", O_RDONLY)) < 0) { flog(LOG_ERR, "/dev/null: %s", strerror(errno)); - exit(127); + _exit(127); } dup2(fd, 0); close(fd); execvp(*progspec, progspec); flog(LOG_ERR, "callscgi: %s: %s", *progspec, strerror(errno)); - exit(127); + _exit(127); } } @@ -312,7 +313,7 @@ retry: isanon = 0; return(fd); } else { - flog(LOG_ERR, "servescgi: cannot use an anonymous socket without a program to start"); + flog(LOG_ERR, "callscgi: cannot use an anonymous socket without a program to start"); exit(1); } } @@ -403,7 +404,7 @@ static char *absolutify(char *file) static void mkcgienv(struct hthead *req, struct charbuf *dst) { int i; - char *url, *qp, *h, *p; + char *url, *pi, *tmp, *qp, *h, *p; bufaddenv(dst, "SERVER_SOFTWARE", "ashd/%s", VERSION); bufaddenv(dst, "GATEWAY_INTERFACE", "CGI/1.1"); @@ -411,7 +412,6 @@ static void mkcgienv(struct hthead *req, struct charbuf *dst) bufaddenv(dst, "SERVER_PROTOCOL", "%s", req->ver); bufaddenv(dst, "REQUEST_METHOD", "%s", req->method); bufaddenv(dst, "REQUEST_URI", "%s", req->url); - bufaddenv(dst, "PATH_INFO", req->rest); url = sstrdup(req->url); if((qp = strchr(url, '?')) != NULL) *(qp++) = 0; @@ -419,27 +419,47 @@ static void mkcgienv(struct hthead *req, struct charbuf *dst) * several alternatives, none seem to be better. */ if(*req->rest && (strlen(url) >= strlen(req->rest)) && !strcmp(req->rest, url + strlen(url) - strlen(req->rest))) { - bufaddenv(dst, "SCRIPT_NAME", "%.*s", (int)(strlen(url) - strlen(req->rest)), url); - } else { - bufaddenv(dst, "SCRIPT_NAME", "%s", url); + url[strlen(url) - strlen(req->rest)] = 0; + } + if((pi = unquoteurl(req->rest)) == NULL) + pi = sstrdup(req->rest); + if(!strcmp(url, "/")) { + /* This seems to be normal CGI behavior, but see callcgi.c for + * details. */ + url[0] = 0; + pi = sprintf2("/%s", tmp = pi); + free(tmp); } + bufaddenv(dst, "PATH_INFO", pi); + bufaddenv(dst, "SCRIPT_NAME", url); bufaddenv(dst, "QUERY_STRING", "%s", qp?qp:""); + free(pi); + free(url); if((h = getheader(req, "Host")) != NULL) bufaddenv(dst, "SERVER_NAME", "%s", h); + if((h = getheader(req, "X-Ash-Server-Address")) != NULL) + bufaddenv(dst, "SERVER_ADDR", "%s", h); if((h = getheader(req, "X-Ash-Server-Port")) != NULL) bufaddenv(dst, "SERVER_PORT", "%s", h); + if((h = getheader(req, "X-Ash-Remote-User")) != NULL) + bufaddenv(dst, "REMOTE_USER", "%s", h); if(((h = getheader(req, "X-Ash-Protocol")) != NULL) && !strcmp(h, "https")) bufaddenv(dst, "HTTPS", "on"); if((h = getheader(req, "X-Ash-Address")) != NULL) bufaddenv(dst, "REMOTE_ADDR", "%s", h); + if((h = getheader(req, "X-Ash-Port")) != NULL) + bufaddenv(dst, "REMOTE_PORT", "%s", h); if((h = getheader(req, "Content-Type")) != NULL) bufaddenv(dst, "CONTENT_TYPE", "%s", h); if((h = getheader(req, "Content-Length")) != NULL) bufaddenv(dst, "CONTENT_LENGTH", "%s", h); else bufaddenv(dst, "CONTENT_LENGTH", "0"); - if((h = getheader(req, "X-Ash-File")) != NULL) - bufaddenv(dst, "SCRIPT_FILENAME", "%s", absolutify(h)); + if((h = getheader(req, "X-Ash-File")) != NULL) { + h = absolutify(h); + bufaddenv(dst, "SCRIPT_FILENAME", "%s", h); + free(h); + } for(i = 0; i < req->noheaders; i++) { h = sprintf2("HTTP_%s", req->headers[i][0]); for(p = h; *p; p++) { @@ -454,46 +474,6 @@ static void mkcgienv(struct hthead *req, struct charbuf *dst) } } -static char *defstatus(int code) -{ - if(code == 200) - return("OK"); - else if(code == 201) - return("Created"); - else if(code == 202) - return("Accepted"); - else if(code == 204) - return("No Content"); - else if(code == 300) - return("Multiple Choices"); - else if(code == 301) - return("Moved Permanently"); - else if(code == 302) - return("Found"); - else if(code == 303) - return("See Other"); - else if(code == 304) - return("Not Modified"); - else if(code == 307) - return("Moved Temporarily"); - else if(code == 400) - return("Bad Request"); - else if(code == 401) - return("Unauthorized"); - else if(code == 403) - return("Forbidden"); - else if(code == 404) - return("Not Found"); - else if(code == 500) - return("Internal Server Error"); - else if(code == 501) - return("Not Implemented"); - else if(code == 503) - return("Service Unavailable"); - else - return("Unknown status"); -} - static struct hthead *parseresp(FILE *in) { struct hthead *resp; @@ -512,7 +492,7 @@ static struct hthead *parseresp(FILE *in) resp->msg = sstrdup(p); } else { resp->code = atoi(st); - resp->msg = sstrdup(defstatus(resp->code)); + resp->msg = sstrdup(httpdefstatus(resp->code)); } headrmheader(resp, "Status"); } else if(getheader(resp, "Location")) { @@ -578,14 +558,18 @@ static void listenloop(struct muth *muth, va_list args) } } +static void sigign(int sig) +{ +} + static void sigexit(int sig) { - exit(0); + shutdown(0, SHUT_RDWR); } static void usage(FILE *out) { - fprintf(out, "usage: servescgi [-h] [-N RETRIES] [-i ID] [-u UNIX-PATH] [-t [HOST:]TCP-PORT] [PROGRAM [ARGS...]]\n"); + fprintf(out, "usage: callscgi [-h] [-N RETRIES] [-i ID] [-u UNIX-PATH] [-t [HOST:]TCP-PORT] [PROGRAM [ARGS...]]\n"); } int main(int argc, char **argv) @@ -616,14 +600,15 @@ int main(int argc, char **argv) } progspec = argv + optind; if(((sockid != NULL) + (unspec != NULL) + (inspec != NULL)) > 1) { - flog(LOG_ERR, "servescgi: at most one of -i, -u or -t may be given"); + flog(LOG_ERR, "callscgi: at most one of -i, -u or -t may be given"); exit(1); } signal(SIGCHLD, SIG_IGN); + signal(SIGPIPE, sigign); signal(SIGINT, sigexit); signal(SIGTERM, sigexit); mustart(listenloop, 0); - atexit(killcuraddr); ioloop(); + killcuraddr(); return(0); }