X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fcontext_loop.c;h=ff95e825ebe5ad428d604b610d8621ae6a6a327f;hb=a648fdc96cf64d183b394f9b46822b4104192528;hp=72b5882ee11da3641b3a0a8d5c56b07b47fd8d92;hpb=a31d1318873e3cbdfb1d0aeae6491af28f3dbc7b;p=citadel.git diff --git a/webcit/context_loop.c b/webcit/context_loop.c index 72b5882ee..ff95e825e 100644 --- a/webcit/context_loop.c +++ b/webcit/context_loop.c @@ -1,11 +1,18 @@ /* - * $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-2012 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 version 3. + * + * 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. */ #include "webcit.h" @@ -15,13 +22,21 @@ /* Only one thread may manipulate SessionList at a time... */ pthread_mutex_t SessionListMutex; -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; +/* 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) { OneHttpHeader *pHdr; @@ -35,7 +50,7 @@ void shutdown_sessions(void) wcsession *sptr; for (sptr = SessionList; sptr != NULL; sptr = sptr->next) { - sptr->killthis = 1; + sptr->killthis = 1; } } @@ -43,28 +58,24 @@ void do_housekeeping(void) { 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. */ - 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) { + /* Kill idle sessions */ + if ((time(NULL) - (sptr->lastreq)) > (time_t) WEBCIT_TIMEOUT) { + syslog(3, "Timeout session %d", sptr->wc_session); sptr->killthis = 1; } - /** Remove sessions flagged for kill */ + /* Remove sessions flagged for kill */ if (sptr->killthis) { - /** remove session from linked list */ + /* remove session from linked list */ if (sptr == SessionList) { SessionList = SessionList->next; } @@ -78,33 +89,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", 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.", + num_threads_executing, + num_threads_existing + ); spawn_another_worker_thread(); - ++num_threads; - lprintf(3, "There are %d sessions and %d threads active.\n", - num_sessions, num_threads); } + end_critical_section(S_SPAWNER); } @@ -136,174 +152,199 @@ int GenerateSessionID(void) return ++seq; } - -/* - * lingering_close() a`la Apache. see - * http://www.apache.org/docs/misc/fin_wait_2.html for rationale - */ -int lingering_close(int fd) +wcsession *FindSession(wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t *ListMutex) { - char buf[SIZ]; - int i; - fd_set set; - struct timeval tv, start; + wcsession *sptr = NULL; + wcsession *TheSession = NULL; + + if (Hdr->HR.got_auth == AUTH_BASIC) { + GetAuthBasic(Hdr); + } - gettimeofday(&start, NULL); - shutdown(fd, 1); - 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; + 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 */ + switch (Hdr->HR.got_auth) + { + case AUTH_BASIC: + if ( (!strcasecmp(ChrPtr(Hdr->c_username), ChrPtr(sptr->wc_username))) + && (!strcasecmp(ChrPtr(Hdr->c_password), ChrPtr(sptr->wc_password))) + && (sptr->killthis == 0) + ) { + syslog(LOG_DEBUG, "Matched a session with the same http-auth"); + TheSession = sptr; } - FD_ZERO(&set); - FD_SET(fd, &set); - i = select(fd + 1, &set, NULL, NULL, &tv); - } while (i == -1 && errno == EINTR); - - if (i <= 0) break; - - i = read(fd, buf, sizeof buf); - } while (i != 0 && (i != -1 || errno == EINTR)); - - return close(fd); + 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) + ) { + 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; + } + } + CtdlLogResult(pthread_mutex_unlock(ListMutex)); + if (TheSession == NULL) { + syslog(LOG_DEBUG, "No existing session was matched"); + } + return TheSession; } +wcsession *CreateSession(int Lockable, int Static, wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t *ListMutex) +{ + wcsession *TheSession; + TheSession = (wcsession *) malloc(sizeof(wcsession)); + memset(TheSession, 0, sizeof(wcsession)); + TheSession->Hdr = Hdr; + TheSession->serv_sock = (-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(); + 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); -/** - * \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; -} - - + if (ListMutex != NULL) + CtdlLogResult(pthread_mutex_lock(ListMutex)); -/* - * 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) {////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; - - max = sizeof(bogus_prefixes) / sizeof(char *); - - for (i=0; inonce = rand(); + TheSession->next = *wclist; + *wclist = TheSession; } + if (ListMutex != NULL) + CtdlLogResult(pthread_mutex_unlock(ListMutex)); } - - return(0); /* probably ok */ + return TheSession; } +/* 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"); + 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->ReqLine = Line; + Hdr->HR.ReqLine = Line; /* The requesttype... GET, POST... */ - StrBufExtract_token(Buf, Hdr->ReqLine, 0, ' '); + StrBufExtract_token(Buf, Hdr->HR.ReqLine, 0, ' '); if (GetHash(HttpReqTypes, SKEY(Buf), &vLine) && (vLine != NULL)) { - Hdr->eReqType = *(long*)vLine; + Hdr->HR.eReqType = *(long*)vLine; } else { - Hdr->eReqType = eGET; + Hdr->HR.eReqType = eGET; return 1; } - StrBufCutLeft(Hdr->ReqLine, StrLength(Buf) + 1); + StrBufCutLeft(Hdr->HR.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; + StrBufExtract_token(Buf, Hdr->HR.ReqLine, 1, ' '); + StrBufCutRight(Hdr->HR.ReqLine, StrLength(Buf) + 1); + + if (StrLength(Buf) == 0) { + Hdr->HR.eReqType = eGET; return 1; } - Hdr->this_page = NewStrBufDup(Hdr->ReqLine); + StrBufAppendBuf(Hdr->this_page, Hdr->HR.ReqLine, 0); + /* chop Filename / query arguments */ - Args = strchr(ChrPtr(Hdr->ReqLine), '?'); + 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->ReqLine), '&'); + Args = strchr(ChrPtr(Hdr->HR.ReqLine), '&'); if (Args != NULL) { Args ++; /* skip the ? */ - Hdr->PlainArgs = NewStrBufPlain( - Args, - StrLength(Hdr->ReqLine) - - (Args - ChrPtr(Hdr->ReqLine))); - StrBufCutAt(Hdr->ReqLine, 0, Args - 1); + 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->ReqLine, &Pos, '/'); + StrBufExtract_NextToken(Buf, Hdr->HR.ReqLine, &Pos, '/'); do { - StrBufExtract_NextToken(Buf, Hdr->ReqLine, &Pos, '/'); + StrBufExtract_NextToken(Buf, Hdr->HR.ReqLine, &Pos, '/'); GetHash(HandlerHash, SKEY(Buf), &vHandler), - Hdr->Handler = (WebcitHandler*) vHandler; - if (Hdr->Handler == NULL) + 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->Handler->Flags & URLNAMESPACE) == 0) - break; + if ((Hdr->HR.Handler->Flags & URLNAMESPACE) != 0) + continue; + break; } while (1); /* remove the handlername from the URL */ - if (Pos != NULL) { - StrBufCutLeft(Hdr->ReqLine, - Pos - ChrPtr(Hdr->ReqLine)); + if ((Pos != NULL) && (Pos != StrBufNOTNULL)){ + StrBufCutLeft(Hdr->HR.ReqLine, + Pos - ChrPtr(Hdr->HR.ReqLine)); } - if (Hdr->Handler != NULL) { - if ((Hdr->Handler->Flags & BOGUS) != 0) + if (Hdr->HR.Handler != NULL) { + if ((Hdr->HR.Handler->Flags & BOGUS) != 0) { return 1; - Hdr->DontNeedAuth = (Hdr->Handler->Flags & ISSTATIC) != 0; + } + Hdr->HR.DontNeedAuth = ( + ((Hdr->HR.Handler->Flags & ISSTATIC) != 0) || + ((Hdr->HR.Handler->Flags & ANONYMOUS) != 0) + ); + } + else { + /* If this is a "flat" request for the root, display the configured landing page. */ + 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)); + return_value = ReadHttpSubject(Hdr, NewLine, Buf); + FreeStrBuf(&NewLine); + return return_value; } - Hdr->HTTPHeaders = NewHash(1, NULL); return 0; } @@ -331,7 +372,7 @@ int AnalyseHeaders(ParsedHttpHdrs *Hdr) /* * Read in the request */ -int ReadHTTPRequset (ParsedHttpHdrs *Hdr) +int ReadHTTPRequest (ParsedHttpHdrs *Hdr) { const char *pch, *pchs, *pche; OneHttpHeader *pHdr; @@ -341,19 +382,24 @@ int ReadHTTPRequset (ParsedHttpHdrs *Hdr) int isbogus = 0; HeaderName = NewStrBuf(); - Hdr->ReadBuf = NewStrBuf(); LastLine = NULL; do { nLine ++; - Line = NewStrBuf(); + Line = NewStrBufPlain(NULL, SIZ / 4); - if (ClientGetLine(&Hdr->http_sock, Line, Hdr->ReadBuf, &Hdr->Pos) < 0) return 1; + 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); + syslog(9, "%s", ChrPtr(Line)); isbogus = ReadHttpSubject(Hdr, Line, HeaderName); if (isbogus) break; continue; @@ -377,9 +423,10 @@ int ReadHTTPRequset (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); @@ -405,7 +452,21 @@ int ReadHTTPRequset (ParsedHttpHdrs *Hdr) return isbogus; } +void OverrideRequest(ParsedHttpHdrs *Hdr, const char *Line, long len) +{ + StrBuf *Buf = NewStrBuf(); + 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); +} /* * handle one request @@ -420,125 +481,100 @@ int ReadHTTPRequset (ParsedHttpHdrs *Hdr) * function returns, the worker thread is then free to handle another * transaction. */ -void context_loop(int *sock) +void context_loop(ParsedHttpHdrs *Hdr) { - ParsedHttpHdrs Hdr; int isbogus = 0; - wcsession *TheSession, *sptr; + 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 */ - memset(&Hdr, 0, sizeof(ParsedHttpHdrs)); - Hdr.eReqType = eGET; - Hdr.http_sock = *sock; /* * Find out what it is that the web browser is asking for */ - isbogus = ReadHTTPRequset(&Hdr); + isbogus = ReadHTTPRequest(Hdr); - if (!isbogus) - isbogus = AnalyseHeaders(&Hdr); + Hdr->HR.dav_depth = 32767; /* TODO: find a general way to have non-0 defaults */ - if (Hdr.got_auth == AUTH_BASIC) - CheckAuthBasic(&Hdr); + if (!isbogus) { + isbogus = AnalyseHeaders(Hdr); + } -/* - if (isbogus) - StrBufPlain(ReqLine, HKEY("/404")); -TODO HKEY("/static/nocookies.html?force_close_session=yes")); -*/ + if ( (isbogus) + || ((Hdr->HR.Handler != NULL) + && ((Hdr->HR.Handler->Flags & BOGUS) != 0)) + ) { + wcsession *Bogus; + Bogus = CreateSession(0, 1, NULL, Hdr, NULL); + do_404(); + syslog(9, "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], + ChrPtr(Hdr->this_page) + ); + session_detach_modules(Bogus); + session_destroy_modules(&Bogus); + return; + } -/* dbg_PrintHash(HTTPHeaders, nix, NULL); */ + if ((Hdr->HR.Handler != NULL) && ((Hdr->HR.Handler->Flags & ISSTATIC) != 0)) + { + wcsession *Static; + Static = CreateSession(0, 1, NULL, Hdr, NULL); + + Hdr->HR.Handler->F(); + /* 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) + ); + session_detach_modules(Static); + session_destroy_modules(&Static); + return; + } - /* Begin parsing the request. * / -#ifdef TECH_PREVIEW - if ((strncmp(ChrPtr(ReqLine), "/sslg", 5) != 0) && - (strncmp(ChrPtr(ReqLine), "/static/", 8) != 0) && - (strncmp(ChrPtr(ReqLine), "/tiny_mce/", 10) != 0) && - (strncmp(ChrPtr(ReqLine), "/wholist_section", 16) != 0) && - (strstr(ChrPtr(ReqLine), "wholist_section") == NULL)) { -#endif - lprintf(5, "HTTP: %s %s\n", ReqStrs[Hdr.eReqType], ChrPtr(ReqLine)); -#ifdef TECH_PREVIEW + if (Hdr->HR.got_auth == AUTH_BASIC) { + CheckAuthBasic(Hdr); } -#endif -*/ + 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 + /* + * See if there's an existing session open with any of: + * - The desired Session ID + * - A matching http-auth username and password + * - An unbound session flagged as reusable */ - TheSession = NULL; + TheSession = FindSession(&SessionList, Hdr, &SessionListMutex); + /* + * If there were no qualifying sessions, then create a new one. + */ if (TheSession == NULL) { - pthread_mutex_lock(&SessionListMutex); - for (sptr = SessionList; - ((sptr != NULL) && (TheSession == NULL)); - sptr = sptr->next) { - - /** If HTTP-AUTH, look for a session with matching credentials */ - switch (Hdr.got_auth) - { - case AUTH_BASIC: - if ( (Hdr.SessionKey != sptr->SessionKey)) - continue; - GetAuthBasic(&Hdr); - if ((!strcasecmp(ChrPtr(Hdr.c_username), ChrPtr(sptr->wc_username))) && - (!strcasecmp(ChrPtr(Hdr.c_password), ChrPtr(sptr->wc_password))) ) - TheSession = sptr; - break; - case AUTH_COOKIE: - /** If cookie-session, look for a session with matching session ID */ - if ( (Hdr.desired_session != 0) && - (sptr->wc_session == Hdr.desired_session)) - TheSession = sptr; - break; - case NO_AUTH: - break; - } - } - pthread_mutex_unlock(&SessionListMutex); + TheSession = CreateSession(1, 0, &SessionList, Hdr, &SessionListMutex); } - /** - * Create a new session if we have to + /* + * Reject transactions which require http-auth, if http-auth was not provided */ - if (TheSession == NULL) { - lprintf(3, "Creating a new session\n"); - TheSession = (wcsession *) - malloc(sizeof(wcsession)); - memset(TheSession, 0, sizeof(wcsession)); - TheSession->Hdr = &Hdr; - TheSession->SessionKey = Hdr.SessionKey; - 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 (Hdr.desired_session == 0) { - TheSession->wc_session = GenerateSessionID(); - } - else { - TheSession->wc_session = Hdr.desired_session; - } - - pthread_setspecific(MyConKey, (void *)TheSession); - session_new_modules(TheSession); - - pthread_mutex_init(&TheSession->SessionMutex, NULL); - pthread_mutex_lock(&SessionListMutex); - TheSession->nonce = rand(); - TheSession->next = SessionList; - TheSession->is_mobile = -1; - SessionList = TheSession; - pthread_mutex_unlock(&SessionListMutex); + if ( (StrLength(Hdr->c_username) == 0) + && (!Hdr->HR.DontNeedAuth) + && (Hdr->HR.Handler != NULL) + && ((XHTTP_COMMANDS & Hdr->HR.Handler->Flags) == XHTTP_COMMANDS) + ) { + syslog(LOG_DEBUG, "http-auth required but not provided"); + OverrideRequest(Hdr, HKEY("GET /401 HTTP/1.0")); + Hdr->HR.prohibit_caching = 1; } /* @@ -549,31 +585,54 @@ TODO HKEY("/static/nocookies.html?force_close_session=yes")); /* * 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; + TheSession->Hdr = Hdr; - session_attach_modules(TheSession); - session_loop(); /* do transaction */ + /* + * 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)); + set_selected_language(ChrPtr(Hdr->c_language)); + go_selected_language(); + } + /* + * do the transaction + */ + session_attach_modules(TheSession); + session_loop(); /* How long did this transaction take? */ gettimeofday(&tx_finish, NULL); - - lprintf(9, "Transaction [%s] completed in %ld.%06ld seconds.\n", - ChrPtr(Hdr.this_page), + + 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 + ((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 */ + /* 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 */ + } - http_destroy_modules(&Hdr); + TheSession->Hdr = NULL; + TheSession->inuse = 0; /* mark the session as unbound */ + CtdlLogResult(pthread_mutex_unlock(&TheSession->SessionMutex)); } void tmplput_nonce(StrBuf *Target, WCTemplputParams *TP) @@ -588,65 +647,54 @@ 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->ContentLength = StrToi(Line); + hdr->HR.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 + hdr->HR.ContentType = Line; } void Header_HandleHost(StrBuf *Line, ParsedHttpHdrs *hdr) { - if ((follow_xff) && (hdr->http_host != NULL)) - return; - else - hdr->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->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); } void Header_HandleXFF(StrBuf *Line, ParsedHttpHdrs *hdr) { - hdr->browser_host = Line; + hdr->HR.browser_host = Line; - while (StrBufNum_tokens(hdr->browser_host, ',') > 1) { - StrBufRemove_token(hdr->browser_host, 0, ','); + while (StrBufNum_tokens(hdr->HR.browser_host, ',') > 1) { + StrBufRemove_token(hdr->HR.browser_host, 0, ','); } - StrBufTrim(hdr->browser_host); + StrBufTrim(hdr->HR.browser_host); } void Header_HandleIfModSince(StrBuf *Line, ParsedHttpHdrs *hdr) { - hdr->if_modified_since = httpdate_to_timestamp(Line); + hdr->HR.if_modified_since = httpdate_to_timestamp(Line); } void Header_HandleAcceptEncoding(StrBuf *Line, ParsedHttpHdrs *hdr) @@ -655,7 +703,7 @@ void Header_HandleAcceptEncoding(StrBuf *Line, ParsedHttpHdrs *hdr) * Can we compress? */ if (strstr(&ChrPtr(Line)[16], "gzip")) { - hdr->gzip_ok = 1; + hdr->HR.gzip_ok = 1; } } const char *ReqStrs[eNONE] = { @@ -667,7 +715,8 @@ const char *ReqStrs[eNONE] = { "DELETE", "HEAD", "MOVE", - "COPY" + "COPY", + "REPORT" }; void @@ -713,6 +762,10 @@ ServerStartModule_CONTEXT v = malloc(sizeof(long)); *v = eCOPY; Put(HttpReqTypes, HKEY("COPY"), v, NULL); + + v = malloc(sizeof(long)); + *v = eREPORT; + Put(HttpReqTypes, HKEY("REPORT"), v, NULL); } void @@ -731,41 +784,67 @@ void RegisterHeaderHandler(const char *Name, long Len, Header_Evaluator F) pHdr->H = F; Put(HttpHeaderHandler, Name, Len, pHdr, DestroyHttpHeaderHandler); } -extern void blank_page(void); ///TODO: remove me + + 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); + 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, CTX_NONE); - RegisterNamespace("CURRENT_ROOM", 0, 1, tmplput_current_room, CTX_NONE); - RegisterNamespace("NONCE", 0, 0, tmplput_nonce, 0); - - + RegisterNamespace("CURRENT_USER", 0, 1, tmplput_current_user, NULL, CTX_NONE); + RegisterNamespace("NONCE", 0, 0, tmplput_nonce, NULL, 0); - WebcitAddUrlHandler(HKEY("blank"), blank_page, ANONYMOUS|BOGUS); - - WebcitAddUrlHandler(HKEY("webcit"), blank_page, URLNAMESPACE); + 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->HostHeader); + FlushStrBuf(httpreq->this_page); + FlushStrBuf(httpreq->PlainArgs); + DeleteHash(&httpreq->HTTPHeaders); + memset(&httpreq->HR, 0, sizeof(HdrRefs)); +} void HttpDestroyModule_CONTEXT (ParsedHttpHdrs *httpreq) { - FreeStrBuf(&httpreq->ReqLine); - FreeStrBuf(&httpreq->ReadBuf); + FreeStrBuf(&httpreq->this_page); FreeStrBuf(&httpreq->PlainArgs); FreeStrBuf(&httpreq->this_page); + FreeStrBuf(&httpreq->PlainArgs); + FreeStrBuf(&httpreq->HostHeader); DeleteHash(&httpreq->HTTPHeaders); }