]> code.citadel.org Git - citadel.git/blobdiff - webcit/context_loop.c
* add more module handlers:
[citadel.git] / webcit / context_loop.c
index c5e2836e5dd37a9edf5adc004976a17ca27d1034..208521386eb318cefe76e92a27da39b1a5a6462c 100644 (file)
 /*
- * context_loop.c
+ * $Id$
  *
  * 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$
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <stdio.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_LIMITS_H
-#include <limits.h>
-#endif
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
 #include "webcit.h"
 #include "webserver.h"
+#include "modules_init.h"
 
-/*
- * We keep one of these around for each active session
- */
-struct wc_session {
-       struct wc_session *next;        /* Next session in list */
-       int session_id;                 /* Session ID */
-       int inpipe[2];                  /* Data from webserver to session */
-       int outpipe[2];                 /* Data from session to webserver */
-       pthread_mutex_t critter;        /* Critical section uses pipes */
-       };
+/* Only one thread may manipulate SessionList at a time... */
+pthread_mutex_t SessionListMutex;
 
-struct wc_session *SessionList = NULL;
+wcsession *SessionList = NULL; /**< our sessions ????*/
 
-/* Only one thread may manipulate SessionList at a time... */
-pthread_mutex_t MasterCritter;
+pthread_key_t MyConKey;         /**< TSD key for MySession() */
 
-int GenerateSessionID(void) {
-       return getpid();
-       }
 
 
-void gets0(int fd, char buf[]) {
+void DestroySession(wcsession **sessions_to_kill)
+{
+       close((*sessions_to_kill)->serv_sock);
+       close((*sessions_to_kill)->chat_sock);
+/*
+//             if ((*sessions_to_kill)->preferences != NULL) {
+//                     free((*sessions_to_kill)->preferences);
+//             }
+*/
+       if ((*sessions_to_kill)->cache_fold != NULL) {
+               free((*sessions_to_kill)->cache_fold);
+       }
+       DeleteServInfo(&((*sessions_to_kill)->serv_info));
+       free_march_list((*sessions_to_kill));
+       
+       session_destroy_modules(*sessions_to_kill);
 
-       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;
+       free((*sessions_to_kill));
+       (*sessions_to_kill) = NULL;
+}
+
+void shutdown_sessions(void)
+{
+       wcsession *sptr;
+       
+       for (sptr = SessionList; sptr != NULL; sptr = sptr->next) {
+                       sptr->killthis = 1;
        }
+}
 
-/*
- * Collapse multiple cookies on one line
- */
-void req_gets(int sock, char *buf, char *hold) {
-       int a;
+void do_housekeeping(void)
+{
+       wcsession *sptr, *ss;
+       wcsession *sessions_to_kill = NULL;
+       int num_sessions = 0;
+       static int num_threads = MIN_WORKER_THREADS;
 
-       if (strlen(hold)==0) {
-               client_gets(sock, buf);
-               }
-       else {
-               strcpy(buf, hold);
+       /**
+        * Lock the session list, moving any candidates for euthanasia into
+        * a separate list.
+        */
+       pthread_mutex_lock(&SessionListMutex);
+       num_sessions = 0;
+       for (sptr = SessionList; sptr != NULL; sptr = sptr->next) {
+               ++num_sessions;
+
+               /** Kill idle sessions */
+               if ((time(NULL) - (sptr->lastreq)) >
+                  (time_t) WEBCIT_TIMEOUT) {
+                       sptr->killthis = 1;
                }
-       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;
+
+               /** Remove sessions flagged for kill */
+               if (sptr->killthis) {
+
+                       /** remove session from linked list */
+                       if (sptr == SessionList) {
+                               SessionList = SessionList->next;
+                       }
+                       else for (ss=SessionList;ss!=NULL;ss=ss->next) {
+                               if (ss->next == sptr) {
+                                       ss->next = ss->next->next;
+                               }
                        }
+
+                       sptr->next = sessions_to_kill;
+                       sessions_to_kill = sptr;
                }
        }
+       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);
+               pthread_mutex_unlock(&sessions_to_kill->SessionMutex);
+               sptr = sessions_to_kill->next;
+
+               DestroySession(&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.
+        */
+       while ( (num_sessions > num_threads)
+             && (num_threads <= MAX_WORKER_THREADS) ) {
+               spawn_another_worker_thread();
+               ++num_threads;
+               lprintf(3, "There are %d sessions and %d threads active.\n",
+                       num_sessions, num_threads);
+       }
+}
+
+
+/*
+ * Wake up occasionally and clean house
+ */
+void housekeeping_loop(void)
+{
+       while (1) {
+               sleeeeeeeeeep(HOUSEKEEPING);
+               do_housekeeping();
+       }
+}
+
 
 /*
- * Grab a lock on the session, so other threads don't try to access
- * the pipes at the same time.
+ * Create a Session id
+ * Generate a unique WebCit session ID (which is not the same thing as the
+ * Citadel session ID).
  */
-static void lock_session(struct wc_session *session) {
-        printf("Locking session %d...\n", session->session_id);
-        pthread_mutex_lock(&session->critter);
-        printf("   ...got lock\n");
+int GenerateSessionID(void)
+{
+       static int seq = (-1);
+
+       if (seq < 0) {
+               seq = (int) time(NULL);
        }
+               
+       return ++seq;
+}
+
 
 /*
- * Let go of the lock.
+ * lingering_close() a`la Apache. see
+ * http://www.apache.org/docs/misc/fin_wait_2.html for rationale
  */
-static void unlock_session(struct wc_session *session) {
-       printf("Unlocking.\n");
-       pthread_mutex_unlock(&session->critter);
+int lingering_close(int fd)
+{
+       char buf[SIZ];
+       int i;
+       fd_set set;
+       struct timeval tv, start;
+
+       gettimeofday(&start, NULL);
+       shutdown(fd, 1);
+       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);
+
+               if (i <= 0)
+                       break;
+
+               i = read(fd, buf, sizeof buf);
+       } while (i != 0 && (i != -1 || errno == EINTR));
+
+       return close(fd);
+}
+
+
+
+/*
+ * 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.
+ */
+int is_bogus(StrBuf *http_cmd) {
+       const char *url;
+       int i, max;
+       const char *bogus_prefixes[] = {
+               "/scripts/root.exe",    /* Worms and trojans and viruses, oh my! */
+               "/c/winnt",
+               "/MSADC/",
+               "/_vti",                /* Broken Microsoft DAV implementation */
+               "/MSOffice",            /* Stoopid MSOffice thinks everyone is IIS */
+               "/nonexistenshit"       /* Exploit found in the wild January 2009 */
+       };
+
+       url = ChrPtr(http_cmd);
+       if (IsEmptyStr(url)) return(1);
+       ++url;
+
+       max = sizeof(bogus_prefixes) / sizeof(char *);
+
+       for (i=0; i<max; ++i) {
+               if (!strncasecmp(url, bogus_prefixes[i], strlen(bogus_prefixes[i]))) {
+                       return(2);
+               }
        }
 
-extern const char *defaulthost;
-extern const char *defaultport;
+       return(0);      /* probably ok */
+}
+
+
+/*const char *nix(void *vptr) {return ChrPtr( (StrBuf*)vptr);}*/
 
 /*
- * This loop gets called once for every HTTP connection made to WebCit.
+ * 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.
+ *
+ * The job of this function is to locate the correct session and bind to it,
+ * or create a session if necessary and bind to it, then run the WebCit
+ * transaction loop.  Afterwards, we unbind from the session.  When this
+ * function returns, the worker thread is then free to handle another
+ * transaction.
  */
-void *context_loop(int sock) {
-       char (*req)[256];
-       char buf[256], hold[256];
-       int num_lines = 0;
-       int a;
-       int f;
+void context_loop(int *sock)
+{
+       const char *Pos = NULL;
+       const char *buf;
        int desired_session = 0;
-       char str_session[256];
-       struct wc_session *sptr;
-       struct wc_session *TheSession;
-       int ContentLength;
-       int CloseSession = 0;
-
-       if ((req = malloc(sizeof(char[256][256]))) == NULL) {
-               printf("Can't malloc buffers; dropping connection.\n");
-               close (sock);
-               return NULL;
-               }
+       int got_cookie = 0;
+       int gzip_ok = 0;
+       wcsession *TheSession, *sptr;
+       char httpauth_string[1024];
+       char httpauth_user[1024];
+       char httpauth_pass[1024];
+       int session_is_new = 0;
+       int nLine = 0;
+       int LineLen;
+       void *vLine;
+       StrBuf *Buf, *Line, *LastLine, *HeaderName, *ReqLine, *ReqType, *HTTPVersion;
+       const char *pch, *pchs, *pche;
+       HashList *HTTPHeaders;
 
-       printf("Reading request from socket %d\n", sock);
+       strcpy(httpauth_string, "");
+       strcpy(httpauth_user, DEFAULT_HTTPAUTH_USER);
+       strcpy(httpauth_pass, DEFAULT_HTTPAUTH_PASS);
 
        /*
         * Find out what it is that the web browser is asking for
         */
-       ContentLength = 0;
-       do {
-               req_gets(sock, buf, hold);
-               if (!strncasecmp(buf, "Cookie: wc_session=", 19)) {
-                       desired_session = atoi(&buf[19]);
-                       }
-               if (!strncasecmp(buf, "Content-length: ", 16)) {
-                       ContentLength = atoi(&buf[16]);
-                       }
-               strcpy(&req[num_lines++][0], buf);
-               } while(strlen(buf)>0);
+       HeaderName = NewStrBuf();
+       Buf = NewStrBuf();
+       LastLine = NULL;
+       HTTPHeaders = NewHash(1, NULL);
 
        /*
-        * See if there's an existing session open with the desired ID
+        * Read in the request
         */
-       TheSession = NULL;
-       if (desired_session != 0) {
-               pthread_mutex_lock(&MasterCritter);
-               for (sptr=SessionList; sptr!=NULL; sptr=sptr->next) {
-                       if (sptr->session_id == desired_session) {
-                               TheSession = sptr;
-                               lock_session(TheSession);
-                               }
-                       }
-               pthread_mutex_unlock(&MasterCritter);
+       do {
+               nLine ++;
+               Line = NewStrBuf();
+
+
+               if (ClientGetLine(sock, Line, Buf, &Pos) < 0) return;
+
+               LineLen = StrLength(Line);
+
+               if (nLine == 1) {
+                       ReqLine = Line;
+                       continue;
+               }
+               if (LineLen == 0) {
+                       FreeStrBuf(&Line);
+                       continue;
                }
 
-       /*
-        * Create a new session if we have to
-        */
-       if (TheSession == NULL) {
-               printf("Creating a new session\n");
-               pthread_mutex_lock(&MasterCritter);
-               TheSession = (struct wc_session *)
-                       malloc(sizeof(struct wc_session));
-               TheSession->session_id = GenerateSessionID();
-               pipe(TheSession->inpipe);
-               pipe(TheSession->outpipe);
-               pthread_mutex_init(&TheSession->critter, NULL);
-               lock_session(TheSession);
-               TheSession->next = SessionList;
-               SessionList = TheSession;
-               pthread_mutex_unlock(&MasterCritter);
-               sprintf(str_session, "%d", TheSession->session_id);
-               f = fork();
-               fflush(stdout); fflush(stdin);
-               if (f==0) {
-                       dup2(TheSession->inpipe[0], 0);
-                       dup2(TheSession->outpipe[1], 1);
-                       /* Close the ends of the pipes that we're not using */
-                       close(TheSession->inpipe[1]);
-                       close(TheSession->outpipe[0]);
-                       execlp("./webcit", "webcit", str_session, defaulthost,
-                              defaultport, NULL);
-                       printf("HTTP/1.0 404 WebCit Failure\n\n");
-                       printf("Server: %s\n", SERVER);
-                       printf("Content-type: text/html\n");
-                       printf("Content-length: 76\n");
-                       printf("\n");
-                       printf("<HTML><HEAD><TITLE>Error</TITLE></HEAD>\n");
-                       printf("<BODY>execlp() failed</BODY></HTML>\n");
-                       exit(0);
-                       }
-               /* Close the ends of the pipes that we're not using */
-               close(TheSession->inpipe[0]);
-               close(TheSession->outpipe[1]);
+               /* 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;
                }
 
-       /* 
-        * Send the request to the appropriate session...
+               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);
+               Put(HTTPHeaders, SKEY(HeaderName), Line, HFreeStrBuf);
+               LastLine = Line;
+       } while (LineLen > 0);
+       FreeStrBuf(&HeaderName);
+
+/*     dbg_PrintHash(HTTPHeaders, nix, NULL);  */
+
+
+       /*
+        * Can we compress?
         */
-       printf("   Writing %d lines of command\n", num_lines);
-       printf("%s\n", &req[0][0]);
-       for (a=0; a<num_lines; ++a) {
-               write(TheSession->inpipe[1], &req[a][0], strlen(&req[a][0]));
-               write(TheSession->inpipe[1], "\n", 1);
-               }
-       printf("   Writing %d bytes of content\n", ContentLength);
-       while (ContentLength--) {
-               read(sock, buf, 1);
-               write(TheSession->inpipe[1], buf, 1);
+       if (GetHash(HTTPHeaders, HKEY("ACCEPT-ENCODING"), &vLine) && 
+           (vLine != NULL)) {
+               buf = ChrPtr((StrBuf*)vLine);
+               if (strstr(&buf[16], "gzip")) {
+                       gzip_ok = 1;
                }
+       }
 
        /*
-        * ...and get the response.
+        * Browser-based sessions use cookies for session authentication
         */
-       printf("   Reading response\n");
-       ContentLength = 0;
-       do {
-               gets0(TheSession->outpipe[0], buf);
-               write(sock, buf, strlen(buf));
-               write(sock, "\n", 1);
-               if (!strncasecmp(buf, "Content-length: ", 16))
-                       ContentLength = atoi(&buf[16]);
-               if (!strcasecmp(buf, "X-WebCit-Session: close")) {
-                       CloseSession = 1;
-                       }
-               } while (strlen(buf) > 0);
+       if (GetHash(HTTPHeaders, HKEY("COOKIE"), &vLine) && 
+           (vLine != NULL)) {
+               cookie_to_stuff(vLine, &desired_session,
+                               NULL, NULL, NULL);
+               got_cookie = 1;
+       }
 
-       printf("   Reading %d bytes of content\n", ContentLength);
-       while(ContentLength--) {
-               read(TheSession->outpipe[0], buf, 1);
-               write(sock, buf, 1);
+       /*
+        * GroupDAV-based sessions use HTTP authentication
+        */
+       if (GetHash(HTTPHeaders, HKEY("AUTHORIZATION"), &vLine) && 
+           (vLine != NULL)) {
+               Line = (StrBuf*)vLine;
+               if (strncasecmp(ChrPtr(Line), "Basic", 5) == 0) {
+                       StrBufCutLeft(Line, 6);
+                       CtdlDecodeBase64(httpauth_string, ChrPtr(Line), StrLength(Line));
+                       extract_token(httpauth_user, httpauth_string, 0, ':', sizeof httpauth_user);
+                       extract_token(httpauth_pass, httpauth_string, 1, ':', sizeof httpauth_pass);
                }
+               else 
+                       lprintf(1, "Authentication scheme not supported! [%s]\n", ChrPtr(Line));
+       }
+
+       if (GetHash(HTTPHeaders, HKEY("IF-MODIFIED-SINCE"), &vLine) && 
+           (vLine != NULL)) {
+               if_modified_since = httpdate_to_timestamp((StrBuf*)vLine);
+       }
+
+
+
+       ReqType = NewStrBuf();
+       HTTPVersion = NewStrBuf();
+       StrBufExtract_token(HTTPVersion, ReqLine, 2, ' ');
+       StrBufExtract_token(ReqType, ReqLine, 0, ' ');
+       StrBufCutLeft(ReqLine, StrLength(ReqType) + 1);
+       StrBufCutRight(ReqLine, StrLength(HTTPVersion) + 1);
 
        /*
-        * Now our HTTP connection is done.  It would be relatively easy
-        * to support HTTP/1.1 "persistent" connections by looping back to
-        * the top of this function.  For now, we'll just close.
+        * 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.
         */
-       printf("   Closing socket\n");
-       close(sock);
+       if ( (StrLength(ReqLine) >= 8) && (strstr(ChrPtr(ReqLine), "/webcit/")) ) {
+               StrBufCutLeft(ReqLine, 7);
+       }
 
-       unlock_session(TheSession);
+       /* 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 %s\n", ChrPtr(ReqType), ChrPtr(ReqLine), ChrPtr(HTTPVersion));
+#ifdef TECH_PREVIEW
+       }
+#endif
 
-       /*
-        * If the last response included a "close session" directive,
-        * remove the context now.
+       /** Check for bogus requests */
+       if ((StrLength(HTTPVersion) == 0) ||
+           (StrLength(ReqType) == 0) || 
+           is_bogus(ReqLine)) {
+               StrBufPlain(ReqLine, HKEY("/404 HTTP/1.1"));
+               StrBufPlain(ReqType, HKEY("GET"));
+       }
+       FreeStrBuf(&HTTPVersion);
+
+       /**
+        * While we're at it, gracefully handle requests for the
+        * robots.txt and favicon.ico files.
+        */
+       if (!strncasecmp(ChrPtr(ReqLine), "/robots.txt", 11)) {
+               StrBufPlain(ReqLine, 
+                           HKEY("/static/robots.txt"
+                                "?force_close_session=yes HTTP/1.1"));
+               StrBufPlain(ReqType, HKEY("GET"));
+       }
+       else if (!strncasecmp(ChrPtr(ReqLine), "/favicon.ico", 12)) {
+               StrBufPlain(ReqLine, HKEY("/static/favicon.ico"));
+               StrBufPlain(ReqType, HKEY("GET"));
+       }
+
+       /**
+        * 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.
         */
-       if (CloseSession) {
-               printf("Removing session.\n");
-               pthread_mutex_lock(&MasterCritter);
+       else if ( (StrLength(ReqLine) > 1 )
+               && (strncasecmp(ChrPtr(ReqLine), "/listsub", 8))
+               && (strncasecmp(ChrPtr(ReqLine), "/freebusy", 9))
+               && (strncasecmp(ChrPtr(ReqLine), "/do_logout", 10))
+               && (strncasecmp(ChrPtr(ReqLine), "/groupdav", 9))
+               && (strncasecmp(ChrPtr(ReqLine), "/static", 7))
+               && (strncasecmp(ChrPtr(ReqLine), "/rss", 4))
+               && (strncasecmp(ChrPtr(ReqLine), "/404", 4))
+               && (got_cookie == 0)) {
+               StrBufPlain(ReqLine, 
+                           HKEY("/static/nocookies.html"
+                                "?force_close_session=yes"));
+       }
 
-               lock_session(TheSession);
+       /**
+        * 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) && (TheSession == NULL)); 
+                     sptr = sptr->next) {
 
-               if (SessionList==TheSession) {
-                       SessionList = SessionList->next;
+                       /** If HTTP-AUTH, look for a session with matching credentials */
+                       if ( (!IsEmptyStr(httpauth_user))
+                            &&(!strcasecmp(ChrPtr(sptr->httpauth_user), httpauth_user))
+                            &&(!strcasecmp(ChrPtr(sptr->httpauth_pass), httpauth_pass)) ) {
+                               TheSession = sptr;
                        }
-               else {
-                       for (sptr=SessionList; sptr!=NULL; sptr=sptr->next) {
-                               if (sptr->next == TheSession) {
-                                       sptr->next = TheSession->next;
-                                       }
-                               }
+
+                       /** If cookie-session, look for a session with matching session ID */
+                       if ( (desired_session != 0) && (sptr->wc_session == desired_session)) {
+                               TheSession = sptr;
                        }
 
-               close(TheSession->inpipe[1]);
-               close(TheSession->outpipe[0]);
-               unlock_session(TheSession);
-               free(TheSession);
+               }
+               pthread_mutex_unlock(&SessionListMutex);
+       }
+
+       /**
+        * Create a new session if we have to
+        */
+       if (TheSession == NULL) {
+               lprintf(3, "Creating a new session\n");
+               TheSession = (wcsession *)
+                       malloc(sizeof(wcsession));
+               memset(TheSession, 0, sizeof(wcsession));
+               TheSession->headers = HTTPHeaders;
+               TheSession->serv_sock = (-1);
+               TheSession->chat_sock = (-1);
        
-               pthread_mutex_unlock(&MasterCritter);
+               /* 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 (desired_session == 0) {
+                       TheSession->wc_session = GenerateSessionID();
+               }
+               else {
+                       TheSession->wc_session = desired_session;
                }
 
-       free(req);
+               TheSession->httpauth_user = NewStrBufPlain(httpauth_user, -1);
+               TheSession->httpauth_pass = NewStrBufPlain(httpauth_user, -1);
+
+               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);
+               session_is_new = 1;
+       }
+       TheSession->headers = HTTPHeaders;
 
        /*
-        * The thread handling this HTTP connection is now finished.
+        * A future improvement might be to check the session integrity
+        * at this point before continuing.
         */
-       return NULL;
-       }
+
+       /*
+        * Bind to the session and perform the transaction
+        */
+       pthread_mutex_lock(&TheSession->SessionMutex);          /* bind */
+       pthread_setspecific(MyConKey, (void *)TheSession);
+       
+       TheSession->lastreq = time(NULL);                       /* log */
+       TheSession->http_sock = *sock;
+       TheSession->gzip_ok = gzip_ok;
+
+       session_attach_modules(TheSession);
+
+       session_loop(ReqLine, ReqType, Buf, &Pos);                              /* do transaction */
+       session_detach_modules(TheSession);
+
+       TheSession->headers = NULL;
+       pthread_mutex_unlock(&TheSession->SessionMutex);        /* unbind */
+
+       /* Free the request buffer */
+       DeleteHash(&HTTPHeaders);
+       FreeStrBuf(&ReqLine);
+       FreeStrBuf(&ReqType);
+       FreeStrBuf(&Buf);
+}
+
+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 
+InitModule_CONTEXT
+(void)
+{
+       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);
+}