python: Added more useful logging to wsgidir.

[ashd.git] / src / callscgi.c

diff --git a/src/callscgi.c b/src/callscgi.c
index 21db70d..299e09f 100644 (file)
--- a/src/callscgi.c
+++ b/src/callscgi.c
@@ -98,13 +98,14 @@ static char *mkanonid(void)
     
     home = getenv("HOME");
     if(home && !access(sprintf3("%s/.ashd/sockets/", home), X_OK))
-       tmpl = sprintf2("%s/.ashd/sockets/scgi-a-XXXXXX");
+       tmpl = sprintf2("%s/.ashd/sockets/scgi-a-XXXXXX", home);
     else
        tmpl = sprintf2("/tmp/scgi-a-%i-XXXXXX", getuid());
     if((fd = mkstemp(tmpl)) < 0) {
        flog(LOG_ERR, "could not create anonymous socket `%s': %s", tmpl, strerror(errno));
        exit(1);
     }
+    close(fd);
     unlink(tmpl);
     return(tmpl);
 }
@@ -193,14 +194,15 @@ static void startlisten(void)
        for(i = 3; i < FD_SETSIZE; i++)
            close(i);
        execvp(*progspec, progspec);
-       exit(127);
+       flog(LOG_ERR, "callscgi: %s: %s", *progspec, strerror(errno));
+       _exit(127);
     }
     close(fd);
 }
 
 static void startnolisten(void)
 {
-    int i;
+    int i, fd;
     
     if((child = fork()) < 0) {
        flog(LOG_ERR, "could not fork: %s", strerror(errno));
@@ -209,8 +211,15 @@ static void startnolisten(void)
     if(child == 0) {
        for(i = 3; i < FD_SETSIZE; i++)
            close(i);
+       if((fd = open("/dev/null", O_RDONLY)) < 0) {
+           flog(LOG_ERR, "/dev/null: %s", strerror(errno));
+           _exit(127);
+       }
+       dup2(fd, 0);
+       close(fd);
        execvp(*progspec, progspec);
-       exit(127);
+       flog(LOG_ERR, "callscgi: %s: %s", *progspec, strerror(errno));
+       _exit(127);
     }
 }
 
@@ -262,11 +271,11 @@ retry:
            }
            break;
        }
-       if(tries++ < nolisten) {
-           sleep(1);
-           goto retry;
-       }
        if(fd < 0) {
+           if(tries++ < nolisten) {
+               sleep(1);
+               goto retry;
+           }
            flog(LOG_ERR, "could not connect to specified TCP address: %s", strerror(errno));
            exit(1);
        }
@@ -303,7 +312,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);
     }
 }
@@ -394,7 +403,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");
@@ -402,28 +411,36 @@ 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);
-    if(*req->rest)
-       bufaddenv(dst, "PATH_INFO", "/%s", req->rest);
-    else
-       bufaddenv(dst, "PATH_INFO", "");
     url = sstrdup(req->url);
     if((qp = strchr(url, '?')) != NULL)
        *(qp++) = 0;
     /* XXX: This is an ugly hack (I think), but though I can think of
      * several alternatives, none seem to be better. */
-    if(*req->rest && (strlen(url) > strlen(req->rest)) &&
-       !strcmp(req->rest, url + strlen(url) - strlen(req->rest)) &&
-       (url[strlen(url) - strlen(req->rest) - 1] == '/')) {
-       bufaddenv(dst, "SCRIPT_NAME", "%.*s", (int)(strlen(url) - strlen(req->rest) - 1), url);
-    } else {
-       bufaddenv(dst, "SCRIPT_NAME", "%s", url);
+    if(*req->rest && (strlen(url) >= strlen(req->rest)) &&
+       !strcmp(req->rest, url + strlen(url) - strlen(req->rest))) {
+       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-Port")) != NULL)
        bufaddenv(dst, "SERVER_PORT", "%s", h);
-    if(((h = getheader(req, "X-Ash-Server-Protocol")) != NULL) && !strcmp(h, "https"))
+    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);
@@ -433,10 +450,13 @@ static void mkcgienv(struct hthead *req, struct charbuf *dst)
        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 = sstrdup(req->headers[i][0]);
+       h = sprintf2("HTTP_%s", req->headers[i][0]);
        for(p = h; *p; p++) {
            if(isalnum(*p))
                *p = toupper(*p);
@@ -573,9 +593,19 @@ static void listenloop(struct muth *muth, va_list args)
     }
 }
 
+static void sigign(int sig)
+{
+}
+
+static void sigexit(int sig)
+{
+    shutdown(0, SHUT_RDWR);
+    exit(0);
+}
+
 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)
@@ -606,10 +636,13 @@ 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();