* move stuff from Hdr into substruct that may be easily wiped by memset 0'ing them
[citadel.git] / webcit / context_loop.c
index b5ccd4fde3e8c903521348f8648b4cb3efad4d18..abe5dd3635e4f2bcda6e7d379816ddd3b5a2e3e5 100644 (file)
 
 #include "webcit.h"
 #include "webserver.h"
+#include "modules_init.h"
 
 /* Only one thread may manipulate SessionList at a time... */
 pthread_mutex_t SessionListMutex;
 
-struct wcsession *SessionList = NULL;
+wcsession *SessionList = NULL; /**< our sessions ????*/
 
-pthread_key_t MyConKey;                         /* TSD key for MySession() */
+pthread_key_t MyConKey;         /**< TSD key for MySession() */
+HashList *HttpReqTypes = NULL;
+HashList *HttpHeaderHandler = NULL;
+extern HashList *HandlerHash;
 
+void DestroyHttpHeaderHandler(void *V)
+{
+       OneHttpHeader *pHdr;
+       pHdr = (OneHttpHeader*) V;
+       FreeStrBuf(&pHdr->Val);
+       free(pHdr);
+}
 
-void free_attachments(struct wcsession *sess) {
-       struct wc_attachment *att;
-
-       while (sess->first_attachment != NULL) {
-               att = sess->first_attachment;
-               sess->first_attachment = sess->first_attachment->next;
-               free(att->data);
-               free(att);
+void shutdown_sessions(void)
+{
+       wcsession *sptr;
+       
+       for (sptr = SessionList; sptr != NULL; sptr = sptr->next) {
+                       sptr->killthis = 1;
        }
 }
 
-
 void do_housekeeping(void)
 {
-       struct wcsession *sptr, *ss;
-       struct wcsession *sessions_to_kill = NULL;
+       wcsession *sptr, *ss;
+       wcsession *sessions_to_kill = NULL;
        int num_sessions = 0;
        static int num_threads = MIN_WORKER_THREADS;
 
-       /*
+       /**
         * Lock the session list, moving any candidates for euthanasia into
         * a separate list.
         */
@@ -47,16 +55,16 @@ void do_housekeeping(void)
        for (sptr = SessionList; sptr != NULL; sptr = sptr->next) {
                ++num_sessions;
 
-               /* Kill idle sessions */
+               /** Kill idle sessions */
                if ((time(NULL) - (sptr->lastreq)) >
                   (time_t) WEBCIT_TIMEOUT) {
                        sptr->killthis = 1;
                }
 
-               /* Remove sessions flagged for kill */
+               /** Remove sessions flagged for kill */
                if (sptr->killthis) {
 
-                       /* remove session from linked list */
+                       /** remove session from linked list */
                        if (sptr == SessionList) {
                                SessionList = SessionList->next;
                        }
@@ -72,26 +80,21 @@ void do_housekeeping(void)
        }
        pthread_mutex_unlock(&SessionListMutex);
 
-       /*
+       /**
         * Now free up and destroy the culled sessions.
         */
        while (sessions_to_kill != NULL) {
                lprintf(3, "Destroying session %d\n", sessions_to_kill->wc_session);
                pthread_mutex_lock(&sessions_to_kill->SessionMutex);
-               close(sessions_to_kill->serv_sock);
-               close(sessions_to_kill->chat_sock);
-               if (sessions_to_kill->preferences != NULL) {
-                       free(sessions_to_kill->preferences);
-               }
-               free_attachments(sessions_to_kill);
                pthread_mutex_unlock(&sessions_to_kill->SessionMutex);
                sptr = sessions_to_kill->next;
-               free(sessions_to_kill);
+
+               session_destroy_modules(&sessions_to_kill);
                sessions_to_kill = sptr;
                --num_sessions;
        }
 
-       /*
+       /**
         * If there are more sessions than threads, then we should spawn
         * more threads ... up to a predefined maximum.
         */
@@ -105,7 +108,7 @@ void do_housekeeping(void)
 }
 
 
-/* 
+/*
  * Wake up occasionally and clean house
  */
 void housekeeping_loop(void)
@@ -118,11 +121,9 @@ void housekeeping_loop(void)
 
 
 /*
+ * Create a Session id
  * Generate a unique WebCit session ID (which is not the same thing as the
  * Citadel session ID).
- *
- * FIXME ... ensure that session number is truly unique
- *
  */
 int GenerateSessionID(void)
 {
@@ -136,93 +137,224 @@ int GenerateSessionID(void)
 }
 
 
-/*
- * Collapse multiple cookies on one line
- */
-int req_gets(int sock, char *buf, char *hold)
-{
-       int a;
-
-       if (strlen(hold) == 0) {
-               strcpy(buf, "");
-               a = client_getln(sock, buf, SIZ);
-               if (a<1) return(-1);
-       } else {
-               safestrncpy(buf, hold, SIZ);
-       }
-       strcpy(hold, "");
-
-       if (!strncasecmp(buf, "Cookie: ", 8)) {
-               for (a = 0; a < strlen(buf); ++a)
-                       if (buf[a] == ';') {
-                               sprintf(hold, "Cookie: %s", &buf[a + 1]);
-                               buf[a] = 0;
-                               while (isspace(hold[8]))
-                                       strcpy(&hold[8], &hold[9]);
-                               return(0);
-                       }
-       }
 
-       return(0);
-}
 
-/*
- * lingering_close() a`la Apache. see
- * http://www.apache.org/docs/misc/fin_wait_2.html for rationale
+
+/**
+ * \brief Detects a 'mobile' user agent 
  */
+int is_mobile_ua(char *user_agent) {
+      if (strstr(user_agent,"iPhone OS") != NULL) {
+       return 1;
+      } else if (strstr(user_agent,"Windows CE") != NULL) {
+       return 1;
+      } else if (strstr(user_agent,"SymbianOS") != NULL) {
+       return 1;
+      } else if (strstr(user_agent, "Opera Mobi") != NULL) {
+       return 1;
+      } else if (strstr(user_agent, "Firefox/2.0.0 Opera 9.51 Beta") != NULL) {
+             /*  For some reason a new install of Opera 9.51beta decided to spoof. */
+         return 1;
+         }
+      return 0;
+}
 
-int lingering_close(int fd)
+/* If it's a "force 404" situation then display the error and bail. */
+void do_404(void)
 {
-       char buf[SIZ];
-       int i;
-       fd_set set;
-       struct timeval tv, start;
+       hprintf("HTTP/1.1 404 Not found\r\n");
+       hprintf("Content-Type: text/plain\r\n");
+       wprintf("Not found\r\n");
+       end_burst();
+}
 
-       gettimeofday(&start, NULL);
-       shutdown(fd, 1);
+int ReadHttpSubject(ParsedHttpHdrs *Hdr, StrBuf *Line, StrBuf *Buf)
+{
+       const char *Args;
+       void *vLine, *vHandler;
+       const char *Pos = NULL;
+
+
+       Hdr->HR.ReqLine = Line;
+       /* The requesttype... GET, POST... */
+       StrBufExtract_token(Buf, Hdr->HR.ReqLine, 0, ' ');
+       if (GetHash(HttpReqTypes, SKEY(Buf), &vLine) &&
+           (vLine != NULL))
+       {
+               Hdr->HR.eReqType = *(long*)vLine;
+       }
+       else {
+               Hdr->HR.eReqType = eGET;
+               return 1;
+       }
+       StrBufCutLeft(Hdr->HR.ReqLine, StrLength(Buf) + 1);
+
+       /* the HTTP Version... */
+       StrBufExtract_token(Buf, Hdr->HR.ReqLine, 1, ' ');
+       StrBufCutRight(Hdr->HR.ReqLine, StrLength(Buf) + 1);
+       
+       if (StrLength(Buf) == 0) {
+               Hdr->HR.eReqType = eGET;
+               return 1;
+       }
+
+       Hdr->this_page = NewStrBufDup(Hdr->HR.ReqLine);
+       /* chop Filename / query arguments */
+       Args = strchr(ChrPtr(Hdr->HR.ReqLine), '?');
+       if (Args == NULL) /* whe're not that picky about params... TODO: this will spoil '&' in filenames.*/
+               Args = strchr(ChrPtr(Hdr->HR.ReqLine), '&');
+       if (Args != NULL) {
+               Args ++; /* skip the ? */
+               Hdr->PlainArgs = NewStrBufPlain(
+                       Args, 
+                       StrLength(Hdr->HR.ReqLine) -
+                       (Args - ChrPtr(Hdr->HR.ReqLine)));
+               StrBufCutAt(Hdr->HR.ReqLine, 0, Args - 1);
+       } /* don't parse them yet, maybe we don't even care... */
+       
+       /* now lookup what we are going to do with this... */
+       /* skip first slash */
+       StrBufExtract_NextToken(Buf, Hdr->HR.ReqLine, &Pos, '/');
        do {
-               do {
-                       gettimeofday(&tv, NULL);
-                       tv.tv_sec = SLEEPING - (tv.tv_sec - start.tv_sec);
-                       tv.tv_usec = start.tv_usec - tv.tv_usec;
-                       if (tv.tv_usec < 0) {
-                               tv.tv_sec--;
-                               tv.tv_usec += 1000000;
-                       }
-                       FD_ZERO(&set);
-                       FD_SET(fd, &set);
-                       i = select(fd + 1, &set, NULL, NULL, &tv);
-               } while (i == -1 && errno == EINTR);
+               StrBufExtract_NextToken(Buf, Hdr->HR.ReqLine, &Pos, '/');
 
-               if (i <= 0)
+               GetHash(HandlerHash, SKEY(Buf), &vHandler),
+               Hdr->HR.Handler = (WebcitHandler*) vHandler;
+               if (Hdr->HR.Handler == NULL)
                        break;
+               /*
+                * If the request is prefixed by "/webcit" then chop that off.  This
+                * allows a front end web server to forward all /webcit requests to us
+                * while still using the same web server port for other things.
+                */
+               if ((Hdr->HR.Handler->Flags & URLNAMESPACE) != 0)
+                       continue;
+               break;
+       } while (1);
+       /* remove the handlername from the URL */
+       if (Pos != NULL) {
+               StrBufCutLeft(Hdr->HR.ReqLine, 
+                             Pos - ChrPtr(Hdr->HR.ReqLine));
+       }
 
-               i = read(fd, buf, sizeof buf);
-       } while (i != 0 && (i != -1 || errno == EINTR));
+       if (Hdr->HR.Handler != NULL) {
+               if ((Hdr->HR.Handler->Flags & BOGUS) != 0)
+                       return 1;
+               Hdr->HR.DontNeedAuth = (Hdr->HR.Handler->Flags & ISSTATIC) != 0;
+       }
 
-       return close(fd);
+       Hdr->HTTPHeaders = NewHash(1, NULL);
+       return 0;
 }
 
+int AnalyseHeaders(ParsedHttpHdrs *Hdr)
+{
+       OneHttpHeader *pHdr;
+       void *vHdr;
+       long HKLen;
+       const char *HashKey;
+       HashPos *at = GetNewHashPos(Hdr->HTTPHeaders, 0);
+       
+       while (GetNextHashPos(Hdr->HTTPHeaders, at, &HKLen, &HashKey, &vHdr) && 
+              (vHdr != NULL)) {
+               pHdr = (OneHttpHeader *)vHdr;
+               if (pHdr->HaveEvaluator)
+                       pHdr->H(pHdr->Val, Hdr);
 
+       }
+       DeleteHashPos(&at);
+       return 0;
+}
+
+/*const char *nix(void *vptr) {return ChrPtr( (StrBuf*)vptr);}*/
 
 /*
- * 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.
+ * Read in the request
  */
-int is_bogus(char *http_cmd) {
+int ReadHTTPRequset (ParsedHttpHdrs *Hdr)
+{
+       const char *pch, *pchs, *pche;
+       OneHttpHeader *pHdr;
+       StrBuf *Line, *LastLine, *HeaderName;
+       int nLine = 0;
+       void *vF;
+       int isbogus = 0;
+
+       HeaderName = NewStrBuf();
+       Hdr->ReadBuf = NewStrBuf();
+       LastLine = NULL;
+       do {
+               nLine ++;
+               Line = NewStrBuf();
 
-       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);
+               if (ClientGetLine(Hdr, Line) < 0) return 1;
 
-       return(0);      /* probably ok */
+               if (StrLength(Line) == 0) {
+                       FreeStrBuf(&Line);
+                       continue;
+               }
+               if (nLine == 1) {
+                       pHdr = (OneHttpHeader*) malloc(sizeof(OneHttpHeader));
+                       memset(pHdr, 0, sizeof(OneHttpHeader));
+                       pHdr->Val = Line;
+                       Put(Hdr->HTTPHeaders, HKEY("GET /"), pHdr, DestroyHttpHeaderHandler);
+                       lprintf(9, "%s\n", ChrPtr(Line));
+                       isbogus = ReadHttpSubject(Hdr, Line, HeaderName);
+                       if (isbogus) break;
+                       continue;
+               }
+
+               /* Do we need to Unfold? */
+               if ((LastLine != NULL) && 
+                   (isspace(*ChrPtr(Line)))) {
+                       pch = pchs = ChrPtr(Line);
+                       pche = pchs + StrLength(Line);
+                       while (isspace(*pch) && (pch < pche))
+                               pch ++;
+                       StrBufCutLeft(Line, pch - pchs);
+                       StrBufAppendBuf(LastLine, Line, 0);
+
+                       FreeStrBuf(&Line);
+                       continue;
+               }
+
+               StrBufSanitizeAscii(Line, 'ยง');
+               StrBufExtract_token(HeaderName, Line, 0, ':');
+
+               pchs = ChrPtr(Line);
+               pch = pchs + StrLength(HeaderName) + 1;
+               pche = pchs + StrLength(Line);
+               while (isspace(*pch) && (pch < pche))
+                       pch ++;
+               StrBufCutLeft(Line, pch - pchs);
+
+               StrBufUpCase(HeaderName);
+
+               pHdr = (OneHttpHeader*) malloc(sizeof(OneHttpHeader));
+               memset(pHdr, 0, sizeof(OneHttpHeader));
+               pHdr->Val = Line;
+
+               if (GetHash(HttpHeaderHandler, SKEY(HeaderName), &vF) &&
+                   (vF != NULL))
+               {
+                       OneHttpHeader *FHdr = (OneHttpHeader*) vF;
+                       pHdr->H = FHdr->H;
+                       pHdr->HaveEvaluator = 1;
+               }
+               Put(Hdr->HTTPHeaders, SKEY(HeaderName), pHdr, DestroyHttpHeaderHandler);
+               LastLine = Line;
+       } while (Line != NULL);
+
+       FreeStrBuf(&HeaderName);
+
+       return isbogus;
 }
 
 
 
 /*
+ * handle one request
+ *
  * This loop gets called once for every HTTP connection made to WebCit.  At
  * this entry point we have an HTTP socket with a browser allegedly on the
  * other end, but we have not yet bound to a WebCit session.
@@ -233,164 +365,175 @@ int is_bogus(char *http_cmd) {
  * function returns, the worker thread is then free to handle another
  * transaction.
  */
-void context_loop(int sock)
+void context_loop(ParsedHttpHdrs *Hdr)
 {
-       struct httprequest *req = NULL;
-       struct httprequest *last = NULL;
-       struct httprequest *hptr;
-       char buf[SIZ], hold[SIZ];
-       int desired_session = 0;
-       int got_cookie = 0;
-       int gzip_ok = 0;
-       struct wcsession *TheSession, *sptr;
-       char httpauth_string[SIZ];
-       char httpauth_user[SIZ];
-       char httpauth_pass[SIZ];
-
-       strcpy(httpauth_string, "");
-       strcpy(httpauth_user, DEFAULT_HTTPAUTH_USER);
-       strcpy(httpauth_pass, DEFAULT_HTTPAUTH_PASS);
+       int isbogus = 0;
+       wcsession *TheSession, *sptr;
+       struct timeval tx_start;
+       struct timeval tx_finish;
+       
+       gettimeofday(&tx_start, NULL);          /* start a stopwatch for performance timing */
 
        /*
         * Find out what it is that the web browser is asking for
         */
-       memset(hold, 0, sizeof(hold));
-       do {
-               if (req_gets(sock, buf, hold) < 0) return;
-
-               /*
-                * Can we compress?
-                */
-               if (!strncasecmp(buf, "Accept-encoding:", 16)) {
-                       if (strstr(&buf[16], "gzip")) {
-                               gzip_ok = 1;
-                       }
-               }
-
-               /*
-                * Browser-based sessions use cookies for session authentication
-                */
-               if (!strncasecmp(buf, "Cookie: webcit=", 15)) {
-                       cookie_to_stuff(&buf[15], &desired_session,
-                               NULL, 0, NULL, 0, NULL, 0);
-                       got_cookie = 1;
-               }
-
-               /*
-                * GroupDAV-based sessions use HTTP authentication
-                */
-               if (!strncasecmp(buf, "Authorization: Basic ", 21)) {
-                       CtdlDecodeBase64(httpauth_string, &buf[21], strlen(&buf[21]));
-                       extract_token(httpauth_user, httpauth_string, 0, ':', sizeof httpauth_user);
-                       extract_token(httpauth_pass, httpauth_string, 1, ':', sizeof httpauth_pass);
-               }
-
-               if (!strncasecmp(buf, "If-Modified-Since: ", 19)) {
-                       if_modified_since = httpdate_to_timestamp(&buf[19]);
-               }
-
-               /*
-                * Read in the request
-                */
-               hptr = (struct httprequest *)
-                       malloc(sizeof(struct httprequest));
-               if (req == NULL)
-                       req = hptr;
-               else
-                       last->next = hptr;
-               hptr->next = NULL;
-               last = hptr;
-
-               safestrncpy(hptr->line, buf, sizeof hptr->line);
-
-       } while (strlen(buf) > 0);
+       isbogus = ReadHTTPRequset(Hdr);
+
+       if (!isbogus)
+               isbogus = AnalyseHeaders(Hdr);
+
+       if ((isbogus) ||
+           ((Hdr->HR.Handler != NULL) &&
+            ((Hdr->HR.Handler->Flags & BOGUS) != 0)))
+       {
+               wcsession *Bogus;
+               Bogus = (wcsession *)
+                       malloc(sizeof(wcsession));
+               memset(Bogus, 0, sizeof(wcsession));
+               pthread_setspecific(MyConKey, (void *)Bogus);
+               Bogus->Hdr = Hdr;
+               session_new_modules(Bogus);
+               do_404();
+               session_detach_modules(Bogus);
+               http_destroy_modules(Hdr);
+               session_destroy_modules(&Bogus);
+               return;
+       }
 
-       safestrncpy(buf, req->line, sizeof buf);
-       lprintf(5, "HTTP: %s\n", buf);
+       if ((Hdr->HR.Handler != NULL) && 
+           ((Hdr->HR.Handler->Flags & ISSTATIC) != 0))
+       {
+               wcsession *Static;
+
+               Static = (wcsession *)
+                       malloc(sizeof(wcsession));
+               memset(Static, 0, sizeof(wcsession));
+               pthread_setspecific(MyConKey, (void *)Static);
+               Static->Hdr = Hdr;
+               Static->serv_sock = (-1);
+               Static->chat_sock = (-1);
+               Static->is_mobile = -1;
+               session_new_modules(Static);
+               
+               Hdr->HR.Handler->F();
 
-       /* Check for bogus requests */
-       if (is_bogus(buf)) goto bail;
+               /* How long did this transaction take? */
+               gettimeofday(&tx_finish, NULL);
+               
+               lprintf(9, "SL: Transaction [%s] completed in %ld.%06ld seconds.\n",
+                       ChrPtr(Hdr->this_page),
+                       ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) / 1000000,
+                       ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) % 1000000
+                       );
+
+               session_detach_modules(Static);
+               http_destroy_modules(Hdr);
+               session_destroy_modules(&Static);
+               return;
+       }
 
-       /*
-        * 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.
-        */
-       remove_token(buf, 0, ' ');
-       if (buf[1]==' ') buf[1]=0;
+       if (Hdr->HR.got_auth == AUTH_BASIC) 
+               CheckAuthBasic(Hdr);
 
-       /*
-        * While we're at it, gracefully handle requests for the
-        * robots.txt and favicon.ico files.
-        */
-       if (!strncasecmp(buf, "/robots.txt", 11)) {
-               strcpy(req->line, "GET /static/robots.txt"
-                               "?force_close_session=yes HTTP/1.1");
-       }
-       else if (!strncasecmp(buf, "/favicon.ico", 12)) {
-               strcpy(req->line, "GET /static/favicon.ico");
+/*
+TODO    HKEY("/static/nocookies.html?force_close_session=yes"));
+*/
+
+/*     dbg_PrintHash(HTTPHeaders, nix, NULL);  */
+
+
+       /* Begin parsing the request. * /
+#ifdef TECH_PREVIEW
+       if ((strncmp(ChrPtr(ReqLine), "/sslg", 5) != 0) &&
+           (strncmp(ChrPtr(ReqLine), "/static/", 8) != 0) &&
+           (strncmp(ChrPtr(ReqLine), "/tiny_mce/", 10) != 0) &&
+           (strncmp(ChrPtr(ReqLine), "/wholist_section", 16) != 0) &&
+           (strstr(ChrPtr(ReqLine), "wholist_section") == NULL)) {
+#endif
+               lprintf(5, "HTTP: %s %s\n", ReqStrs[Hdr.eReqType], ChrPtr(ReqLine));
+#ifdef TECH_PREVIEW
        }
+#endif
 
-       /* These are the URL's which may be executed without a
-        * session cookie already set.  If it's not one of these,
-        * force the session to close because cookies are
-        * probably disabled on the client browser.
-        */
-       else if ( (strcmp(buf, "/"))
-               && (strncasecmp(buf, "/listsub", 8))
-               && (strncasecmp(buf, "/freebusy", 9))
-               && (strncasecmp(buf, "/do_logout", 10))
-               && (strncasecmp(buf, "/groupdav", 9))
-               && (strncasecmp(buf, "/rss", 4))
-               && (got_cookie == 0)) {
-               strcpy(req->line, "GET /static/nocookies.html"
-                               "?force_close_session=yes HTTP/1.1");
-       }
+*/
 
-       /*
+       /**
         * See if there's an existing session open with the desired ID or user/pass
         */
        TheSession = NULL;
 
        if (TheSession == NULL) {
                pthread_mutex_lock(&SessionListMutex);
-               for (sptr = SessionList; sptr != NULL; sptr = sptr->next) {
-
-                       /* If HTTP-AUTH, look for a session with matching credentials */
-                       if ( (strlen(httpauth_user) > 0)
-                          &&(!strcasecmp(sptr->httpauth_user, httpauth_user))
-                          &&(!strcasecmp(sptr->httpauth_pass, httpauth_pass)) ) {
-                               TheSession = sptr;
+               for (sptr = SessionList; 
+                    ((sptr != NULL) && (TheSession == NULL)); 
+                     sptr = sptr->next) {
+
+                       /** If HTTP-AUTH, look for a session with matching credentials */
+                       switch (Hdr->HR.got_auth)
+                       {
+                       case AUTH_BASIC:
+                               if ( (Hdr->HR.SessionKey != sptr->SessionKey))
+                                       continue;
+                               GetAuthBasic(Hdr);
+                               if ((!strcasecmp(ChrPtr(Hdr->c_username), ChrPtr(sptr->wc_username))) &&
+                                   (!strcasecmp(ChrPtr(Hdr->c_password), ChrPtr(sptr->wc_password))) ) 
+                                       TheSession = sptr;
+                               break;
+                       case AUTH_COOKIE:
+                       /** If cookie-session, look for a session with matching session ID */
+                               if ( (Hdr->HR.desired_session != 0) && 
+                                    (sptr->wc_session == Hdr->HR.desired_session)) 
+                                       TheSession = sptr;
+                               break;                       
+                       case NO_AUTH:
+                            break;
                        }
-
-                       /* If cookie-session, look for a session with matching session ID */
-                       if ( (desired_session != 0) && (sptr->wc_session == desired_session)) {
-                               TheSession = sptr;
-                       }
-
                }
                pthread_mutex_unlock(&SessionListMutex);
        }
 
-       /*
+       /**
         * Create a new session if we have to
         */
        if (TheSession == NULL) {
                lprintf(3, "Creating a new session\n");
-               TheSession = (struct wcsession *)
-                       malloc(sizeof(struct wcsession));
-               memset(TheSession, 0, sizeof(struct wcsession));
+               TheSession = (wcsession *)
+                       malloc(sizeof(wcsession));
+               memset(TheSession, 0, sizeof(wcsession));
+               TheSession->Hdr = Hdr;
+               TheSession->SessionKey = Hdr->HR.SessionKey;
                TheSession->serv_sock = (-1);
                TheSession->chat_sock = (-1);
-               TheSession->wc_session = GenerateSessionID();
-               strcpy(TheSession->httpauth_user, httpauth_user);
-               strcpy(TheSession->httpauth_pass, httpauth_pass);
-               pthread_mutex_init(&TheSession->SessionMutex, NULL);
+       
+               /* If we're recreating a session that expired, it's best to give it the same
+                * session number that it had before.  The client browser ought to pick up
+                * the new session number and start using it, but in some rare situations it
+                * doesn't, and that's a Bad Thing because it causes lots of spurious sessions
+                * to get created.
+                */     
+               if (Hdr->HR.desired_session == 0) {
+                       TheSession->wc_session = GenerateSessionID();
+               }
+               else {
+                       TheSession->wc_session = Hdr->HR.desired_session;
+               }
+
+               pthread_setspecific(MyConKey, (void *)TheSession);
+               session_new_modules(TheSession);
 
+               pthread_mutex_init(&TheSession->SessionMutex, NULL);
                pthread_mutex_lock(&SessionListMutex);
+               TheSession->nonce = rand();
                TheSession->next = SessionList;
+               TheSession->is_mobile = -1;
                SessionList = TheSession;
                pthread_mutex_unlock(&SessionListMutex);
+
+               if (StrLength(Hdr->c_language) > 0) {
+                       lprintf(9, "Session cookie requests language '%s'\n", ChrPtr(Hdr->c_language));
+                       set_selected_language(ChrPtr(Hdr->c_language));
+                       go_selected_language();
+               }
        }
 
        /*
@@ -403,21 +546,227 @@ void context_loop(int sock)
         */
        pthread_mutex_lock(&TheSession->SessionMutex);          /* bind */
        pthread_setspecific(MyConKey, (void *)TheSession);
-       TheSession->http_sock = sock;
+       
        TheSession->lastreq = time(NULL);                       /* log */
-       TheSession->gzip_ok = gzip_ok;
-       session_loop(req);                              /* do transaction */
+       TheSession->Hdr = Hdr;
+
+       session_attach_modules(TheSession);
+       session_loop();                         /* do transaction */
+
+
+       /* How long did this transaction take? */
+       gettimeofday(&tx_finish, NULL);
+       
+       lprintf(9, "Transaction [%s] completed in %ld.%06ld seconds.\n",
+               ChrPtr(Hdr->this_page),
+               ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) / 1000000,
+               ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) % 1000000
+       );
+
+       session_detach_modules(TheSession);
+
+       TheSession->Hdr = NULL;
        pthread_mutex_unlock(&TheSession->SessionMutex);        /* unbind */
 
-       /* Free the request buffer */
-bail:  while (req != NULL) {
-               hptr = req->next;
-               free(req);
-               req = hptr;
+       http_destroy_modules(Hdr);
+}
+
+void tmplput_nonce(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       StrBufAppendPrintf(Target, "%ld",
+                          (WCC != NULL)? WCC->nonce:0);                   
+}
+
+void tmplput_current_user(StrBuf *Target, WCTemplputParams *TP)
+{
+       StrBufAppendTemplate(Target, TP, WC->wc_fullname, 0);
+}
+
+void tmplput_current_room(StrBuf *Target, WCTemplputParams *TP)
+{
+       StrBufAppendTemplate(Target, TP, WC->wc_roomname, 0); 
+}
+
+void Header_HandleContentLength(StrBuf *Line, ParsedHttpHdrs *hdr)
+{
+       hdr->HR.ContentLength = StrToi(Line);
+}
+
+void Header_HandleContentType(StrBuf *Line, ParsedHttpHdrs *hdr)
+{
+       hdr->HR.ContentType = Line;
+}
+
+void Header_HandleUserAgent(StrBuf *Line, ParsedHttpHdrs *hdr)
+{
+       hdr->HR.user_agent = Line;
+#ifdef TECH_PREVIEW
+/* TODO: do this later on session creating
+       if ((WCC->is_mobile < 0) && is_mobile_ua(&buf[12])) {                   
+               WCC->is_mobile = 1;
+       }
+       else {
+               WCC->is_mobile = 0;
+       }
+*/
+#endif
+}
+
+
+void Header_HandleHost(StrBuf *Line, ParsedHttpHdrs *hdr)
+{
+       if ((follow_xff) && (hdr->HR.http_host != NULL))
+               return;
+       else
+               hdr->HR.http_host = Line;
+}
+
+void Header_HandleXFFHost(StrBuf *Line, ParsedHttpHdrs *hdr)
+{
+       if (follow_xff)
+               hdr->HR.http_host = Line;
+}
+
+
+void Header_HandleXFF(StrBuf *Line, ParsedHttpHdrs *hdr)
+{
+       hdr->HR.browser_host = Line;
+
+       while (StrBufNum_tokens(hdr->HR.browser_host, ',') > 1) {
+               StrBufRemove_token(hdr->HR.browser_host, 0, ',');
        }
+       StrBufTrim(hdr->HR.browser_host);
+}
+
+void Header_HandleIfModSince(StrBuf *Line, ParsedHttpHdrs *hdr)
+{
+       hdr->HR.if_modified_since = httpdate_to_timestamp(Line);
+}
 
-       /* Free up any session-local substitution variables which
-        * were set during this transaction
+void Header_HandleAcceptEncoding(StrBuf *Line, ParsedHttpHdrs *hdr)
+{
+       /*
+        * Can we compress?
         */
-       clear_local_substs();
+       if (strstr(&ChrPtr(Line)[16], "gzip")) {
+               hdr->HR.gzip_ok = 1;
+       }
+}
+const char *ReqStrs[eNONE] = {
+       "GET",
+       "POST",
+       "OPTIONS",
+       "PROPFIND",
+       "PUT",
+       "DELETE",
+       "HEAD",
+       "MOVE",
+       "COPY"
+};
+
+void
+ServerStartModule_CONTEXT
+(void)
+{
+       long *v;
+       HttpReqTypes = NewHash(1, NULL);
+       HttpHeaderHandler = NewHash(1, NULL);
+
+       v = malloc(sizeof(long));
+       *v = eGET;
+       Put(HttpReqTypes, HKEY("GET"), v, NULL);
+
+       v = malloc(sizeof(long));
+       *v = ePOST;
+       Put(HttpReqTypes, HKEY("POST"), v, NULL);
+
+       v = malloc(sizeof(long));
+       *v = eOPTIONS;
+       Put(HttpReqTypes, HKEY("OPTIONS"), v, NULL);
+
+       v = malloc(sizeof(long));
+       *v = ePROPFIND;
+       Put(HttpReqTypes, HKEY("PROPFIND"), v, NULL);
+
+       v = malloc(sizeof(long));
+       *v = ePUT;
+       Put(HttpReqTypes, HKEY("PUT"), v, NULL);
+
+       v = malloc(sizeof(long));
+       *v = eDELETE;
+       Put(HttpReqTypes, HKEY("DELETE"), v, NULL);
+
+       v = malloc(sizeof(long));
+       *v = eHEAD;
+       Put(HttpReqTypes, HKEY("HEAD"), v, NULL);
+
+       v = malloc(sizeof(long));
+       *v = eMOVE;
+       Put(HttpReqTypes, HKEY("MOVE"), v, NULL);
+
+       v = malloc(sizeof(long));
+       *v = eCOPY;
+       Put(HttpReqTypes, HKEY("COPY"), v, NULL);
+}
+
+void 
+ServerShutdownModule_CONTEXT
+(void)
+{
+       DeleteHash(&HttpReqTypes);
+       DeleteHash(&HttpHeaderHandler);
+}
+
+void RegisterHeaderHandler(const char *Name, long Len, Header_Evaluator F)
+{
+       OneHttpHeader *pHdr;
+       pHdr = (OneHttpHeader*) malloc(sizeof(OneHttpHeader));
+       memset(pHdr, 0, sizeof(OneHttpHeader));
+       pHdr->H = F;
+       Put(HttpHeaderHandler, Name, Len, pHdr, DestroyHttpHeaderHandler);
+}
+
+
+void 
+InitModule_CONTEXT
+(void)
+{
+       RegisterHeaderHandler(HKEY("CONTENT-LENGTH"), Header_HandleContentLength);
+       RegisterHeaderHandler(HKEY("CONTENT-TYPE"), Header_HandleContentType);
+       RegisterHeaderHandler(HKEY("USER-AGENT"), Header_HandleUserAgent);
+       RegisterHeaderHandler(HKEY("X-FORWARDED-HOST"), Header_HandleXFFHost);
+       RegisterHeaderHandler(HKEY("HOST"), Header_HandleHost);
+       RegisterHeaderHandler(HKEY("X-FORWARDED-FOR"), Header_HandleXFF);
+       RegisterHeaderHandler(HKEY("ACCEPT-ENCODING"), Header_HandleAcceptEncoding);
+       RegisterHeaderHandler(HKEY("IF-MODIFIED-SINCE"), Header_HandleIfModSince);
+
+       RegisterNamespace("CURRENT_USER", 0, 1, tmplput_current_user, CTX_NONE);
+       RegisterNamespace("CURRENT_ROOM", 0, 1, tmplput_current_room, CTX_NONE);
+       RegisterNamespace("NONCE", 0, 0, tmplput_nonce, 0);
+
+       WebcitAddUrlHandler(HKEY("404"), do_404, ANONYMOUS|COOKIEUNNEEDED);
+/*
+ * Look for commonly-found probes of malware such as worms, viruses, trojans, and Microsoft Office.
+ * Short-circuit these requests so we don't have to send them through the full processing loop.
+ */
+       WebcitAddUrlHandler(HKEY("scripts"), do_404, ANONYMOUS|BOGUS); /* /root.exe     /* Worms and trojans and viruses, oh my! */
+       WebcitAddUrlHandler(HKEY("c"), do_404, ANONYMOUS|BOGUS);        /* /winnt */
+       WebcitAddUrlHandler(HKEY("MSADC"), do_404, ANONYMOUS|BOGUS);
+       WebcitAddUrlHandler(HKEY("_vti"), do_404, ANONYMOUS|BOGUS);             /* Broken Microsoft DAV implementation */
+       WebcitAddUrlHandler(HKEY("MSOffice"), do_404, ANONYMOUS|BOGUS);         /* Stoopid MSOffice thinks everyone is IIS */
+       WebcitAddUrlHandler(HKEY("nonexistenshit"), do_404, ANONYMOUS|BOGUS);   /* Exploit found in the wild January 2009 */
+}
+       
+
+
+void 
+HttpDestroyModule_CONTEXT
+(ParsedHttpHdrs *httpreq)
+{
+       FreeStrBuf(&httpreq->ReadBuf);
+       FreeStrBuf(&httpreq->PlainArgs);
+       FreeStrBuf(&httpreq->this_page);
+       DeleteHash(&httpreq->HTTPHeaders);
+
 }