X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fcontext_loop.c;h=f02a619913123c375a81c599d29b6e5dd17896cf;hb=HEAD;hp=6fab115fad22bd156cf7779246561840d184de2b;hpb=6f0f2b51a2ccb6873d3b2c8ecb075535d2516729;p=citadel.git

diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index 6fab115fa..bb0c1cb97 100644
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -16,7 +16,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 #include "modules_init.h"
 
 /* Only one thread may manipulate SessionList at a time... */
@@ -24,7 +24,6 @@ pthread_mutex_t SessionListMutex;
 
 wcsession *SessionList = NULL;	/* Linked list of all webcit sessions */
 
-pthread_key_t MyConKey;         /* TSD key for MySession() */
 HashList *HttpReqTypes = NULL;
 HashList *HttpHeaderHandler = NULL;
 extern HashList *HandlerHash;
@@ -32,6 +31,7 @@ extern HashList *HandlerHash;
 /* the following two values start at 1 because the initial parent thread counts as one. */
 int num_threads_existing = 1;		/* Number of worker threads which exist. */
 int num_threads_executing = 1;		/* Number of worker threads currently executing. */
+int verbose=0;
 
 extern void session_loop(void);
 void spawn_another_worker_thread(void);
@@ -64,6 +64,7 @@ void do_housekeeping(void)
 	 * Lock the session list, moving any candidates for euthanasia into
 	 * a separate list.
 	 */
+	the_time = 0;
 	CtdlLogResult(pthread_mutex_lock(&SessionListMutex));
 	for (sptr = SessionList; sptr != NULL; sptr = sptr->next) {
 		if (the_time == 0)
@@ -72,7 +73,7 @@ void do_housekeeping(void)
 		if ((sptr->inuse == 0) && 
 		    ((the_time - (sptr->lastreq)) > (time_t) WEBCIT_TIMEOUT))
 		{
-			syslog(3, "Timeout session %d", sptr->wc_session);
+			syslog(LOG_DEBUG, "Timeout session %d", sptr->wc_session);
 			sptr->killthis = 1;
 		}
 
@@ -99,7 +100,7 @@ void do_housekeeping(void)
 	 * Now free up and destroy the culled sessions.
 	 */
 	while (sessions_to_kill != NULL) {
-		syslog(3, "Destroying session %d", sessions_to_kill->wc_session);
+		syslog(LOG_DEBUG, "Destroying session %d", sessions_to_kill->wc_session);
 		sptr = sessions_to_kill->next;
 		session_destroy_modules(&sessions_to_kill);
 		sessions_to_kill = sptr;
@@ -118,7 +119,7 @@ void check_thread_pool_size(void)
 		(num_threads_executing >= num_threads_existing)
 		&& (num_threads_existing < MAX_WORKER_THREADS)
 	) {
-		syslog(3, "%d of %d threads are executing.  Adding another worker thread.",
+		syslog(LOG_DEBUG, "%d of %d threads are executing.  Adding another worker thread.",
 			num_threads_executing,
 			num_threads_existing
 		);
@@ -176,7 +177,8 @@ wcsession *FindSession(wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t
 				&& (!strcasecmp(ChrPtr(Hdr->c_password), ChrPtr(sptr->wc_password)))
 				&& (sptr->killthis == 0)
 			) {
-				syslog(LOG_DEBUG, "Matched a session with the same http-auth");
+				if (verbose)
+					syslog(LOG_DEBUG, "Matched a session with the same http-auth");
 				TheSession = sptr;
 			}
 			break;
@@ -185,14 +187,16 @@ wcsession *FindSession(wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t
 			if (	(Hdr->HR.desired_session != 0)
 				&& (sptr->wc_session == Hdr->HR.desired_session)
 			) {
-				syslog(LOG_DEBUG, "Matched a session with the same cookie");
+				if (verbose)
+					syslog(LOG_DEBUG, "Matched a session with the same cookie");
 				TheSession = sptr;
 			}
 			break;			     
 		case NO_AUTH:
 			/* Any unbound session is a candidate */
 			if ( (sptr->wc_session == 0) && (sptr->inuse == 0) ) {
-				syslog(LOG_DEBUG, "Reusing an unbound session");
+				if (verbose)
+					syslog(LOG_DEBUG, "Reusing an unbound session");
 				TheSession = sptr;
 			}
 			break;
@@ -212,6 +216,7 @@ wcsession *CreateSession(int Lockable, int Static, wcsession **wclist, ParsedHtt
 	memset(TheSession, 0, sizeof(wcsession));
 	TheSession->Hdr = Hdr;
 	TheSession->serv_sock = (-1);
+	TheSession->lastreq = time(NULL);;
 
 	pthread_setspecific(MyConKey, (void *)TheSession);
 	
@@ -223,11 +228,11 @@ wcsession *CreateSession(int Lockable, int Static, wcsession **wclist, ParsedHtt
 	 */	
 	if (Hdr->HR.desired_session == 0) {
 		TheSession->wc_session = GenerateSessionID();
-		syslog(3, "Created new session %d", TheSession->wc_session);
+		syslog(LOG_DEBUG, "Created new session %d", TheSession->wc_session);
 	}
 	else {
 		TheSession->wc_session = Hdr->HR.desired_session;
-		syslog(3, "Re-created session %d", TheSession->wc_session);
+		syslog(LOG_DEBUG, "Re-created session %d", TheSession->wc_session);
 	}
 	Hdr->HR.Static = Static;
 	session_new_modules(TheSession);
@@ -342,8 +347,8 @@ int ReadHttpSubject(ParsedHttpHdrs *Hdr, StrBuf *Line, StrBuf *Buf)
 		int return_value;
 		StrBuf *NewLine = NewStrBuf();
 		Hdr->HR.DontNeedAuth = 1;
-		StrBufAppendPrintf(NewLine, "GET /landing?go=%s HTTP/1.0", ChrPtr(Buf));
-		syslog(LOG_DEBUG, "Replacing with: %s", ChrPtr(NewLine));
+		StrBufAppendPrintf(NewLine, "GET /landing?go=%s?failvisibly=1 HTTP/1.0", ChrPtr(Buf));
+		if (verbose) syslog(LOG_DEBUG, "Replacing with: %s", ChrPtr(NewLine));
 		return_value = ReadHttpSubject(Hdr, NewLine, Buf);
 		FreeStrBuf(&NewLine);
 		return return_value;
@@ -352,8 +357,7 @@ int ReadHttpSubject(ParsedHttpHdrs *Hdr, StrBuf *Line, StrBuf *Buf)
 	return 0;
 }
 
-int AnalyseHeaders(ParsedHttpHdrs *Hdr)
-{
+int AnalyseHeaders(ParsedHttpHdrs *Hdr) {
 	OneHttpHeader *pHdr;
 	void *vHdr;
 	long HKLen;
@@ -371,13 +375,11 @@ int AnalyseHeaders(ParsedHttpHdrs *Hdr)
 	return 0;
 }
 
-/*const char *nix(void *vptr) {return ChrPtr( (StrBuf*)vptr);}*/
 
 /*
  * Read in the request
  */
-int ReadHTTPRequest (ParsedHttpHdrs *Hdr)
-{
+int ReadHTTPRequest(ParsedHttpHdrs *Hdr) {
 	const char *pch, *pchs, *pche;
 	OneHttpHeader *pHdr;
 	StrBuf *Line, *LastLine, *HeaderName;
@@ -391,7 +393,11 @@ int ReadHTTPRequest (ParsedHttpHdrs *Hdr)
 		nLine ++;
 		Line = NewStrBufPlain(NULL, SIZ / 4);
 
-		if (ClientGetLine(Hdr, Line) < 0) return 1;
+		if (ClientGetLine(Hdr, Line) < 0) {
+			FreeStrBuf(&Line);
+			isbogus = 1;
+			break;
+		}
 
 		if (StrLength(Line) == 0) {
 			FreeStrBuf(&Line);
@@ -403,19 +409,21 @@ int ReadHTTPRequest (ParsedHttpHdrs *Hdr)
 			memset(pHdr, 0, sizeof(OneHttpHeader));
 			pHdr->Val = Line;
 			Put(Hdr->HTTPHeaders, HKEY("GET /"), pHdr, DestroyHttpHeaderHandler);
-			syslog(9, "%s", ChrPtr(Line));
+			if (verbose || strstr(ChrPtr(Line), "sslg") == NULL) {
+				syslog(LOG_DEBUG, "%s", ChrPtr(Line));
+			}
 			isbogus = ReadHttpSubject(Hdr, Line, HeaderName);
 			if (isbogus) break;
 			continue;
 		}
 
 		/* Do we need to Unfold? */
-		if ((LastLine != NULL) && 
-		    (isspace(*ChrPtr(Line)))) {
+		if ((LastLine != NULL) && (isspace(*ChrPtr(Line)))) {
 			pch = pchs = ChrPtr(Line);
 			pche = pchs + StrLength(Line);
-			while (isspace(*pch) && (pch < pche))
+			while (isspace(*pch) && (pch < pche)) {
 				pch ++;
+			}
 			StrBufCutLeft(Line, pch - pchs);
 			StrBufAppendBuf(LastLine, Line, 0);
 
@@ -423,26 +431,24 @@ int ReadHTTPRequest (ParsedHttpHdrs *Hdr)
 			continue;
 		}
 
-		StrBufSanitizeAscii(Line, '§');
+		StrBufSanitizeAscii(Line, (char)0xa7);
 		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))
+		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))
-		{
+		if (GetHash(HttpHeaderHandler, SKEY(HeaderName), &vF) && (vF != NULL)) {
 			OneHttpHeader *FHdr = (OneHttpHeader*) vF;
 			pHdr->H = FHdr->H;
 			pHdr->HaveEvaluator = 1;
@@ -485,13 +491,13 @@ void OverrideRequest(ParsedHttpHdrs *Hdr, const char *Line, long len)
  * function returns, the worker thread is then free to handle another
  * transaction.
  */
-void context_loop(ParsedHttpHdrs *Hdr)
-{
+void context_loop(ParsedHttpHdrs *Hdr) {
 	int isbogus = 0;
 	wcsession *TheSession;
 	struct timeval tx_start;
 	struct timeval tx_finish;
 	int session_may_be_reused = 1;
+	time_t now;
 	
 	gettimeofday(&tx_start, NULL);		/* start a stopwatch for performance timing */
 
@@ -513,7 +519,7 @@ void context_loop(ParsedHttpHdrs *Hdr)
 		wcsession *Bogus;
 		Bogus = CreateSession(0, 1, NULL, Hdr, NULL);
 		do_404();
-		syslog(9, "HTTP: 404 [%ld.%06ld] %s %s",
+		syslog(LOG_WARNING, "HTTP: 404 [%ld.%06ld] %s %s",
 			((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],
@@ -524,8 +530,7 @@ void context_loop(ParsedHttpHdrs *Hdr)
 		return;
 	}
 
-	if ((Hdr->HR.Handler != NULL) && ((Hdr->HR.Handler->Flags & ISSTATIC) != 0))
-	{
+	if ((Hdr->HR.Handler != NULL) && ((Hdr->HR.Handler->Flags & ISSTATIC) != 0)) {
 		wcsession *Static;
 		Static = CreateSession(0, 1, NULL, Hdr, NULL);
 		
@@ -534,11 +539,12 @@ void context_loop(ParsedHttpHdrs *Hdr)
 		/* How long did this transaction take? */
 		gettimeofday(&tx_finish, NULL);
 		
-		syslog(9, "HTTP: 200 [%ld.%06ld] %s %s",
-			((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)
+		if (verbose)
+			syslog(LOG_DEBUG, "HTTP: 200 [%ld.%06ld] %s %s",
+			       ((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);
@@ -589,18 +595,22 @@ void context_loop(ParsedHttpHdrs *Hdr)
 	/*
 	 * Bind to the session and perform the transaction
 	 */
+	now = time(NULL);;
 	CtdlLogResult(pthread_mutex_lock(&TheSession->SessionMutex));
 	pthread_setspecific(MyConKey, (void *)TheSession);
 	
-	TheSession->inuse = 1;					/* mark the session as bound */
-	TheSession->lastreq = time(NULL);			/* log */
+	TheSession->inuse = 1;				/* mark the session as bound */
+	TheSession->isFailure = 0;                      /* reset evntually existing error flags */
+	TheSession->lastreq = now;			/* log */
 	TheSession->Hdr = Hdr;
 
 	/*
 	 * If a language was requested via a cookie, select that language now.
 	 */
 	if (StrLength(Hdr->c_language) > 0) {
-		syslog(LOG_DEBUG, "Session cookie requests language '%s'", ChrPtr(Hdr->c_language));
+		if (verbose) {
+			syslog(LOG_DEBUG, "Session cookie requests language '%s'", ChrPtr(Hdr->c_language));
+		}
 		set_selected_language(ChrPtr(Hdr->c_language));
 		go_selected_language();
 	}
@@ -614,13 +624,14 @@ void context_loop(ParsedHttpHdrs *Hdr)
 	/* How long did this transaction take? */
 	gettimeofday(&tx_finish, NULL);
 
-	syslog(9, "HTTP: 200 [%ld.%06ld] %s %s",
-		((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)
-	);
-
+	if (verbose || strstr(ChrPtr(Hdr->this_page), "sslg") == NULL) {
+		syslog(LOG_INFO, "HTTP: 200 [%ld.%06ld] %s %s",
+		       ((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);
 
 	/* If *this* very transaction did not explicitly specify a session cookie,
@@ -629,9 +640,9 @@ void context_loop(ParsedHttpHdrs *Hdr)
 	 * table from getting bombarded with new sessions when, for example, a web
 	 * spider crawls the site without using cookies.
 	 */
-	if ((session_may_be_reused) && (!WC->logged_in)) {
-		WC->wc_session = 0;			/* flag as available for re-use */
-		TheSession->selected_language = 0;	/* clear any non-default language setting */
+	if ((session_may_be_reused) && (!TheSession->logged_in)) {
+		TheSession->wc_session = 0;		/* flag as available for re-use */
+		TheSession->selected_language = -1;	/* clear any non-default language setting */
 	}
 
 	TheSession->Hdr = NULL;
@@ -710,6 +721,31 @@ void Header_HandleAcceptEncoding(StrBuf *Line, ParsedHttpHdrs *hdr)
 		hdr->HR.gzip_ok = 1;
 	}
 }
+
+void Header_HandleContentRange(StrBuf *Line, ParsedHttpHdrs *hdr)
+{
+	const char *PRange = ChrPtr(Line);
+
+	while ((*PRange != '=') && (*PRange != '\0'))
+		PRange ++;
+	if (*PRange == '=')
+		PRange ++;
+	if ((*PRange == '\0'))
+		return;
+	hdr->HaveRange = 1;
+	hdr->RangeStart = atol(PRange);
+
+	while (isdigit(*PRange))
+		PRange++;
+
+	if (*PRange == '-')
+		PRange ++;
+	if ((*PRange == '\0'))
+		hdr->RangeTil = -1;
+	else
+		hdr->RangeTil = atol(PRange);
+}
+
 const char *ReqStrs[eNONE] = {
 	"GET",
 	"POST",
@@ -794,6 +830,7 @@ void
 InitModule_CONTEXT
 (void)
 {
+	RegisterHeaderHandler(HKEY("RANGE"), Header_HandleContentRange);
 	RegisterHeaderHandler(HKEY("CONTENT-LENGTH"), Header_HandleContentLength);
 	RegisterHeaderHandler(HKEY("CONTENT-TYPE"), Header_HandleContentType);
 	RegisterHeaderHandler(HKEY("X-FORWARDED-HOST"), Header_HandleXFFHost); /* Apache way... */