X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fcontext_loop.c;h=f02a619913123c375a81c599d29b6e5dd17896cf;hb=HEAD;hp=b7aec9ed1e5f38523a98b9ace3952eeabcc2a965;hpb=c6aec42f213ec284e34648f3d69bcf927dccddb1;p=citadel.git diff --git a/webcit/context_loop.c b/webcit/context_loop.c index b7aec9ed1..bb0c1cb97 100644 --- a/webcit/context_loop.c +++ b/webcit/context_loop.c @@ -1,4 +1,3 @@ - /* * 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 @@ -17,7 +16,7 @@ */ #include "webcit.h" -#include "webserver.h" + #include "modules_init.h" /* Only one thread may manipulate SessionList at a time... */ @@ -30,30 +29,33 @@ 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. */ -int verbose = 0; +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); -void DestroyHttpHeaderHandler(void *V) { +void DestroyHttpHeaderHandler(void *V) +{ OneHttpHeader *pHdr; - pHdr = (OneHttpHeader *) V; + pHdr = (OneHttpHeader*) V; FreeStrBuf(&pHdr->Val); free(pHdr); } -void shutdown_sessions(void) { +void shutdown_sessions(void) +{ wcsession *sptr; - + for (sptr = SessionList; sptr != NULL; sptr = sptr->next) { sptr->killthis = 1; } } -void do_housekeeping(void) { +void do_housekeeping(void) +{ wcsession *sptr, *ss; wcsession *sessions_to_kill = NULL; time_t the_time; @@ -68,7 +70,9 @@ void do_housekeeping(void) { if (the_time == 0) the_time = time(NULL); /* Kill idle sessions */ - if ((sptr->inuse == 0) && ((the_time - (sptr->lastreq)) > (time_t) WEBCIT_TIMEOUT)) { + if ((sptr->inuse == 0) && + ((the_time - (sptr->lastreq)) > (time_t) WEBCIT_TIMEOUT)) + { syslog(LOG_DEBUG, "Timeout session %d", sptr->wc_session); sptr->killthis = 1; } @@ -80,12 +84,11 @@ void do_housekeeping(void) { if (sptr == SessionList) { SessionList = SessionList->next; } - else - for (ss = SessionList; ss != NULL; ss = ss->next) { - if (ss->next == sptr) { - ss->next = ss->next->next; - } + else for (ss=SessionList;ss!=NULL;ss=ss->next) { + if (ss->next == sptr) { + ss->next = ss->next->next; } + } sptr->next = sessions_to_kill; sessions_to_kill = sptr; @@ -107,16 +110,19 @@ void do_housekeeping(void) { /* * 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 */ +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) - ) { + if ( + (num_threads_executing >= num_threads_existing) + && (num_threads_existing < MAX_WORKER_THREADS) + ) { syslog(LOG_DEBUG, "%d of %d threads are executing. Adding another worker thread.", - num_threads_executing, num_threads_existing); + num_threads_executing, + num_threads_existing + ); spawn_another_worker_thread(); } end_critical_section(S_SPAWNER); @@ -126,7 +132,8 @@ void check_thread_pool_size(void) { /* * Wake up occasionally and clean house */ -void housekeeping_loop(void) { +void housekeeping_loop(void) +{ while (1) { sleeeeeeeeeep(HOUSEKEEPING); do_housekeeping(); @@ -139,34 +146,37 @@ void housekeeping_loop(void) { * Generate a unique WebCit session ID (which is not the same thing as the * Citadel session ID). */ -int GenerateSessionID(void) { +int GenerateSessionID(void) +{ static int seq = (-1); if (seq < 0) { seq = (int) time(NULL); } - + return ++seq; } -wcsession *FindSession(wcsession ** wclist, ParsedHttpHdrs * Hdr, pthread_mutex_t * ListMutex) { +wcsession *FindSession(wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t *ListMutex) +{ wcsession *sptr = NULL; - wcsession *TheSession = NULL; - + wcsession *TheSession = NULL; + if (Hdr->HR.got_auth == AUTH_BASIC) { GetAuthBasic(Hdr); } 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) { + 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) - ) { + if ( (!strcasecmp(ChrPtr(Hdr->c_username), ChrPtr(sptr->wc_username))) + && (!strcasecmp(ChrPtr(Hdr->c_password), ChrPtr(sptr->wc_password))) + && (sptr->killthis == 0) + ) { if (verbose) syslog(LOG_DEBUG, "Matched a session with the same http-auth"); TheSession = sptr; @@ -174,17 +184,17 @@ wcsession *FindSession(wcsession ** wclist, ParsedHttpHdrs * Hdr, pthread_mutex_ 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) - ) { + if ( (Hdr->HR.desired_session != 0) + && (sptr->wc_session == Hdr->HR.desired_session) + ) { if (verbose) syslog(LOG_DEBUG, "Matched a session with the same cookie"); TheSession = sptr; } - break; + break; case NO_AUTH: /* Any unbound session is a candidate */ - if ((sptr->wc_session == 0) && (sptr->inuse == 0)) { + if ( (sptr->wc_session == 0) && (sptr->inuse == 0) ) { if (verbose) syslog(LOG_DEBUG, "Reusing an unbound session"); TheSession = sptr; @@ -199,7 +209,8 @@ wcsession *FindSession(wcsession ** wclist, ParsedHttpHdrs * Hdr, pthread_mutex_ return TheSession; } -wcsession *CreateSession(int Lockable, int Static, wcsession ** wclist, ParsedHttpHdrs * Hdr, pthread_mutex_t * ListMutex) { +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)); @@ -207,14 +218,14 @@ wcsession *CreateSession(int Lockable, int Static, wcsession ** wclist, ParsedHt TheSession->serv_sock = (-1); TheSession->lastreq = time(NULL);; - pthread_setspecific(MyConKey, (void *) TheSession); - + 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(LOG_DEBUG, "Created new session %d", TheSession->wc_session); @@ -245,14 +256,16 @@ wcsession *CreateSession(int Lockable, int Static, wcsession ** wclist, ParsedHt /* If it's a "force 404" situation then display the error and bail. */ -void do_404(void) { +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) { +int ReadHttpSubject(ParsedHttpHdrs *Hdr, StrBuf *Line, StrBuf *Buf) +{ const char *Args; void *vLine, *vHandler; const char *Pos = NULL; @@ -260,8 +273,10 @@ int ReadHttpSubject(ParsedHttpHdrs * Hdr, StrBuf * Line, StrBuf * Buf) { 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; + if (GetHash(HttpReqTypes, SKEY(Buf), &vLine) && + (vLine != NULL)) + { + Hdr->HR.eReqType = *(long*)vLine; } else { Hdr->HR.eReqType = eGET; @@ -272,7 +287,7 @@ int ReadHttpSubject(ParsedHttpHdrs * Hdr, StrBuf * Line, StrBuf * Buf) { /* 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; @@ -282,21 +297,25 @@ int ReadHttpSubject(ParsedHttpHdrs * Hdr, StrBuf * Line, StrBuf * Buf) { /* 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. */ + 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))); + 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... */ - + } /* 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 { StrBufExtract_NextToken(Buf, Hdr->HR.ReqLine, &Pos, '/'); - GetHash(HandlerHash, SKEY(Buf), &vHandler), Hdr->HR.Handler = (WebcitHandler *) vHandler; + GetHash(HandlerHash, SKEY(Buf), &vHandler), + Hdr->HR.Handler = (WebcitHandler*) vHandler; if (Hdr->HR.Handler == NULL) break; /* @@ -309,16 +328,19 @@ int ReadHttpSubject(ParsedHttpHdrs * Hdr, StrBuf * Line, StrBuf * Buf) { break; } while (1); /* remove the handlername from the URL */ - if ((Pos != NULL) && (Pos != StrBufNOTNULL)) { - StrBufCutLeft(Hdr->HR.ReqLine, Pos - ChrPtr(Hdr->HR.ReqLine)); + if ((Pos != NULL) && (Pos != StrBufNOTNULL)){ + StrBufCutLeft(Hdr->HR.ReqLine, + Pos - ChrPtr(Hdr->HR.ReqLine)); } 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) - ); + 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. */ @@ -326,8 +348,7 @@ int ReadHttpSubject(ParsedHttpHdrs * Hdr, StrBuf * Line, StrBuf * Buf) { StrBuf *NewLine = NewStrBuf(); Hdr->HR.DontNeedAuth = 1; StrBufAppendPrintf(NewLine, "GET /landing?go=%s?failvisibly=1 HTTP/1.0", ChrPtr(Buf)); - if (verbose) - syslog(LOG_DEBUG, "Replacing with: %s", ChrPtr(NewLine)); + if (verbose) syslog(LOG_DEBUG, "Replacing with: %s", ChrPtr(NewLine)); return_value = ReadHttpSubject(Hdr, NewLine, Buf); FreeStrBuf(&NewLine); return return_value; @@ -336,15 +357,16 @@ int ReadHttpSubject(ParsedHttpHdrs * Hdr, StrBuf * Line, StrBuf * Buf) { return 0; } -int AnalyseHeaders(ParsedHttpHdrs * Hdr) { +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; + + while (GetNextHashPos(Hdr->HTTPHeaders, at, &HKLen, &HashKey, &vHdr) && + (vHdr != NULL)) { + pHdr = (OneHttpHeader *)vHdr; if (pHdr->HaveEvaluator) pHdr->H(pHdr->Val, Hdr); @@ -357,7 +379,7 @@ int AnalyseHeaders(ParsedHttpHdrs * Hdr) { /* * Read in the request */ -int ReadHTTPRequest(ParsedHttpHdrs * Hdr) { +int ReadHTTPRequest(ParsedHttpHdrs *Hdr) { const char *pch, *pchs, *pche; OneHttpHeader *pHdr; StrBuf *Line, *LastLine, *HeaderName; @@ -368,7 +390,7 @@ int ReadHTTPRequest(ParsedHttpHdrs * Hdr) { HeaderName = NewStrBuf(); LastLine = NULL; do { - nLine++; + nLine ++; Line = NewStrBufPlain(NULL, SIZ / 4); if (ClientGetLine(Hdr, Line) < 0) { @@ -383,7 +405,7 @@ int ReadHTTPRequest(ParsedHttpHdrs * Hdr) { } if (nLine == 1) { Hdr->HTTPHeaders = NewHash(1, NULL); - pHdr = (OneHttpHeader *) malloc(sizeof(OneHttpHeader)); + pHdr = (OneHttpHeader*) malloc(sizeof(OneHttpHeader)); memset(pHdr, 0, sizeof(OneHttpHeader)); pHdr->Val = Line; Put(Hdr->HTTPHeaders, HKEY("GET /"), pHdr, DestroyHttpHeaderHandler); @@ -391,8 +413,7 @@ int ReadHTTPRequest(ParsedHttpHdrs * Hdr) { syslog(LOG_DEBUG, "%s", ChrPtr(Line)); } isbogus = ReadHttpSubject(Hdr, Line, HeaderName); - if (isbogus) - break; + if (isbogus) break; continue; } @@ -401,7 +422,7 @@ int ReadHTTPRequest(ParsedHttpHdrs * Hdr) { pch = pchs = ChrPtr(Line); pche = pchs + StrLength(Line); while (isspace(*pch) && (pch < pche)) { - pch++; + pch ++; } StrBufCutLeft(Line, pch - pchs); StrBufAppendBuf(LastLine, Line, 0); @@ -410,7 +431,7 @@ int ReadHTTPRequest(ParsedHttpHdrs * Hdr) { continue; } - StrBufSanitizeAscii(Line, (char) 0xa7); + StrBufSanitizeAscii(Line, (char)0xa7); StrBufExtract_token(HeaderName, Line, 0, ':'); pchs = ChrPtr(Line); @@ -418,17 +439,17 @@ int ReadHTTPRequest(ParsedHttpHdrs * Hdr) { pch = pchs + StrLength(HeaderName) + 1; pche = pchs + StrLength(Line); while ((pch < pche) && isspace(*pch)) { - pch++; + pch ++; } StrBufCutLeft(Line, pch - pchs); StrBufUpCase(HeaderName); - pHdr = (OneHttpHeader *) malloc(sizeof(OneHttpHeader)); + 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; + OneHttpHeader *FHdr = (OneHttpHeader*) vF; pHdr->H = FHdr->H; pHdr->HaveEvaluator = 1; } @@ -441,7 +462,8 @@ int ReadHTTPRequest(ParsedHttpHdrs * Hdr) { return isbogus; } -void OverrideRequest(ParsedHttpHdrs * Hdr, const char *Line, long len) { +void OverrideRequest(ParsedHttpHdrs *Hdr, const char *Line, long len) +{ StrBuf *Buf = NewStrBuf(); if (Hdr->HR.ReqLine != NULL) { @@ -469,40 +491,40 @@ 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 */ + + gettimeofday(&tx_start, NULL); /* start a stopwatch for performance timing */ /* * Find out what it is that the web browser is asking for */ isbogus = ReadHTTPRequest(Hdr); - Hdr->HR.dav_depth = 32767; /* TODO: find a general way to have non-0 defaults */ + 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) + if ( (isbogus) + || ((Hdr->HR.Handler != NULL) && ((Hdr->HR.Handler->Flags & BOGUS) != 0)) - ) { + ) { wcsession *Bogus; Bogus = CreateSession(0, 1, NULL, Hdr, NULL); do_404(); 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], ChrPtr(Hdr->this_page) - ); + ((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; @@ -511,20 +533,19 @@ void context_loop(ParsedHttpHdrs * Hdr) { 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); - + 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], + ((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; @@ -556,14 +577,14 @@ void context_loop(ParsedHttpHdrs * Hdr) { /* * Reject transactions which require http-auth, if http-auth was not provided */ - if ((StrLength(Hdr->c_username) == 0) - && (!Hdr->HR.DontNeedAuth) - && (Hdr->HR.Handler != NULL) - && ((XHTTP_COMMANDS & Hdr->HR.Handler->Flags) == XHTTP_COMMANDS) - ) { + 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; + Hdr->HR.prohibit_caching = 1; } /* @@ -576,11 +597,11 @@ void context_loop(ParsedHttpHdrs * Hdr) { */ now = time(NULL);; CtdlLogResult(pthread_mutex_lock(&TheSession->SessionMutex)); - pthread_setspecific(MyConKey, (void *) TheSession); - - TheSession->inuse = 1; /* mark the session as bound */ - TheSession->isFailure = 0; /* reset evntually existing error flags */ - TheSession->lastreq = now; /* log */ + pthread_setspecific(MyConKey, (void *)TheSession); + + TheSession->inuse = 1; /* mark the session as bound */ + TheSession->isFailure = 0; /* reset evntually existing error flags */ + TheSession->lastreq = now; /* log */ TheSession->Hdr = Hdr; /* @@ -605,11 +626,11 @@ void context_loop(ParsedHttpHdrs * Hdr) { 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) - ); + ((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); @@ -620,45 +641,51 @@ void context_loop(ParsedHttpHdrs * Hdr) { * spider crawls the site without using cookies. */ if ((session_may_be_reused) && (!TheSession->logged_in)) { - TheSession->wc_session = 0; /* flag as available for re-use */ + TheSession->wc_session = 0; /* flag as available for re-use */ TheSession->selected_language = -1; /* clear any non-default language setting */ } TheSession->Hdr = NULL; - TheSession->inuse = 0; /* mark the session as unbound */ + TheSession->inuse = 0; /* mark the session as unbound */ CtdlLogResult(pthread_mutex_unlock(&TheSession->SessionMutex)); } -void tmplput_nonce(StrBuf * Target, WCTemplputParams * TP) { +void tmplput_nonce(StrBuf *Target, WCTemplputParams *TP) +{ wcsession *WCC = WC; - StrBufAppendPrintf(Target, "%ld", (WCC != NULL) ? WCC->nonce : 0); + StrBufAppendPrintf(Target, "%ld", + (WCC != NULL)? WCC->nonce:0); } -void tmplput_current_user(StrBuf * Target, WCTemplputParams * TP) { +void tmplput_current_user(StrBuf *Target, WCTemplputParams *TP) +{ StrBufAppendTemplate(Target, TP, WC->wc_fullname, 0); } -void Header_HandleContentLength(StrBuf * Line, ParsedHttpHdrs * hdr) { +void Header_HandleContentLength(StrBuf *Line, ParsedHttpHdrs *hdr) +{ hdr->HR.ContentLength = StrToi(Line); } -void Header_HandleContentType(StrBuf * Line, ParsedHttpHdrs * hdr) { +void Header_HandleContentType(StrBuf *Line, ParsedHttpHdrs *hdr) +{ hdr->HR.ContentType = Line; } -void Header_HandleHost(StrBuf * Line, ParsedHttpHdrs * hdr) { +void Header_HandleHost(StrBuf *Line, ParsedHttpHdrs *hdr) +{ if (hdr->HostHeader != NULL) { FreeStrBuf(&hdr->HostHeader); } hdr->HostHeader = NewStrBuf(); - StrBufAppendPrintf(hdr->HostHeader, "%s://", (is_https ? "https" : "http")); + StrBufAppendPrintf(hdr->HostHeader, "%s://", (is_https ? "https" : "http") ); StrBufAppendBuf(hdr->HostHeader, Line, 0); } -void Header_HandleXFFHost(StrBuf * Line, ParsedHttpHdrs * hdr) { - if (!follow_xff) - return; +void Header_HandleXFFHost(StrBuf *Line, ParsedHttpHdrs *hdr) +{ + if (!follow_xff) return; if (hdr->HostHeader != NULL) { FreeStrBuf(&hdr->HostHeader); @@ -670,7 +697,8 @@ void Header_HandleXFFHost(StrBuf * Line, ParsedHttpHdrs * hdr) { } -void Header_HandleXFF(StrBuf * Line, ParsedHttpHdrs * hdr) { +void Header_HandleXFF(StrBuf *Line, ParsedHttpHdrs *hdr) +{ hdr->HR.browser_host = Line; while (StrBufNum_tokens(hdr->HR.browser_host, ',') > 1) { @@ -679,11 +707,13 @@ void Header_HandleXFF(StrBuf * Line, ParsedHttpHdrs * hdr) { StrBufTrim(hdr->HR.browser_host); } -void Header_HandleIfModSince(StrBuf * Line, ParsedHttpHdrs * hdr) { +void Header_HandleIfModSince(StrBuf *Line, ParsedHttpHdrs *hdr) +{ hdr->HR.if_modified_since = httpdate_to_timestamp(Line); } -void Header_HandleAcceptEncoding(StrBuf * Line, ParsedHttpHdrs * hdr) { +void Header_HandleAcceptEncoding(StrBuf *Line, ParsedHttpHdrs *hdr) +{ /* * Can we compress? */ @@ -692,13 +722,14 @@ void Header_HandleAcceptEncoding(StrBuf * Line, ParsedHttpHdrs * hdr) { } } -void Header_HandleContentRange(StrBuf * Line, ParsedHttpHdrs * hdr) { +void Header_HandleContentRange(StrBuf *Line, ParsedHttpHdrs *hdr) +{ const char *PRange = ChrPtr(Line); while ((*PRange != '=') && (*PRange != '\0')) - PRange++; + PRange ++; if (*PRange == '=') - PRange++; + PRange ++; if ((*PRange == '\0')) return; hdr->HaveRange = 1; @@ -708,7 +739,7 @@ void Header_HandleContentRange(StrBuf * Line, ParsedHttpHdrs * hdr) { PRange++; if (*PRange == '-') - PRange++; + PRange ++; if ((*PRange == '\0')) hdr->RangeTil = -1; else @@ -728,7 +759,10 @@ const char *ReqStrs[eNONE] = { "REPORT" }; -void ServerStartModule_CONTEXT(void) { +void +ServerStartModule_CONTEXT +(void) +{ long *v; HttpReqTypes = NewHash(1, NULL); HttpHeaderHandler = NewHash(1, NULL); @@ -774,26 +808,33 @@ void ServerStartModule_CONTEXT(void) { Put(HttpReqTypes, HKEY("REPORT"), v, NULL); } -void ServerShutdownModule_CONTEXT(void) { +void +ServerShutdownModule_CONTEXT +(void) +{ DeleteHash(&HttpReqTypes); DeleteHash(&HttpHeaderHandler); } -void RegisterHeaderHandler(const char *Name, long Len, Header_Evaluator F) { +void RegisterHeaderHandler(const char *Name, long Len, Header_Evaluator F) +{ OneHttpHeader *pHdr; - pHdr = (OneHttpHeader *) malloc(sizeof(OneHttpHeader)); + pHdr = (OneHttpHeader*) malloc(sizeof(OneHttpHeader)); memset(pHdr, 0, sizeof(OneHttpHeader)); pHdr->H = F; Put(HttpHeaderHandler, Name, Len, pHdr, DestroyHttpHeaderHandler); } -void InitModule_CONTEXT(void) { +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... */ - RegisterHeaderHandler(HKEY("X-REAL-IP"), Header_HandleXFFHost); /* NGinX way... */ + 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); @@ -802,27 +843,32 @@ void InitModule_CONTEXT(void) { 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); - + 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 */ + 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) { +void +HttpNewModule_CONTEXT +(ParsedHttpHdrs *httpreq) +{ httpreq->PlainArgs = NewStrBufPlain(NULL, SIZ); httpreq->this_page = NewStrBufPlain(NULL, SIZ); } -void HttpDetachModule_CONTEXT(ParsedHttpHdrs * httpreq) { +void +HttpDetachModule_CONTEXT +(ParsedHttpHdrs *httpreq) +{ FlushStrBuf(httpreq->PlainArgs); FlushStrBuf(httpreq->HostHeader); FlushStrBuf(httpreq->this_page); @@ -831,7 +877,10 @@ void HttpDetachModule_CONTEXT(ParsedHttpHdrs * httpreq) { memset(&httpreq->HR, 0, sizeof(HdrRefs)); } -void HttpDestroyModule_CONTEXT(ParsedHttpHdrs * httpreq) { +void +HttpDestroyModule_CONTEXT +(ParsedHttpHdrs *httpreq) +{ FreeStrBuf(&httpreq->this_page); FreeStrBuf(&httpreq->PlainArgs); FreeStrBuf(&httpreq->this_page);