X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fcontext_loop.c;h=35e6ee7b34e5afcae4d83571c5c29f306171b4f5;hb=5332c415ad54cf9d3748b80a0d417dccc093a854;hp=e0577d7eb4585aa4b720a69d08135aba51c6dc03;hpb=47b79a3ae2da5da98aa78f081e4a8889a5451a9f;p=citadel.git diff --git a/webcit/context_loop.c b/webcit/context_loop.c index e0577d7eb..35e6ee7b3 100644 --- a/webcit/context_loop.c +++ b/webcit/context_loop.c @@ -1,11 +1,24 @@ /* - * $Id$ - * * 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. * + * Copyright (c) 1996-2011 by the citadel.org team + * + * This program is open source software. You can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "webcit.h" @@ -21,7 +34,10 @@ 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. */ + +/* 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. */ void DestroyHttpHeaderHandler(void *V) { @@ -44,16 +60,13 @@ void do_housekeeping(void) { wcsession *sptr, *ss; wcsession *sessions_to_kill = NULL; - int num_sessions = 0; /* * Lock the session list, moving any candidates for euthanasia into * a separate list. */ - pthread_mutex_lock(&SessionListMutex); - num_sessions = 0; + CtdlLogResult(pthread_mutex_lock(&SessionListMutex)); for (sptr = SessionList; sptr != NULL; sptr = sptr->next) { - ++num_sessions; /* Kill idle sessions */ if ((time(NULL) - (sptr->lastreq)) > (time_t) WEBCIT_TIMEOUT) { @@ -77,7 +90,7 @@ void do_housekeeping(void) sessions_to_kill = sptr; } } - pthread_mutex_unlock(&SessionListMutex); + CtdlLogResult(pthread_mutex_unlock(&SessionListMutex)); /* * Now free up and destroy the culled sessions. @@ -90,18 +103,28 @@ void do_housekeeping(void) 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) ) { +/* + * Check the size of our thread pool. If all threads are executing, spawn another. + */ +void check_thread_pool_size(void) +{ + if (time_to_die) return; /* don't expand the thread pool during shutdown */ + + begin_critical_section(S_SPAWNER); /* only one of these should run at a time */ + if ( + (num_threads_executing >= num_threads_existing) + && (num_threads_existing < MAX_WORKER_THREADS) + ) { + lprintf(3, "%d of %d threads are executing. Adding another worker thread.\n", + num_threads_executing, + num_threads_existing + ); spawn_another_worker_thread(); - lprintf(3, "There are %d sessions and %d threads active.\n", - num_sessions, num_threads); } + end_critical_section(S_SPAWNER); } @@ -142,7 +165,7 @@ wcsession *FindSession(wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t GetAuthBasic(Hdr); } - pthread_mutex_lock(ListMutex); + CtdlLogResult(pthread_mutex_lock(ListMutex)); for (sptr = *wclist; ((sptr != NULL) && (TheSession == NULL)); sptr = sptr->next) { /* If HTTP-AUTH, look for a session with matching credentials */ @@ -170,7 +193,7 @@ wcsession *FindSession(wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t break; } } - pthread_mutex_unlock(ListMutex); + CtdlLogResult(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)); @@ -180,14 +203,13 @@ wcsession *FindSession(wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t wcsession *CreateSession(int Lockable, int Static, wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t *ListMutex) { wcsession *TheSession; - lprintf(3, "Creating a new session\n"); + 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->chat_sock = (-1); - TheSession->is_mobile = -1; pthread_setspecific(MyConKey, (void *)TheSession); @@ -210,7 +232,7 @@ wcsession *CreateSession(int Lockable, int Static, wcsession **wclist, ParsedHtt pthread_mutex_init(&TheSession->SessionMutex, NULL); if (ListMutex != NULL) - pthread_mutex_lock(ListMutex); + CtdlLogResult(pthread_mutex_lock(ListMutex)); if (wclist != NULL) { TheSession->nonce = rand(); @@ -218,31 +240,12 @@ wcsession *CreateSession(int Lockable, int Static, wcsession **wclist, ParsedHtt *wclist = TheSession; } if (ListMutex != NULL) - pthread_mutex_unlock(ListMutex); + CtdlLogResult(pthread_mutex_unlock(ListMutex)); } return TheSession; } -/* - * 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; -} - /* If it's a "force 404" situation then display the error and bail. */ void do_404(void) { @@ -283,6 +286,7 @@ int ReadHttpSubject(ParsedHttpHdrs *Hdr, StrBuf *Line, StrBuf *Buf) } 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.*/ @@ -444,8 +448,13 @@ void OverrideRequest(ParsedHttpHdrs *Hdr, const char *Line, long len) { StrBuf *Buf = NewStrBuf(); - FlushStrBuf(Hdr->HR.ReqLine); - StrBufPlain(Hdr->HR.ReqLine, Line, len); + if (Hdr->HR.ReqLine != NULL) { + FlushStrBuf(Hdr->HR.ReqLine); + StrBufPlain(Hdr->HR.ReqLine, Line, len); + } + else { + Hdr->HR.ReqLine = NewStrBufPlain(Line, len); + } ReadHttpSubject(Hdr, Hdr->HR.ReqLine, Buf); FreeStrBuf(&Buf); @@ -543,17 +552,13 @@ void context_loop(ParsedHttpHdrs *Hdr) if (TheSession == NULL) { TheSession = CreateSession(1, 0, &SessionList, Hdr, &SessionListMutex); - if ((StrLength(Hdr->c_username) == 0) && (!Hdr->HR.DontNeedAuth)) { - - 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; - } + if ( (StrLength(Hdr->c_username) == 0) + && (!Hdr->HR.DontNeedAuth) + && (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; } if (StrLength(Hdr->c_language) > 0) { @@ -571,7 +576,7 @@ void context_loop(ParsedHttpHdrs *Hdr) /* * Bind to the session and perform the transaction */ - pthread_mutex_lock(&TheSession->SessionMutex); /* bind */ + CtdlLogResult(pthread_mutex_lock(&TheSession->SessionMutex)); pthread_setspecific(MyConKey, (void *)TheSession); TheSession->lastreq = time(NULL); /* log */ @@ -599,7 +604,7 @@ void context_loop(ParsedHttpHdrs *Hdr) session_detach_modules(TheSession); TheSession->Hdr = NULL; - pthread_mutex_unlock(&TheSession->SessionMutex); /* unbind */ + CtdlLogResult(pthread_mutex_unlock(&TheSession->SessionMutex)); } void tmplput_nonce(StrBuf *Target, WCTemplputParams *TP) @@ -614,11 +619,6 @@ 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_HandleContentLength(StrBuf *Line, ParsedHttpHdrs *hdr) { hdr->HR.ContentLength = StrToi(Line); @@ -629,34 +629,23 @@ 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; + if (site_prefix == NULL) { + site_prefix = NewStrBuf(); + StrBufAppendPrintf(site_prefix, "%s://", (is_https ? "https" : "http") ); + StrBufAppendBuf(site_prefix, Line, 0); + } } void Header_HandleXFFHost(StrBuf *Line, ParsedHttpHdrs *hdr) { - if (follow_xff) - hdr->HR.http_host = Line; + if ( (follow_xff) && (site_prefix == NULL)) { + site_prefix = NewStrBuf(); + StrBufAppendPrintf(site_prefix, "http://"); /* this is naive; do something about it */ + StrBufAppendBuf(site_prefix, Line, 0); + } } @@ -765,7 +754,6 @@ InitModule_CONTEXT { 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); @@ -774,7 +762,6 @@ InitModule_CONTEXT RegisterHeaderHandler(HKEY("IF-MODIFIED-SINCE"), Header_HandleIfModSince); RegisterNamespace("CURRENT_USER", 0, 1, tmplput_current_user, NULL, CTX_NONE); - RegisterNamespace("CURRENT_ROOM", 0, 1, tmplput_current_room, NULL, CTX_NONE); RegisterNamespace("NONCE", 0, 0, tmplput_nonce, NULL, 0); WebcitAddUrlHandler(HKEY("404"), "", 0, do_404, ANONYMOUS|COOKIEUNNEEDED);