* move serv_info into the session, here we can control its de/allocation the right...
[citadel.git] / webcit / context_loop.c
index 11a997c1bbb2527a28225ba06bd2fe7cc13877cc..c8461d2c8f56741209994d08d953c68db1c9ff25 100644 (file)
@@ -1,48 +1,72 @@
 /*
  * $Id$
- */
-/**
- * \defgroup WebServerII some of the webserver stuff.
+ *
  * This is the other half of the webserver.  It handles the task of hooking
  * 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 started.
  *
  */
-/*@{*/
+
 #include "webcit.h"
 #include "webserver.h"
 
-/** Only one thread may manipulate SessionList at a time... */
+/* Only one thread may manipulate SessionList at a time... */
 pthread_mutex_t SessionListMutex;
 
-struct wcsession *SessionList = NULL; /**< our sessions ????*/
+wcsession *SessionList = NULL; /**< our sessions ????*/
 
 pthread_key_t MyConKey;         /**< TSD key for MySession() */
 
 
-/**
- * \brief free the memory used for viewing atachments
- * \param sess the session object to destroy
- */
-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 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));
+       DeleteHash(&((*sessions_to_kill)->attachments));
+       free_march_list((*sessions_to_kill));
+       DeleteHash(&((*sessions_to_kill)->hash_prefs));
+       DeleteHash(&((*sessions_to_kill)->IconBarSettings));
+       DeleteHash(&((*sessions_to_kill)->ServCfg));
+       FreeStrBuf(&((*sessions_to_kill)->UrlFragment1));
+       FreeStrBuf(&((*sessions_to_kill)->UrlFragment2));
+       FreeStrBuf(&((*sessions_to_kill)->UrlFragment3));
+       FreeStrBuf(&((*sessions_to_kill)->WBuf));
+       FreeStrBuf(&((*sessions_to_kill)->HBuf));
+       FreeStrBuf(&((*sessions_to_kill)->CLineBuf));
+       FreeStrBuf(&((*sessions_to_kill)->wc_username));
+       FreeStrBuf(&((*sessions_to_kill)->wc_fullname));
+       FreeStrBuf(&((*sessions_to_kill)->wc_password));
+       FreeStrBuf(&((*sessions_to_kill)->wc_roomname));
+       FreeStrBuf(&((*sessions_to_kill)->httpauth_user));
+       FreeStrBuf(&((*sessions_to_kill)->httpauth_pass));
+       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;
        }
 }
 
-/**
- * \brief what??????
- */
 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;
 
@@ -86,18 +110,10 @@ void do_housekeeping(void)
        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);
-               }
-               if (sessions_to_kill->cache_fold != NULL) {
-                       free(sessions_to_kill->cache_fold);
-               }
-               free_attachments(sessions_to_kill);
                pthread_mutex_unlock(&sessions_to_kill->SessionMutex);
                sptr = sessions_to_kill->next;
-               free(sessions_to_kill);
+
+               DestroySession(&sessions_to_kill);
                sessions_to_kill = sptr;
                --num_sessions;
        }
@@ -116,8 +132,8 @@ void do_housekeeping(void)
 }
 
 
-/**
- * \brief Wake up occasionally and clean house
+/*
+ * Wake up occasionally and clean house
  */
 void housekeeping_loop(void)
 {
@@ -128,13 +144,10 @@ void housekeeping_loop(void)
 }
 
 
-/**
- * \brief Create a Session id
+/*
+ * Create a Session id
  * Generate a unique WebCit session ID (which is not the same thing as the
  * Citadel session ID).
- *
- * \todo FIXME ... ensure that session number is truly unique
- *
  */
 int GenerateSessionID(void)
 {
@@ -147,47 +160,21 @@ int GenerateSessionID(void)
        return ++seq;
 }
 
-
-/**
- * \brief Collapse multiple cookies on one line
- * \param sock a socket?
- * \param buf some bunch of chars?
- * \param hold hold what?
+/*
+ * Collapse multiple cookies on one line
  */
-int req_gets(int sock, char *buf, char *hold)
+int ReqGetStrBuf(int *sock, StrBuf *Target, StrBuf *buf)
 {
-       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);
+       
+       return ClientGetLine(sock, Target, buf);
 }
 
-/**
- * \brief close some fd for some reason???
- * \param fd the fd to close??????
+
+
+/*
  * lingering_close() a`la Apache. see
  * http://www.apache.org/docs/misc/fin_wait_2.html for rationale
  */
-
 int lingering_close(int fd)
 {
        char buf[SIZ];
@@ -222,27 +209,43 @@ int lingering_close(int fd)
 
 
 
-/**
- * \brief sanity requests
- * 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.
- * \param http_cmd the cmd to check
+/*
+ * 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(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);
+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);
+               }
+       }
 
        return(0);      /* probably ok */
 }
 
 
+const char *nix(void *vptr) {return ChrPtr( (StrBuf*)vptr);}
 
-/**
- * \brief handle one request
+/*
+ * 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.
@@ -252,127 +255,188 @@ int is_bogus(char *http_cmd) {
  * transaction loop.  Afterwards, we unbind from the session.  When this
  * function returns, the worker thread is then free to handle another
  * transaction.
- * \param sock the socket we will put our answer to
  */
-void context_loop(int sock)
+void context_loop(int *sock)
 {
-       struct httprequest *req = NULL;
-       struct httprequest *last = NULL;
-       struct httprequest *hptr;
-       char buf[SIZ], hold[SIZ];
+       const char *buf;
        int desired_session = 0;
        int got_cookie = 0;
        int gzip_ok = 0;
-       struct wcsession *TheSession, *sptr;
+       wcsession *TheSession, *sptr;
        char httpauth_string[1024];
        char httpauth_user[1024];
        char httpauth_pass[1024];
-       char accept_language[256];
-       char *ptr = NULL;
        int session_is_new = 0;
+       int nLine = 0;
+       int LineLen;
+       void *vLine;
+       StrBuf *Buf, *Line, *LastLine, *HeaderName, *ReqLine, *ReqType, *HTTPVersion;
+       StrBuf *accept_language = NULL;
+       const char *pch, *pchs, *pche;
+       HashList *HTTPHeaders;
 
        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
         */
-       memset(hold, 0, sizeof(hold));
+       HeaderName = NewStrBuf();
+       Buf = NewStrBuf();
+       LastLine = NULL;
+       HTTPHeaders = NewHash(1, NULL);
+
+       /*
+        * Read in the request
+        */
        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;
-                       }
-               }
+               nLine ++;
+               Line = NewStrBuf();
+               if (ReqGetStrBuf(sock, Line, Buf) < 0) return;
+
+               LineLen = StrLength(Line);
 
-               /**
-                * 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;
+               if (nLine == 1) {
+                       ReqLine = Line;
+                       continue;
+               }
+               if (LineLen == 0) {
+                       FreeStrBuf(&Line);
+                       continue;
                }
 
-               /**
-                * 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);
+               /* 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;
                }
 
-               if (!strncasecmp(buf, "If-Modified-Since: ", 19)) {
-                       if_modified_since = httpdate_to_timestamp(&buf[19]);
+               StrBufExtract_token(HeaderName, Line, 0, ':');
+               /*/// TODO: filter bad chars! */
+
+               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?
+        */
+       if (GetHash(HTTPHeaders, HKEY("ACCEPT-ENCODING"), &vLine) && 
+           (vLine != NULL)) {
+               buf = ChrPtr((StrBuf*)vLine);
+               if (strstr(&buf[16], "gzip")) {
+                       gzip_ok = 1;
                }
+       }
+
+       /*
+        * Browser-based sessions use cookies for session authentication
+        */
+       if (GetHash(HTTPHeaders, HKEY("COOKIE"), &vLine) && 
+           (vLine != NULL)) {
+               cookie_to_stuff(vLine, &desired_session,
+                               NULL, NULL, NULL);
+               got_cookie = 1;
+       }
 
-               if (!strncasecmp(buf, "Accept-Language: ", 17)) {
-                       safestrncpy(accept_language, &buf[17], sizeof accept_language);
+       /*
+        * 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));
+       }
 
-               /**
-                * 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;
+       if (GetHash(HTTPHeaders, HKEY("IF-MODIFIED-SINCE"), &vLine) && 
+           (vLine != NULL)) {
+               if_modified_since = httpdate_to_timestamp((StrBuf*)vLine);
+       }
 
-               safestrncpy(hptr->line, buf, sizeof hptr->line);
+       if (GetHash(HTTPHeaders, HKEY("ACCEPT-LANGUAGE"), &vLine) && 
+           (vLine != NULL)) {
+               accept_language = (StrBuf*) vLine;
+       }
 
-       } while (strlen(buf) > 0);
 
-       /**
+       ReqType = NewStrBuf();
+       HTTPVersion = NewStrBuf();
+       StrBufExtract_token(HTTPVersion, ReqLine, 2, ' ');
+       StrBufExtract_token(ReqType, ReqLine, 0, ' ');
+       StrBufCutLeft(ReqLine, StrLength(ReqType) + 1);
+       StrBufCutRight(ReqLine, StrLength(HTTPVersion) + 1);
+
+       /*
         * 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.
         */
-       
-       ptr = strstr(req->line, " /webcit ");   /*< Handle "/webcit" */
-       if (ptr != NULL) {
-               strcpy(ptr+2, ptr+8);
+       if ( (StrLength(ReqLine) >= 8) && (strstr(ChrPtr(ReqLine), "/webcit/")) ) {
+               StrBufCutLeft(ReqLine, 7);
        }
 
-       ptr = strstr(req->line, " /webcit");    /*< Handle "/webcit/" */
-       if (ptr != NULL) {
-               strcpy(ptr+1, ptr+8);
+       /* 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
        }
-
-       /** Begin parsing the request. */
-
-       safestrncpy(buf, req->line, sizeof buf);
-       lprintf(5, "HTTP: %s\n", buf);
+#endif
 
        /** Check for bogus requests */
-       if (is_bogus(buf)) goto bail;
-
-       /**
-        * Strip out the method, leaving the URL up front...
-        */
-       remove_token(buf, 0, ' ');
-       if (buf[1]==' ') buf[1]=0;
+       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(buf, "/robots.txt", 11)) {
-               strcpy(req->line, "GET /static/robots.txt"
-                               "?force_close_session=yes HTTP/1.1");
+       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(buf, "/favicon.ico", 12)) {
-               strcpy(req->line, "GET /static/favicon.ico");
+       else if (!strncasecmp(ChrPtr(ReqLine), "/favicon.ico", 12)) {
+               StrBufPlain(ReqLine, HKEY("/static/favicon.ico"));
+               StrBufPlain(ReqType, HKEY("GET"));
        }
 
        /**
@@ -381,16 +445,18 @@ void context_loop(int sock)
         * 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, "/static", 7))
-               && (strncasecmp(buf, "/rss", 4))
+       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)) {
-               strcpy(req->line, "GET /static/nocookies.html"
-                               "?force_close_session=yes HTTP/1.1");
+               StrBufPlain(ReqLine, 
+                           HKEY("/static/nocookies.html"
+                                "?force_close_session=yes"));
        }
 
        /**
@@ -403,9 +469,9 @@ void context_loop(int sock)
                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)) ) {
+                       if ( (!IsEmptyStr(httpauth_user))
+                            &&(!strcasecmp(ChrPtr(sptr->httpauth_user), httpauth_user))
+                            &&(!strcasecmp(ChrPtr(sptr->httpauth_pass), httpauth_pass)) ) {
                                TheSession = sptr;
                        }
 
@@ -423,58 +489,120 @@ void context_loop(int sock)
         */
        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->serv_sock = (-1);
                TheSession->chat_sock = (-1);
-               TheSession->wc_session = GenerateSessionID();
-               strcpy(TheSession->httpauth_user, httpauth_user);
-               strcpy(TheSession->httpauth_pass, httpauth_pass);
+       
+               /* 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;
+               }
+
+               if (TheSession->httpauth_user != NULL){
+                       FlushStrBuf(TheSession->httpauth_user);
+                       StrBufAppendBufPlain(TheSession->httpauth_user, httpauth_user, -1, 0);
+               }
+               else TheSession->httpauth_user = NewStrBufPlain(httpauth_user, -1);
+               if (TheSession->httpauth_user != NULL){
+                       FlushStrBuf(TheSession->httpauth_pass);
+                       StrBufAppendBufPlain(TheSession->httpauth_pass, httpauth_user, -1, 0);
+               }
+               else TheSession->httpauth_pass = NewStrBufPlain(httpauth_user, -1);
+
+               TheSession->CLineBuf = NewStrBuf();
+               TheSession->hash_prefs = NewHash(1,NULL);       /* Get a hash table for the user preferences */
                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;
        }
 
-       /**
+       /*
         * A future improvement might be to check the session integrity
         * at this point before continuing.
         */
 
-       /**
+       /*
         * Bind to the session and perform the transaction
         */
-       pthread_mutex_lock(&TheSession->SessionMutex);          /*< bind */
+       pthread_mutex_lock(&TheSession->SessionMutex);          /* bind */
        pthread_setspecific(MyConKey, (void *)TheSession);
-       TheSession->http_sock = sock;
-       TheSession->lastreq = time(NULL);                       /*< log */
+       
+       TheSession->urlstrings = NewHash(1,NULL);
+       TheSession->vars = NewHash(1,NULL);
+       TheSession->http_sock = *sock;
+       TheSession->lastreq = time(NULL);                       /* log */
        TheSession->gzip_ok = gzip_ok;
 #ifdef ENABLE_NLS
        if (session_is_new) {
                httplang_to_locale(accept_language);
        }
-       go_selected_language();                         /*< set locale */
+       go_selected_language();                                 /* set locale */
 #endif
-       session_loop(req);                              /*< do transaction */
+       session_loop(HTTPHeaders, ReqLine, ReqType, Buf);                               /* do transaction */
 #ifdef ENABLE_NLS
-       stop_selected_language();                       /*< unset locale */
+       stop_selected_language();                               /* unset locale */
 #endif
-       pthread_mutex_unlock(&TheSession->SessionMutex);        /*< unbind */
-
-       /** Free the request buffer */
-bail:  while (req != NULL) {
-               hptr = req->next;
-               free(req);
-               req = hptr;
-       }
-
-       /**
+       DeleteHash(&TheSession->summ);
+       DeleteHash(&TheSession->urlstrings);
+       DeleteHash(&TheSession->vars);
+       FreeStrBuf(&TheSession->WBuf);
+       FreeStrBuf(&TheSession->HBuf);
+       
+       
+       pthread_mutex_unlock(&TheSession->SessionMutex);        /* unbind */
+
+       /* Free the request buffer */
+       DeleteHash(&HTTPHeaders);
+       FreeStrBuf(&ReqLine);
+       FreeStrBuf(&ReqType);
+       FreeStrBuf(&Buf);
+       /*
         * Free up any session-local substitution variables which
         * were set during this transaction
         */
-       clear_local_substs();
+       
+       
+}
+
+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);
 }
-/*@}*/