X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fcontext_loop.c;h=db6fd289a5afce695f9413237901a664de60e45b;hb=1f494963f66495189901c38c84cbc6d6b3e9f952;hp=b7416f0ac10d475e16a4a8fd807eb239b985fdb8;hpb=97f4b105f03c61fbbb6d0ab86f8cb73c238bd8ff;p=citadel.git

diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index b7416f0ac..db6fd289a 100644
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -10,54 +10,29 @@
 
 #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; /**< our sessions ????*/
+wcsession *SessionList = NULL; /**< our sessions ????*/
 
 pthread_key_t MyConKey;         /**< TSD key for MySession() */
+HashList *HttpReqTypes = NULL;
+HashList *HttpHeaderHandler = NULL;
+extern HashList *HandlerHash;
 
-
-/*
- * free the memory used for viewing atachments
- */
-void free_attachment(void *vattach) {
-	wc_attachment *att = (wc_attachment*) vattach;
-	FreeStrBuf(&att->content_type);
-	FreeStrBuf(&att->filename);
-	free(att->data);
-	free(att);
-}
-
-
-void DestroySession(struct wcsession **sessions_to_kill)
+void DestroyHttpHeaderHandler(void *V)
 {
-	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);
-	}
-	DeleteHash(&((*sessions_to_kill)->attachments));
-	free_march_list((*sessions_to_kill));
-	DeleteHash(&((*sessions_to_kill)->hash_prefs));
-	DeleteHash(&((*sessions_to_kill)->IconBarSetttings));
-	DeleteHash(&((*sessions_to_kill)->ServCfg));
-	FreeStrBuf(&((*sessions_to_kill)->UrlFragment1));
-	FreeStrBuf(&((*sessions_to_kill)->UrlFragment2));
-	FreeStrBuf(&((*sessions_to_kill)->WBuf));
-	FreeStrBuf(&((*sessions_to_kill)->HBuf));
-	FreeStrBuf(&((*sessions_to_kill)->CLineBuf));
-	free((*sessions_to_kill));
-	(*sessions_to_kill) = NULL;
+	OneHttpHeader *pHdr;
+	pHdr = (OneHttpHeader*) V;
+	FreeStrBuf(&pHdr->Val);
+	free(pHdr);
 }
 
 void shutdown_sessions(void)
 {
-	struct wcsession *sptr;
+	wcsession *sptr;
 	
 	for (sptr = SessionList; sptr != NULL; sptr = sptr->next) {
 			sptr->killthis = 1;
@@ -66,8 +41,8 @@ void shutdown_sessions(void)
 
 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;
 
@@ -114,7 +89,7 @@ void do_housekeeping(void)
 		pthread_mutex_unlock(&sessions_to_kill->SessionMutex);
 		sptr = sessions_to_kill->next;
 
-		DestroySession(&sessions_to_kill);
+		session_destroy_modules(&sessions_to_kill);
 		sessions_to_kill = sptr;
 		--num_sessions;
 	}
@@ -133,8 +108,8 @@ void do_housekeeping(void)
 }
 
 
-/**
- * \brief Wake up occasionally and clean house
+/*
+ * Wake up occasionally and clean house
  */
 void housekeeping_loop(void)
 {
@@ -145,13 +120,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)
 {
@@ -165,55 +137,6 @@ int GenerateSessionID(void)
 }
 
 
-/*
- * Collapse multiple cookies on one line
- */
-////int req_gets(int *sock, char *buf, char *hold, size_t hlen)
-////{
-////	int a, b;
-////
-////	if (IsEmptyStr(hold)) {
-////		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)) {
-////		int len;
-////		len = strlen(buf);
-////		for (a = 0; a < len; ++a)
-////			if (buf[a] == ';') {
-////				// we don't refresh len, because of we 
-////				// only exit from here.
-////				snprintf(hold, hlen, "Cookie: %s", &buf[a + 1]);
-////				buf[a] = 0;
-////				b = 8;
-////				while (isspace(hold[b]))
-////					b++;
-////				
-////				memmove(&hold[8], &hold[b], len - b + 1);
-////				return(0);
-////			}
-////	}
-////
-////	return(0);
-////}
-
-
-/*
- * Collapse multiple cookies on one line
- */
-int ReqGetStrBuf(int *sock, StrBuf *Target, StrBuf *buf)
-{
-	
-	return ClientGetLine(sock, Target, buf);
-}
-
-
-
 /*
  * lingering_close() a`la Apache. see
  * http://www.apache.org/docs/misc/fin_wait_2.html for rationale
@@ -252,28 +175,48 @@ int lingering_close(int fd)
 
 
 
+
 /**
- * \brief	sanity requests
- *		Check for bogus requests coming from brain-dead Windows boxes.
- *
- * \param	http_cmd	The HTTP request to check
+ * \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;
+}
+
+
+
+/*
+ * 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) {
+int is_bogus(StrBuf *http_cmd) {////TODO!
 	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;
 
-	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 */
-	};
-
 	max = sizeof(bogus_prefixes) / sizeof(char *);
 
 	for (i=0; i<max; ++i) {
@@ -286,72 +229,130 @@ int is_bogus(StrBuf *http_cmd) {
 }
 
 
-const char *nix(void *vptr) {return ChrPtr( (StrBuf*)vptr);}
+int ReadHttpSubject(ParsedHttpHdrs *Hdr, StrBuf *Line, StrBuf *Buf)
+{
+	const char *Args;
+	void *vLine, *vHandler;
+	const char *Pos = NULL;
+
+
+	Hdr->ReqLine = Line;
+	/* The requesttype... GET, POST... */
+	StrBufExtract_token(Buf, Hdr->ReqLine, 0, ' ');
+	if (GetHash(HttpReqTypes, SKEY(Buf), &vLine) &&
+	    (vLine != NULL))
+	{
+		Hdr->eReqType = *(long*)vLine;
+	}
+	else {
+		Hdr->eReqType = eGET;
+		return 1;
+	}
+	StrBufCutLeft(Hdr->ReqLine, StrLength(Buf) + 1);
+
+	/* the HTTP Version... */
+	StrBufExtract_token(Buf, Hdr->ReqLine, 1, ' ');
+	StrBufCutRight(Hdr->ReqLine, StrLength(Buf) + 1);
+	if ((StrLength(Buf) == 0) ||
+	    is_bogus(Hdr->ReqLine)) {
+		Hdr->eReqType = eGET;
+		return 1;
+	}
 
-/**
- * \brief 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.
- * \param sock the socket we will put our answer to
+	Hdr->this_page = NewStrBufDup(Hdr->ReqLine);
+	/* chop Filename / query arguments */
+	Args = strchr(ChrPtr(Hdr->ReqLine), '?');
+	if (Args == NULL) /* whe're not that picky about params... TODO: this will spoil '&' in filenames.*/
+		Args = strchr(ChrPtr(Hdr->ReqLine), '&');
+	if (Args != NULL) {
+		Hdr->PlainArgs = NewStrBufPlain(
+			Args, 
+			StrLength(Hdr->ReqLine) -
+			(Args - ChrPtr(Hdr->ReqLine)));
+		StrBufCutAt(Hdr->ReqLine, 0, Args);
+	} /* 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->ReqLine, &Pos, '/');
+	do {
+		StrBufExtract_NextToken(Buf, Hdr->ReqLine, &Pos, '/');
+
+		GetHash(HandlerHash, SKEY(Buf), &vHandler),
+		Hdr->Handler = (WebcitHandler*) vHandler;
+		if (Hdr->Handler == NULL)
+			break;
+		/* are we about to ignore some prefix like webcit/ ? */
+		if ((Hdr->Handler->Flags & URLNAMESPACE) == 0)
+			break;
+	} while (1);
+	/* remove the handlername from the URL */
+	if (Pos != NULL) {
+		StrBufCutLeft(Hdr->ReqLine, 
+			      Pos - ChrPtr(Hdr->ReqLine));
+	}
+/*
+	if (Hdr->Handler == NULL)
+		return 1;
+*/
+	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);}*/
+
+/*
+ * Read in the request
  */
-void context_loop(int *sock)
+int ReadHTTPRequset (ParsedHttpHdrs *Hdr)
 {
-	const char *buf;
-	int desired_session = 0;
-	int got_cookie = 0;
-	int gzip_ok = 0;
-	struct wcsession *TheSession, *sptr;
-	char httpauth_string[1024];
-	char httpauth_user[1024];
-	char httpauth_pass[1024];
-	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);
+	OneHttpHeader *pHdr;
+	StrBuf *Line, *LastLine, *HeaderName;
+	int nLine = 0;
+	void *vF;
+	int isbogus = 0;
 
-	/**
-	 * Find out what it is that the web browser is asking for
-	 */
 	HeaderName = NewStrBuf();
-	Buf = NewStrBuf();
+	Hdr->ReadBuf = NewStrBuf();
 	LastLine = NULL;
-	HTTPHeaders = NewHash(1, NULL);
-	/**
-	 * Read in the request
-	 */
 	do {
 		nLine ++;
 		Line = NewStrBuf();
-		if (ReqGetStrBuf(sock, Line, Buf) < 0) return;
 
-		LineLen = StrLength(Line);
+		if (ClientGetLine(&Hdr->http_sock, Line, Hdr->ReadBuf, &Hdr->Pos) < 0) return 1;
 
-		if (nLine == 1) {
-			ReqLine = Line;
+		if (StrLength(Line) == 0) {
+			FreeStrBuf(&Line);
 			continue;
 		}
-		if (LineLen == 0) {
-			FreeStrBuf(&Line);
+		if (nLine == 1) {
+			isbogus = ReadHttpSubject(Hdr, Line, HeaderName);
+			if (isbogus) break;
 			continue;
 		}
 
-		/** Do we need to Unfold? */
+		/* Do we need to Unfold? */
 		if ((LastLine != NULL) && 
 		    (isspace(*ChrPtr(Line)))) {
 			pch = pchs = ChrPtr(Line);
@@ -364,8 +365,8 @@ void context_loop(int *sock)
 			continue;
 		}
 
+		StrBufSanitizeAscii(Line, '§');
 		StrBufExtract_token(HeaderName, Line, 0, ':');
-	//// TODO: filter bad chars!
 
 		pchs = ChrPtr(Line);
 		pch = pchs + StrLength(HeaderName) + 1;
@@ -375,84 +376,88 @@ void context_loop(int *sock)
 		StrBufCutLeft(Line, pch - pchs);
 
 		StrBufUpCase(HeaderName);
-		Put(HTTPHeaders, SKEY(HeaderName), Line, HFreeStrBuf);
+
+		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 (LineLen > 0);
+	} while (Line != NULL);
+
 	FreeStrBuf(&HeaderName);
 
-////	dbg_PrintHash(HTTPHeaders, nix, NULL);
+	return isbogus;
+}
 
 
-	/**
-	 * 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 
+/*
+ * 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)
+{
+	ParsedHttpHdrs Hdr;
+	int isbogus = 0;
+	wcsession *TheSession, *sptr;
+	struct timeval tx_start;
+	struct timeval tx_finish;
+	
+	gettimeofday(&tx_start, NULL);		/* start a stopwatch for performance timing */
 
-authentication
+	memset(&Hdr, 0, sizeof(ParsedHttpHdrs));
+	Hdr.eReqType = eGET;
+	Hdr.http_sock = *sock;
+	/*
+	 * Find out what it is that the web browser is asking for
 	 */
-	if (GetHash(HTTPHeaders, HKEY("COOKIE"), &vLine) && 
-	    (vLine != NULL)) {
-		cookie_to_stuff(vLine, &desired_session,
-				NULL, 0, NULL, 0, NULL, 0);
-		got_cookie = 1;
-	}
+	isbogus = ReadHTTPRequset(&Hdr);
 
-	/**
-	 * 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 (!isbogus)
+		isbogus = AnalyseHeaders(&Hdr);
+/*
+	if (isbogus)
+		StrBufPlain(ReqLine, HKEY("/404"));
+*/
 
-	if (GetHash(HTTPHeaders, HKEY("IF-MODIFIED-SINCE"), &vLine) && 
-	    (vLine != NULL)) {
-		if_modified_since = httpdate_to_timestamp((StrBuf*)vLine);
-	}
+/*	dbg_PrintHash(HTTPHeaders, nix, NULL);  */
 
-	if (GetHash(HTTPHeaders, HKEY("ACCEPT-LANGUAGE"), &vLine) && 
-	    (vLine != NULL)) {
-		accept_language = (StrBuf*) vLine;
-	}
 
+///HttpHeaderHandler
 
-	/**
+
+
+
+
+	/*
 	 * 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.
-	 */
-
-	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 ((follow_xff == 1) && (StrLength(ReqLine) >= 8) &&
-	    (ptr = strstr(ChrPtr(ReqLine), "/webcit/"),	/*< Handle "/webcit/" */
-	     (ptr != NULL))) {
+	 * /
+	if (!isbogus &&
+	    (StrLength(ReqLine) >= 8) && 
+	    (strstr(ChrPtr(ReqLine), "/webcit/")) ) {
 		StrBufCutLeft(ReqLine, 7);
 	}
 
-	/** Begin parsing the request. */
+	/* Begin parsing the request. * /
 #ifdef TECH_PREVIEW
 	if ((strncmp(ChrPtr(ReqLine), "/sslg", 5) != 0) &&
 	    (strncmp(ChrPtr(ReqLine), "/static/", 8) != 0) &&
@@ -460,54 +465,12 @@ authentication
 	    (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));
+		lprintf(5, "HTTP: %s %s\n", ReqStrs[Hdr.eReqType], ChrPtr(ReqLine));
 #ifdef TECH_PREVIEW
 	}
 #endif
 
-	/** 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.
-	 */
-	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"));
-	}
+*/
 
 	/**
 	 * See if there's an existing session open with the desired ID or user/pass
@@ -516,17 +479,19 @@ authentication
 
 	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 ( (!IsEmptyStr(httpauth_user))
-			   &&(!strcasecmp(sptr->httpauth_user, httpauth_user))
-			   &&(!strcasecmp(sptr->httpauth_pass, httpauth_pass)) ) {
+		for (sptr = SessionList; 
+		     ((sptr != NULL) && (TheSession == NULL)); 
+		      sptr = sptr->next) {
+
+			/** If HTTP-AUTH, look for a session with matching credentials * /
+			if ( (////TODO check auth type here...
+			     &&(!strcasecmp(ChrPtr(sptr->httpauth_user), httpauth_user))
+			     &&(!strcasecmp(ChrPtr(sptr->httpauth_pass), httpauth_pass)) ) {
 				TheSession = sptr;
 			}
 
 			/** If cookie-session, look for a session with matching session ID */
-			if ( (desired_session != 0) && (sptr->wc_session == desired_session)) {
+			if ( (Hdr.desired_session != 0) && (sptr->wc_session == Hdr.desired_session)) {
 				TheSession = sptr;
 			}
 
@@ -539,9 +504,10 @@ authentication
 	 */
 	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->serv_sock = (-1);
 		TheSession->chat_sock = (-1);
 	
@@ -551,28 +517,26 @@ authentication
 		 * doesn't, and that's a Bad Thing because it causes lots of spurious sessions
 		 * to get created.
 		 */	
-		if (desired_session == 0) {
+		if (Hdr.desired_session == 0) {
 			TheSession->wc_session = GenerateSessionID();
 		}
 		else {
-			TheSession->wc_session = desired_session;
+			TheSession->wc_session = Hdr.desired_session;
 		}
+/*
+		TheSession->httpauth_user = NewStrBufPlain(httpauth_user, -1);
+			TheSession->httpauth_pass = NewStrBufPlain(httpauth_user, -1);
+*/
+		pthread_setspecific(MyConKey, (void *)TheSession);
+		session_new_modules(TheSession);
 
-		strcpy(TheSession->httpauth_user, httpauth_user);
-		strcpy(TheSession->httpauth_pass, httpauth_pass);
-		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->urlstrings = NULL;
-		TheSession->vars = NULL;
 		TheSession->nonce = rand();
-		TheSession->WBuf = NULL;
-		TheSession->CLineBuf = NewStrBuf();
 		TheSession->next = SessionList;
 		TheSession->is_mobile = -1;
 		SessionList = TheSession;
 		pthread_mutex_unlock(&SessionListMutex);
-		session_is_new = 1;
 	}
 
 	/*
@@ -586,53 +550,301 @@ authentication
 	pthread_mutex_lock(&TheSession->SessionMutex);		/* bind */
 	pthread_setspecific(MyConKey, (void *)TheSession);
 	
-	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 */
-#endif
-	session_loop(HTTPHeaders, ReqLine, ReqType, Buf);				/* do transaction */
-#ifdef ENABLE_NLS
-	stop_selected_language();				/* unset locale */
-#endif
-	DeleteHash(&TheSession->summ);
-	DeleteHash(&TheSession->urlstrings);
-	DeleteHash(&TheSession->vars);
-	FreeStrBuf(&TheSession->WBuf);
-	FreeStrBuf(&TheSession->HBuf);
-	
-	
-	pthread_mutex_unlock(&TheSession->SessionMutex);	/* unbind */
+	TheSession->Hdr = &Hdr;
+
+	session_attach_modules(TheSession);
+	session_loop();				/* do transaction */
+	session_detach_modules(TheSession);
 
+	TheSession->Hdr = NULL;
+	pthread_mutex_unlock(&TheSession->SessionMutex);	/* unbind */
+/* TODO
+
+	FreeStrBuf(&c_username);
+	FreeStrBuf(&c_password);
+	FreeStrBuf(&c_roomname);
+	FreeStrBuf(&c_httpauth_user);
+	FreeStrBuf(&c_httpauth_pass);
+*/
 	/* 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
-	 */
+	///DeleteHash(&HTTPHeaders);
+	///FreeStrBuf(&ReqLine);
 	
+	/* How long did this transaction take? */
+	gettimeofday(&tx_finish, NULL);
 	
+	lprintf(9, "Transaction completed in %ld.%06ld seconds.\n",
+		((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
+	);
 }
 
-void tmpl_nonce(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+void tmplput_nonce(StrBuf *Target, WCTemplputParams *TP)
 {
-	struct wcsession *WCC = WC;
+	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_HandleCookie(StrBuf *Line, ParsedHttpHdrs *hdr)
+{
+	hdr->RawCookie = Line;
+	if (hdr->DontNeedAuth)
+		return;
+/*
+	c_username = NewStrBuf();
+	c_password = NewStrBuf();
+	c_roomname = NewStrBuf();
+	safestrncpy(c_httpauth_string, "", sizeof c_httpauth_string);
+	c_httpauth_user = NewStrBufPlain(HKEY(DEFAULT_HTTPAUTH_USER));
+	c_httpauth_pass = NewStrBufPlain(HKEY(DEFAULT_HTTPAUTH_PASS));
+*/
+	cookie_to_stuff(Line, &hdr->desired_session,
+			hdr->c_username,
+			hdr->c_password,
+			hdr->c_roomname);
+	hdr->got_cookie = 1;
+}
+
+
+	/*
+	 * Browser-based sessions use cookies for session authentication
+	 * /
+	if (!isbogus &&
+	    GetHash(HTTPHeaders, HKEY("COOKIE"), &vLine) && 
+	    (vLine != NULL)) {
+		cookie_to_stuff(vLine, &desired_session,
+				NULL, NULL, NULL);
+		got_cookie = 1;
+	}
+	*/
+	/*
+	 * GroupDAV-based sessions use HTTP authentication
+	 */
+/*
+	if (!isbogus &&
+	    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));
+	}
+
+*/
+void Header_HandleAuth(StrBuf *Line, ParsedHttpHdrs *hdr)
+{
+	const char *Pos = NULL;
+	StrBufDecodeBase64(Line);
+	StrBufExtract_NextToken(hdr->c_username, Line, &Pos, ':');
+	StrBufExtract_NextToken(hdr->c_password, Line, &Pos, ':');
+}
+
+void Header_HandleContentLength(StrBuf *Line, ParsedHttpHdrs *hdr)
+{
+	hdr->ContentLength = StrToi(Line);
+}
+
+void Header_HandleContentType(StrBuf *Line, ParsedHttpHdrs *hdr)
+{
+	hdr->ContentType = Line;
+}
+
+void Header_HandleUserAgent(StrBuf *Line, ParsedHttpHdrs *hdr)
+{
+	hdr->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->http_host != NULL))
+		return;
+	else
+		hdr->http_host = Line;
+}
+
+void Header_HandleXFFHost(StrBuf *Line, ParsedHttpHdrs *hdr)
+{
+	if (follow_xff)
+		hdr->http_host = Line;
+}
+
+
+void Header_HandleXFF(StrBuf *Line, ParsedHttpHdrs *hdr)
+{
+	hdr->browser_host = Line;
+
+	while (StrBufNum_tokens(hdr->browser_host, ',') > 1) {
+		StrBufRemove_token(hdr->browser_host, 0, ',');
+	}
+	StrBufTrim(hdr->browser_host);
+}
+
+void Header_HandleIfModSince(StrBuf *Line, ParsedHttpHdrs *hdr)
+{
+	hdr->if_modified_since = httpdate_to_timestamp(Line);
+}
+
+void Header_HandleAcceptEncoding(StrBuf *Line, ParsedHttpHdrs *hdr)
+{
+	/*
+	 * Can we compress?
+	 */
+	if (strstr(&ChrPtr(Line)[16], "gzip")) {
+		hdr->gzip_ok = 1;
+	}
+}
+
+/*
+{
+	c_username = NewStrBuf();
+	c_password = NewStrBuf();
+	c_roomname = NewStrBuf();
+	safestrncpy(c_httpauth_string, "", sizeof c_httpauth_string);
+	c_httpauth_user = NewStrBufPlain(HKEY(DEFAULT_HTTPAUTH_USER));
+	c_httpauth_pass = NewStrBufPlain(HKEY(DEFAULT_HTTPAUTH_PASS));
+}
+*/
+	/* *
+	 * 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 ( (StrLength(ReqLine) > 1 )
+		&& (strncasecmp(ChrPtr(ReqLine), "/404", 4))
+	        && (Hdr.got_cookie == 0)) {
+		StrBufPlain(ReqLine, 
+			    HKEY("/static/nocookies.html"
+				 "?force_close_session=yes"));
+	}
+*/
+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);
+}
+extern void blank_page(void); ///TODO: remove me
 void 
 InitModule_CONTEXT
 (void)
 {
-	RegisterNamespace("NONCE", 0, 0, tmpl_nonce, 0);
+	RegisterHeaderHandler(HKEY("COOKIE"), Header_HandleCookie);
+	RegisterHeaderHandler(HKEY("AUTHORIZATION"), Header_HandleAuth);
+	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("blank"), blank_page, ANONYMOUS|BOGUS);
+
+	WebcitAddUrlHandler(HKEY("blank"), blank_page, URLNAMESPACE);
 }
+//FreeStrBuf(&WCC->this_page);
+