X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fcontext_loop.c;h=3b1f30ae3969d7cb80d1a7fc654b7d5e9e6bf2d0;hb=f7b538d716fc80c12ab49d3ca8c4eb48a5c51eb2;hp=48fc3f8ae97e7ec9fcbc2b4e4d4a5fed454da704;hpb=6ec73d6906542ea2f8cca2e62f7625ee2e17ae03;p=citadel.git diff --git a/webcit/context_loop.c b/webcit/context_loop.c index 48fc3f8ae..3b1f30ae3 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,14 @@ 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. */ + +extern void session_loop(void); +void spawn_another_worker_thread(void); + void DestroyHttpHeaderHandler(void *V) { @@ -44,26 +64,24 @@ 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) { + syslog(3, "Timeout session %d\n", sptr->wc_session); sptr->killthis = 1; } /* Remove sessions flagged for kill */ if (sptr->killthis) { - /** remove session from linked list */ + /* remove session from linked list */ if (sptr == SessionList) { SessionList = SessionList->next; } @@ -77,31 +95,38 @@ 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. */ while (sessions_to_kill != NULL) { - lprintf(3, "Destroying session %d\n", sessions_to_kill->wc_session); - pthread_mutex_lock(&sessions_to_kill->SessionMutex); - pthread_mutex_unlock(&sessions_to_kill->SessionMutex); + syslog(3, "Destroying session %d\n", sessions_to_kill->wc_session); sptr = sessions_to_kill->next; - 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) + ) { + syslog(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 +167,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 */ @@ -153,41 +178,51 @@ wcsession *FindSession(wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t continue; if ((!strcasecmp(ChrPtr(Hdr->c_username), ChrPtr(sptr->wc_username))) && (!strcasecmp(ChrPtr(Hdr->c_password), ChrPtr(sptr->wc_password))) ) { + syslog(LOG_DEBUG, "-- matched a session with the same http-auth"); 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)); + syslog(1, "found sessionkey [%d], but credentials for [%s|%s] didn't match", + 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)) { + (sptr->wc_session == Hdr->HR.desired_session)) + { + 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"); + TheSession = sptr; + } 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)); + CtdlLogResult(pthread_mutex_unlock(ListMutex)); + if (TheSession == NULL) { + syslog(1, "didn't find sessionkey [%d] for user [%s]", + Hdr->HR.SessionKey, ChrPtr(Hdr->c_username) + ); + } return TheSession; } -wcsession *CreateSession(int Lockable, wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t *ListMutex) +wcsession *CreateSession(int Lockable, int Static, wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t *ListMutex) { wcsession *TheSession; - 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); @@ -199,18 +234,20 @@ wcsession *CreateSession(int Lockable, wcsession **wclist, ParsedHttpHdrs *Hdr, */ if (Hdr->HR.desired_session == 0) { TheSession->wc_session = GenerateSessionID(); + syslog(3, "Created new session %d", TheSession->wc_session); } else { TheSession->wc_session = Hdr->HR.desired_session; + syslog(3, "Re-created session %d", TheSession->wc_session); } - + Hdr->HR.Static = Static; session_new_modules(TheSession); if (Lockable) { 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,37 +255,18 @@ wcsession *CreateSession(int Lockable, wcsession **wclist, ParsedHttpHdrs *Hdr, *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) { hprintf("HTTP/1.1 404 Not found\r\n"); hprintf("Content-Type: text/plain\r\n"); - wprintf("Not found\r\n"); + wc_printf("Not found\r\n"); end_burst(); } @@ -283,6 +301,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.*/ @@ -387,7 +406,7 @@ int ReadHTTPRequest (ParsedHttpHdrs *Hdr) memset(pHdr, 0, sizeof(OneHttpHeader)); pHdr->Val = Line; Put(Hdr->HTTPHeaders, HKEY("GET /"), pHdr, DestroyHttpHeaderHandler); - lprintf(9, "%s\n", ChrPtr(Line)); + syslog(9, "%s\n", ChrPtr(Line)); isbogus = ReadHttpSubject(Hdr, Line, HeaderName); if (isbogus) break; continue; @@ -411,9 +430,10 @@ int ReadHTTPRequest (ParsedHttpHdrs *Hdr) StrBufExtract_token(HeaderName, Line, 0, ':'); pchs = ChrPtr(Line); + pche = pchs + StrLength(Line); pch = pchs + StrLength(HeaderName) + 1; pche = pchs + StrLength(Line); - while (isspace(*pch) && (pch < pche)) + while ((pch < pche) && isspace(*pch)) pch ++; StrBufCutLeft(Line, pch - pchs); @@ -443,8 +463,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); @@ -469,6 +494,7 @@ void context_loop(ParsedHttpHdrs *Hdr) wcsession *TheSession; struct timeval tx_start; struct timeval tx_finish; + int session_may_be_reused = 1; gettimeofday(&tx_start, NULL); /* start a stopwatch for performance timing */ @@ -478,20 +504,19 @@ void context_loop(ParsedHttpHdrs *Hdr) isbogus = ReadHTTPRequest(Hdr); Hdr->HR.dav_depth = 32767; /* TODO: find a general way to have non-0 defaults */ - if (!isbogus) + + if (!isbogus) { isbogus = AnalyseHeaders(Hdr); + } - if ((isbogus) || - ((Hdr->HR.Handler != NULL) && - ((Hdr->HR.Handler->Flags & BOGUS) != 0))) - { + if ( (isbogus) + || ((Hdr->HR.Handler != NULL) + && ((Hdr->HR.Handler->Flags & BOGUS) != 0)) + ) { wcsession *Bogus; - - Bogus = CreateSession(0, NULL, Hdr, NULL); - + Bogus = CreateSession(0, 1, NULL, Hdr, NULL); do_404(); - - lprintf(9, "HTTP: 404 [%ld.%06ld] %s %s \n", + syslog(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], @@ -505,23 +530,19 @@ void context_loop(ParsedHttpHdrs *Hdr) if ((Hdr->HR.Handler != NULL) && ((Hdr->HR.Handler->Flags & ISSTATIC) != 0)) { wcsession *Static; - Static = CreateSession(0, NULL, Hdr, NULL); + Static = CreateSession(0, 1, NULL, Hdr, NULL); Hdr->HR.Handler->F(); /* 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) - ); + syslog(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; @@ -531,6 +552,10 @@ void context_loop(ParsedHttpHdrs *Hdr) CheckAuthBasic(Hdr); } + if (Hdr->HR.got_auth) { + session_may_be_reused = 0; + } + /* * See if there's an existing session open with the desired ID or user/pass */ @@ -540,23 +565,19 @@ void context_loop(ParsedHttpHdrs *Hdr) * Create a new session if we have to */ if (TheSession == NULL) { - TheSession = CreateSession(1, &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; - } + TheSession = CreateSession(1, 0, &SessionList, Hdr, &SessionListMutex); + + 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) { - lprintf(9, "Session cookie requests language '%s'\n", ChrPtr(Hdr->c_language)); + syslog(9, "Session cookie requests language '%s'\n", ChrPtr(Hdr->c_language)); set_selected_language(ChrPtr(Hdr->c_language)); go_selected_language(); } @@ -570,35 +591,42 @@ 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->inuse = 1; /* mark the session as bound */ TheSession->lastreq = time(NULL); /* log */ 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) - ); + syslog(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); + /* If *this* very transaction did not explicitly specify a session cookie, + * and it did not log in, we want to flag the session as a candidate for + * re-use by the next unbound client that comes along. This keeps our session + * 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 */ + } + TheSession->Hdr = NULL; - pthread_mutex_unlock(&TheSession->SessionMutex); /* unbind */ + TheSession->inuse = 0; /* mark the session as unbound */ + CtdlLogResult(pthread_mutex_unlock(&TheSession->SessionMutex)); } void tmplput_nonce(StrBuf *Target, WCTemplputParams *TP) @@ -613,11 +641,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); @@ -628,34 +651,28 @@ 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 (hdr->HostHeader != NULL) { + FreeStrBuf(&hdr->HostHeader); + } + hdr->HostHeader = NewStrBuf(); + StrBufAppendPrintf(hdr->HostHeader, "%s://", (is_https ? "https" : "http") ); + StrBufAppendBuf(hdr->HostHeader, Line, 0); } void Header_HandleXFFHost(StrBuf *Line, ParsedHttpHdrs *hdr) { - if (follow_xff) - hdr->HR.http_host = Line; + if (!follow_xff) return; + + if (hdr->HostHeader != NULL) { + FreeStrBuf(&hdr->HostHeader); + } + + hdr->HostHeader = NewStrBuf(); + StrBufAppendPrintf(hdr->HostHeader, "http://"); /* this is naive; do something about it */ + StrBufAppendBuf(hdr->HostHeader, Line, 0); } @@ -764,7 +781,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); @@ -773,7 +789,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); @@ -803,6 +818,7 @@ HttpDetachModule_CONTEXT (ParsedHttpHdrs *httpreq) { FlushStrBuf(httpreq->PlainArgs); + FlushStrBuf(httpreq->HostHeader); FlushStrBuf(httpreq->this_page); FlushStrBuf(httpreq->PlainArgs); DeleteHash(&httpreq->HTTPHeaders); @@ -817,6 +833,7 @@ HttpDestroyModule_CONTEXT FreeStrBuf(&httpreq->PlainArgs); FreeStrBuf(&httpreq->this_page); FreeStrBuf(&httpreq->PlainArgs); + FreeStrBuf(&httpreq->HostHeader); DeleteHash(&httpreq->HTTPHeaders); }