X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fcontext_loop.c;h=34233ef417f13adc96e0e930aef6da788823f0ae;hb=8ce55d0a3cc3011b8e8bb08106f6a067f68d9df9;hp=45113cbc52fc48ff291c6f572d6764a3e0d456f8;hpb=cfa7d8dcaa2bf3b270f3d7de31373cef2e60ff10;p=citadel.git

diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index 45113cbc5..34233ef41 100644
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -10,57 +10,30 @@
 
 #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;	/* Linked list of all webcit 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;
+int num_threads = 1;		/* Number of worker threads.  Start at 1 because the parent counts. */
 
-
-/*
- * free the memory used for viewing atachments
- */
-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(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);
-	}
-	free_attachments((*sessions_to_kill));
-	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));
-
-	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;
@@ -69,12 +42,11 @@ 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;
 
-	/**
+	/*
 	 * Lock the session list, moving any candidates for euthanasia into
 	 * a separate list.
 	 */
@@ -83,13 +55,12 @@ void do_housekeeping(void)
 	for (sptr = SessionList; sptr != NULL; sptr = sptr->next) {
 		++num_sessions;
 
-		/** Kill idle sessions */
-		if ((time(NULL) - (sptr->lastreq)) >
-		   (time_t) WEBCIT_TIMEOUT) {
+		/* 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 */
@@ -108,7 +79,7 @@ void do_housekeeping(void)
 	}
 	pthread_mutex_unlock(&SessionListMutex);
 
-	/**
+	/*
 	 * Now free up and destroy the culled sessions.
 	 */
 	while (sessions_to_kill != NULL) {
@@ -117,27 +88,25 @@ 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;
 	}
 
-	/**
+	/*
 	 * 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) ) {
+	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);
 	}
 }
 
 
-/**
- * \brief Wake up occasionally and clean house
+/*
+ * Wake up occasionally and clean house
  */
 void housekeeping_loop(void)
 {
@@ -148,13 +117,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)
 {
@@ -167,119 +133,327 @@ int GenerateSessionID(void)
 	return ++seq;
 }
 
-
-/*
- * Collapse multiple cookies on one line
- */
-int req_gets(int *sock, char *buf, char *hold, size_t hlen)
+wcsession *FindSession(wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t *ListMutex)
 {
-	int a, b;
-
-	if (IsEmptyStr(hold)) {
-		strcpy(buf, "");
-		a = client_getln(sock, buf, SIZ);
-		if (a<1) return(-1);
-	} else {
-		safestrncpy(buf, hold, SIZ);
+	wcsession *sptr = NULL;
+	wcsession *TheSession = NULL;	
+	
+	if (Hdr->HR.got_auth == AUTH_BASIC) {
+		GetAuthBasic(Hdr);
 	}
-	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);
+
+	pthread_mutex_lock(ListMutex);
+	for (sptr = *wclist; ((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;
+			if ((!strcasecmp(ChrPtr(Hdr->c_username), ChrPtr(sptr->wc_username))) &&
+			    (!strcasecmp(ChrPtr(Hdr->c_password), ChrPtr(sptr->wc_password))) ) {
+				TheSession = sptr;
+			}
+			if (TheSession == NULL)
+				lprintf(1, "found sessionkey [%ld], but credentials for [%s|%s] didn't match\n",
+					Hdr->HR.SessionKey,ChrPtr(Hdr->c_username), ChrPtr(sptr->wc_username));
+			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;
+		}
 	}
+	pthread_mutex_unlock(ListMutex);
+	if (TheSession == NULL)
+		lprintf(1, "didn't find sessionkey [%ld] for user [%s]\n",
+			Hdr->HR.SessionKey,ChrPtr(Hdr->c_username));
+	return TheSession;
+}
 
-	return(0);
+wcsession *CreateSession(int Lockable, int Static, wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t *ListMutex)
+{
+	wcsession *TheSession;
+	if (!Static)
+		lprintf(3, "Creating a new session\n");
+	TheSession = (wcsession *) malloc(sizeof(wcsession));
+	memset(TheSession, 0, sizeof(wcsession));
+	TheSession->Hdr = Hdr;
+	TheSession->SessionKey = Hdr->HR.SessionKey;
+	TheSession->serv_sock = (-1);
+	TheSession->is_mobile = -1;
+
+	pthread_setspecific(MyConKey, (void *)TheSession);
+	
+	/* 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;
+	}
+	Hdr->HR.Static = Static;
+	session_new_modules(TheSession);
+
+	if (Lockable) {
+		pthread_mutex_init(&TheSession->SessionMutex, NULL);
+
+		if (ListMutex != NULL)
+			pthread_mutex_lock(ListMutex);
+
+		if (wclist != NULL) {
+			TheSession->nonce = rand();
+			TheSession->next = *wclist;
+			*wclist = TheSession;
+		}
+		if (ListMutex != NULL)
+			pthread_mutex_unlock(ListMutex);
+	}
+	return TheSession;
 }
 
+
 /*
- * lingering_close() a`la Apache. see
- * http://www.apache.org/docs/misc/fin_wait_2.html for rationale
+ * Detects a 'mobile' user agent 
  */
-int lingering_close(int fd)
+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;
+}
+
+/* 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");
+	wc_printf("Not found\r\n");
+	end_burst();
+}
+
+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);
 
-	gettimeofday(&start, NULL);
-	shutdown(fd, 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;
+	}
+
+	StrBufAppendBuf(Hdr->this_page, Hdr->HR.ReqLine, 0);
+	/* 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 ? */
+		StrBufPlain(Hdr->PlainArgs, 
+			    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) && (Pos != StrBufNOTNULL)){
+		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) ||
+			((Hdr->HR.Handler->Flags & ANONYMOUS) != 0)
+			);
+	}
+	else {
+		Hdr->HR.DontNeedAuth = 1; /* Flat request? show him the login screen... */
+	}
 
-	return close(fd);
+	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);}*/
 
-/**
- * \brief	sanity requests
- *		Check for bogus requests coming from brain-dead Windows boxes.
- *
- * \param	http_cmd	The HTTP request to check
+/*
+ * Read in the request
  */
-int is_bogus(char *http_cmd) {
-	char *url;
-	int i, max;
-
-	url = strstr(http_cmd, " ");
-	if (url == NULL) 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) {
-		if (!strncasecmp(url, bogus_prefixes[i], strlen(bogus_prefixes[i]))) {
-			return(2);
+int ReadHTTPRequest (ParsedHttpHdrs *Hdr)
+{
+	const char *pch, *pchs, *pche;
+	OneHttpHeader *pHdr;
+	StrBuf *Line, *LastLine, *HeaderName;
+	int nLine = 0;
+	void *vF;
+	int isbogus = 0;
+
+	HeaderName = NewStrBuf();
+	LastLine = NULL;
+	do {
+		nLine ++;
+		Line = NewStrBufPlain(NULL, SIZ / 4);
+
+		if (ClientGetLine(Hdr, Line) < 0) return 1;
+
+		if (StrLength(Line) == 0) {
+			FreeStrBuf(&Line);
+			continue;
 		}
-	}
+		if (nLine == 1) {
+			Hdr->HTTPHeaders = NewHash(1, NULL);
+			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);
+		pche = pchs + StrLength(Line);
+		pch = pchs + StrLength(HeaderName) + 1;
+		pche = pchs + StrLength(Line);
+		while ((pch < pche) && isspace(*pch))
+			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(0);	/* probably ok */
+	return isbogus;
 }
 
+void OverrideRequest(ParsedHttpHdrs *Hdr, const char *Line, long len)
+{
+	StrBuf *Buf = NewStrBuf();
+
+	FlushStrBuf(Hdr->HR.ReqLine);
+	StrBufPlain(Hdr->HR.ReqLine, Line, len);
+	ReadHttpSubject(Hdr, Hdr->HR.ReqLine, Buf);
 
+	FreeStrBuf(&Buf);
+}
 
-/**
- * \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.
@@ -289,219 +463,104 @@ 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(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[1024];
-	char httpauth_user[1024];
-	char httpauth_pass[1024];
-	char accept_language[256];
-	char *ptr = NULL;
-	int session_is_new = 0;
-
-	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));
-	do {
-		if (req_gets(sock, buf, hold, SIZ) < 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]);
-		}
-
-		if (!strncasecmp(buf, "Accept-Language: ", 17)) {
-			safestrncpy(accept_language, &buf[17], sizeof accept_language);
-		}
+	int isbogus = 0;
+	wcsession *TheSession;
+	struct timeval tx_start;
+	struct timeval tx_finish;
+	
+	gettimeofday(&tx_start, NULL);		/* start a stopwatch for performance timing */
 
-		/**
-		 * 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 (!IsEmptyStr(buf));
-
-	/**
-	 * 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.
+	/*
+	 * Find out what it is that the web browser is asking for
 	 */
-	
-	ptr = strstr(req->line, " /webcit ");	/*< Handle "/webcit" */
-	if (ptr != NULL) {
-		strcpy(ptr+2, ptr+8);
+	isbogus = ReadHTTPRequest(Hdr);
+
+	Hdr->HR.dav_depth = 32767; /* TODO: find a general way to have non-0 defaults */
+	if (!isbogus)
+		isbogus = AnalyseHeaders(Hdr);
+
+	if ((isbogus) ||
+	    ((Hdr->HR.Handler != NULL) &&
+	     ((Hdr->HR.Handler->Flags & BOGUS) != 0)))
+	{
+		wcsession *Bogus;
+
+		Bogus = CreateSession(0, 1, NULL, Hdr, NULL);
+
+		do_404();
+
+		lprintf(9, "HTTP: 404 [%ld.%06ld] %s %s \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,
+			ReqStrs[Hdr->HR.eReqType],
+			ChrPtr(Hdr->this_page)
+			);
+		session_detach_modules(Bogus);
+		session_destroy_modules(&Bogus);
+		return;
 	}
 
-	ptr = strstr(req->line, " /webcit");	/*< Handle "/webcit/" */
-	if (ptr != NULL) {
-		strcpy(ptr+1, ptr+8);
-	}
+	if ((Hdr->HR.Handler != NULL) && ((Hdr->HR.Handler->Flags & ISSTATIC) != 0))
+	{
+		wcsession *Static;
+		Static = CreateSession(0, 1, NULL, Hdr, NULL);
+		
+		Hdr->HR.Handler->F();
 
-	safestrncpy(buf, req->line, sizeof buf);
-	/** Begin parsing the request. */
+		/* How long did this transaction take? */
+		gettimeofday(&tx_finish, NULL);
+		
 #ifdef TECH_PREVIEW
-	if ((strncmp(req->line+4, "/sslg", 5) != 0) &&
-	    (strncmp(req->line+4, "/wholist_section", 16) != 0)) {
+		if ((Hdr->HR.Handler != NULL) ||
+		    ((Hdr->HR.Handler->Flags & LOGCHATTY) == 0))
 #endif
-		lprintf(5, "HTTP: %s\n", buf);
-#ifdef TECH_PREVIEW
+			lprintf(9, "HTTP: 200 [%ld.%06ld] %s %s \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,
+				ReqStrs[Hdr->HR.eReqType],
+				ChrPtr(Hdr->this_page)
+				);
+		session_detach_modules(Static);
+		session_destroy_modules(&Static);
+		return;
 	}
-#endif
 
-	/** Check for bogus requests */
-	if (is_bogus(buf)) {
-		strcpy(req->line, "GET /404 HTTP/1.1");
-		strcpy(buf, "GET /404 HTTP/1.1");
+	if (Hdr->HR.got_auth == AUTH_BASIC) {
+		CheckAuthBasic(Hdr);
 	}
 
-	/**
-	 * Strip out the method, leaving the URL up front...
-	 */
-	remove_token(buf, 0, ' ');
-	if (buf[1]==' ') buf[1]=0;
-
-	/**
-	 * 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");
-	}
-
-	/**
-	 * 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, "/static", 7))
-		&& (strncasecmp(buf, "/rss", 4))
-		&& (strncasecmp(buf, "/404", 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;
+	TheSession = FindSession(&SessionList, Hdr, &SessionListMutex);
 
+	/*
+	 * Create a new session if we have to
+	 */
 	if (TheSession == NULL) {
-		pthread_mutex_lock(&SessionListMutex);
-		for (sptr = SessionList; sptr != NULL; sptr = sptr->next) {
+		TheSession = CreateSession(1, 0, &SessionList, Hdr, &SessionListMutex);
 
-			/** 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)) ) {
-				TheSession = sptr;
-			}
+		if ((StrLength(Hdr->c_username) == 0) && (!Hdr->HR.DontNeedAuth)) {
 
-			/** If cookie-session, look for a session with matching session ID */
-			if ( (desired_session != 0) && (sptr->wc_session == desired_session)) {
-				TheSession = sptr;
+			if ((Hdr->HR.Handler != NULL) && 
+			    (XHTTP_COMMANDS & Hdr->HR.Handler->Flags) == XHTTP_COMMANDS) {
+				OverrideRequest(Hdr, HKEY("GET /401 HTTP/1.0"));
+				Hdr->HR.prohibit_caching = 1;				
+			}
+			else {
+				OverrideRequest(Hdr, HKEY("GET /static/nocookies.html?force_close_session=yes HTTP/1.0"));
+				Hdr->HR.prohibit_caching = 1;
 			}
-
-		}
-		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->serv_sock = (-1);
-		TheSession->chat_sock = (-1);
-	
-		/* 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 (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();
 		}
-
-		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->next = SessionList;
-		SessionList = TheSession;
-		pthread_mutex_unlock(&SessionListMutex);
-		session_is_new = 1;
 	}
 
 	/*
@@ -515,40 +574,244 @@ void context_loop(int *sock)
 	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(req);					/* do transaction */
-#ifdef ENABLE_NLS
-	stop_selected_language();				/* unset locale */
-#endif
-	DeleteHash(&TheSession->urlstrings);
-	DeleteHash(&TheSession->vars);
-	FreeStrBuf(&TheSession->WBuf);
-	FreeStrBuf(&TheSession->HBuf);
-	
+	TheSession->Hdr = Hdr;
+
+	session_attach_modules(TheSession);
+	session_loop();				/* do transaction */
+
+
+	/* How long did this transaction take? */
+	gettimeofday(&tx_finish, NULL);
 	
+
+#ifdef TECH_PREVIEW
+	if ((Hdr->HR.Handler != NULL) &&
+	    ((Hdr->HR.Handler->Flags & LOGCHATTY) == 0))
+#endif
+		lprintf(9, "HTTP: 200 [%ld.%06ld] %s %s \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,
+			ReqStrs[Hdr->HR.eReqType],
+			ChrPtr(Hdr->this_page)
+			);
+
+	session_detach_modules(TheSession);
+
+	TheSession->Hdr = NULL;
 	pthread_mutex_unlock(&TheSession->SessionMutex);	/* unbind */
+}
 
-	/* Free the request buffer */
-	while (req != NULL) {
-		hptr = req->next;
-		free(req);
-		req = hptr;
+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 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);
+}
+
+void Header_HandleAcceptEncoding(StrBuf *Line, ParsedHttpHdrs *hdr)
+{
 	/*
-	 * Free up any session-local substitution variables which
-	 * were set during this transaction
+	 * Can we compress?
 	 */
+	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); /* Apache way... */
+	RegisterHeaderHandler(HKEY("X-REAL-IP"), Header_HandleXFFHost);        /* NGinX way... */
+	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, NULL, CTX_NONE);
+	RegisterNamespace("NONCE", 0, 0, tmplput_nonce, NULL, 0);
+
+	WebcitAddUrlHandler(HKEY("404"), "", 0, 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"), "", 0, do_404, ANONYMOUS|BOGUS);		/* /root.exe - Worms and trojans and viruses, oh my! */
+	WebcitAddUrlHandler(HKEY("c"), "", 0, do_404, ANONYMOUS|BOGUS);		/* /winnt */
+	WebcitAddUrlHandler(HKEY("MSADC"), "", 0, do_404, ANONYMOUS|BOGUS);
+	WebcitAddUrlHandler(HKEY("_vti"), "", 0, do_404, ANONYMOUS|BOGUS);		/* Broken Microsoft DAV implementation */
+	WebcitAddUrlHandler(HKEY("MSOffice"), "", 0, do_404, ANONYMOUS|BOGUS);		/* Stoopid MSOffice thinks everyone is IIS */
+	WebcitAddUrlHandler(HKEY("nonexistenshit"), "", 0, do_404, ANONYMOUS|BOGUS);	/* Exploit found in the wild January 2009 */
+}
 	
-	
+
+void 
+HttpNewModule_CONTEXT
+(ParsedHttpHdrs *httpreq)
+{
+	httpreq->PlainArgs = NewStrBufPlain(NULL, SIZ);
+	httpreq->this_page = NewStrBufPlain(NULL, SIZ);
+}
+
+void 
+HttpDetachModule_CONTEXT
+(ParsedHttpHdrs *httpreq)
+{
+	FlushStrBuf(httpreq->PlainArgs);
+	FlushStrBuf(httpreq->this_page);
+	FlushStrBuf(httpreq->PlainArgs);
+	DeleteHash(&httpreq->HTTPHeaders);
+	memset(&httpreq->HR, 0, sizeof(HdrRefs));
+}
+
+void 
+HttpDestroyModule_CONTEXT
+(ParsedHttpHdrs *httpreq)
+{
+	FreeStrBuf(&httpreq->this_page);
+	FreeStrBuf(&httpreq->PlainArgs);
+	FreeStrBuf(&httpreq->this_page);
+	FreeStrBuf(&httpreq->PlainArgs);
+	DeleteHash(&httpreq->HTTPHeaders);
+
 }