* Brought over the newer string tokenizer from Citadel

[citadel.git] / webcit / context_loop.c

diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index d98f8935f0adb28c49635d112966e1b254670fa9..03ec66e1a00a563360aed972325801304d42c927 100644 (file)
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -2,9 +2,9 @@
  * context_loop.c
  *
  * This is the other half of the webserver.  It handles the task of hooking
- * up HTTP requests with the session they belong to, using HTTP cookies to
+ * up HTTP requests with the sessions they belong to, using HTTP cookies to
  * keep track of things.  If the HTTP request doesn't belong to any currently
- * active session, a new session is spawned.
+ * active session, a new session is started.
  *
  * $Id$
  */
@@ -121,26 +121,17 @@ int GenerateSessionID(void)
 }
 
 
-void gets0(int fd, char buf[])
-{
-
-       buf[0] = 0;
-       do {
-               buf[strlen(buf) + 1] = 0;
-               read(fd, &buf[strlen(buf)], 1);
-       } while (buf[strlen(buf) - 1] >= 32);
-       buf[strlen(buf) - 1] = 0;
-}
-
 /*
  * Collapse multiple cookies on one line
  */
-void req_gets(int sock, char *buf, char *hold)
+int req_gets(int sock, char *buf, char *hold)
 {
        int a;
 
        if (strlen(hold) == 0) {
-               client_gets(sock, buf);
+               strcpy(buf, "");
+               a = client_gets(sock, buf);
+               if (a<1) return(-1);
        } else {
                strcpy(buf, hold);
        }
@@ -153,9 +144,10 @@ void req_gets(int sock, char *buf, char *hold)
                                buf[a] = 0;
                                while (isspace(hold[8]))
                                        strcpy(&hold[8], &hold[9]);
-                               return;
+                               return(0);
                        }
        }
+       return(0);
 }
 
 /*
@@ -163,9 +155,9 @@ void req_gets(int sock, char *buf, char *hold)
  * http://www.apache.org/docs/misc/fin_wait_2.html for rationale
  */
 
-static int lingering_close(int fd)
+int lingering_close(int fd)
 {
-       char buf[256];
+       char buf[SIZ];
        int i;
        fd_set set;
        struct timeval tv, start;
@@ -197,6 +189,22 @@ static int lingering_close(int fd)
 
 
 
+/*
+ * Check for bogus requests coming from (for example) brain-dead
+ * Windoze boxes that are infected with the latest worm-of-the-week.
+ * If we detect one of these, bail out without bothering our Citadel
+ * server.
+ */
+int is_bogus(char *http_cmd) {
+
+       if (!strncasecmp(http_cmd, "GET /scripts/root.exe", 21)) return(1);
+       if (!strncasecmp(http_cmd, "GET /c/winnt", 12)) return(2);
+       if (!strncasecmp(http_cmd, "GET /MSADC/", 11)) return(3);
+
+       return(0);      /* probably ok */
+}
+
+
 
 /*
  * This loop gets called once for every HTTP connection made to WebCit.  At
@@ -214,7 +222,7 @@ void context_loop(int sock)
        struct httprequest *req = NULL;
        struct httprequest *last = NULL;
        struct httprequest *hptr;
-       char buf[256], hold[256];
+       char buf[SIZ], hold[SIZ];
        int desired_session = 0;
        int got_cookie = 0;
        struct wcsession *TheSession, *sptr;
@@ -222,8 +230,9 @@ void context_loop(int sock)
        /*
         * Find out what it is that the web browser is asking for
         */
+       memset(hold, 0, sizeof(hold));
        do {
-               req_gets(sock, buf, hold);
+               if (req_gets(sock, buf, hold) < 0) return;
                if (!strncasecmp(buf, "Cookie: webcit=", 15)) {
                        cookie_to_stuff(&buf[15], &desired_session,
                                NULL, NULL, NULL);
@@ -243,13 +252,17 @@ void context_loop(int sock)
 
        } while (strlen(buf) > 0);
 
+       strcpy(buf, req->line);
+       fprintf(stderr, "%s\n", buf);
+
+       /* Check for bogus requests */
+       if (is_bogus(buf)) goto bail;
 
        /*
         * If requesting a non-root page, there should already be a cookie
         * set.  If there isn't, the client browser has cookies turned off
         * (or doesn't support them) and we have to barf & bail.
         */
-       strcpy(buf, req->line);
        if (!strncasecmp(buf, "GET ", 4)) strcpy(buf, &buf[4]);
        else if (!strncasecmp(buf, "HEAD ", 5)) strcpy(buf, &buf[5]);
        if (buf[1]==' ') buf[1]=0;
@@ -259,12 +272,14 @@ void context_loop(int sock)
         * robots.txt file...
         */
        if (!strncasecmp(buf, "/robots.txt", 11)) {
-               strcpy(req->line, "GET /static/robots.txt HTTP/1.0");
+               strcpy(req->line, "GET /static/robots.txt"
+                               "?force_close_session=yes HTTP/1.0");
        }
 
        /* Do the non-root-cookie check now. */
        else if ( (strcmp(buf, "/")) && (got_cookie == 0)) {
-               strcpy(req->line, "GET /static/nocookies.html HTTP/1.0");
+               strcpy(req->line, "GET /static/nocookies.html"
+                               "?force_close_session=yes HTTP/1.0");
        }
 
 
@@ -308,7 +323,6 @@ void context_loop(int sock)
         */
 
 
-
        /*
         * Bind to the session and perform the transaction
         */
@@ -316,20 +330,13 @@ void context_loop(int sock)
        pthread_setspecific(MyConKey, (void *)TheSession);
        TheSession->http_sock = sock;
        TheSession->lastreq = time(NULL);                       /* log */
-       fprintf(stderr, "%s\n", req->line);
        session_loop(req);              /* perform the requested transaction */
        pthread_mutex_unlock(&TheSession->SessionMutex);        /* unbind */
 
        /* Free the request buffer */
-       while (req != NULL) {
+bail:  while (req != NULL) {
                hptr = req->next;
                free(req);
                req = hptr;
        }
-
-       /*
-        * Now our HTTP connection is done.  Close the socket and exit this
-        * function, so the worker thread can handle a new HTTP connection.
-        */
-       lingering_close(sock);
 }