* 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
+ * 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 as
- * published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
+ * 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.
- *
- * 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"
-#include "webserver.h"
+
#include "modules_init.h"
/* Only one thread may manipulate SessionList at a time... */
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;
/* 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);
wcsession *sptr;
for (sptr = SessionList; sptr != NULL; sptr = sptr->next) {
- sptr->killthis = 1;
+ sptr->killthis = 1;
}
}
{
wcsession *sptr, *ss;
wcsession *sessions_to_kill = NULL;
+ time_t the_time;
/*
* 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)
+ the_time = time(NULL);
/* Kill idle sessions */
- if ((time(NULL) - (sptr->lastreq)) > (time_t) WEBCIT_TIMEOUT) {
- syslog(3, "Timeout session %d\n", sptr->wc_session);
+ if ((sptr->inuse == 0) &&
+ ((the_time - (sptr->lastreq)) > (time_t) WEBCIT_TIMEOUT))
+ {
+ syslog(LOG_DEBUG, "Timeout session %d", sptr->wc_session);
sptr->killthis = 1;
}
* Now free up and destroy the culled sessions.
*/
while (sessions_to_kill != NULL) {
- syslog(3, "Destroying session %d\n", 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;
(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",
+ syslog(LOG_DEBUG, "%d of %d threads are executing. Adding another worker thread.",
num_threads_executing,
num_threads_existing
);
switch (Hdr->HR.got_auth)
{
case AUTH_BASIC:
- if ( (Hdr->HR.SessionKey != sptr->SessionKey))
- continue;
- if ((!strcasecmp(ChrPtr(Hdr->c_username), ChrPtr(sptr->wc_username))) &&
- (!strcasecmp(ChrPtr(Hdr->c_password), ChrPtr(sptr->wc_password))) ) {
+ 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;
}
- if (TheSession == NULL)
- syslog(1, "found sessionkey [%d], but credentials for [%s|%s] didn't match\n",
- 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)) {
+ 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;
case NO_AUTH:
/* Any unbound session is a candidate */
if ( (sptr->wc_session == 0) && (sptr->inuse == 0) ) {
+ if (verbose)
+ syslog(LOG_DEBUG, "Reusing an unbound session");
TheSession = sptr;
}
break;
}
}
CtdlLogResult(pthread_mutex_unlock(ListMutex));
- if (TheSession == NULL)
- syslog(1, "didn't find sessionkey [%d] for user [%s]\n",
- Hdr->HR.SessionKey, ChrPtr(Hdr->c_username));
+ if (TheSession == NULL) {
+ syslog(LOG_DEBUG, "No existing session was matched");
+ }
return TheSession;
}
TheSession = (wcsession *) malloc(sizeof(wcsession));
memset(TheSession, 0, sizeof(wcsession));
TheSession->Hdr = Hdr;
- TheSession->SessionKey = Hdr->HR.SessionKey;
TheSession->serv_sock = (-1);
+ TheSession->lastreq = time(NULL);;
pthread_setspecific(MyConKey, (void *)TheSession);
*/
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);
void *vLine, *vHandler;
const char *Pos = NULL;
-
Hdr->HR.ReqLine = Line;
/* The requesttype... GET, POST... */
StrBufExtract_token(Buf, Hdr->HR.ReqLine, 0, ' ');
}
if (Hdr->HR.Handler != NULL) {
- if ((Hdr->HR.Handler->Flags & BOGUS) != 0)
+ if ((Hdr->HR.Handler->Flags & BOGUS) != 0) {
return 1;
+ }
Hdr->HR.DontNeedAuth = (
((Hdr->HR.Handler->Flags & ISSTATIC) != 0) ||
((Hdr->HR.Handler->Flags & ANONYMOUS) != 0)
- );
+ );
}
else {
- Hdr->HR.DontNeedAuth = 1; /* Flat request? show him the login screen... */
+ /* 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?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;
}
return 0;
}
-int AnalyseHeaders(ParsedHttpHdrs *Hdr)
-{
+int AnalyseHeaders(ParsedHttpHdrs *Hdr) {
OneHttpHeader *pHdr;
void *vHdr;
long HKLen;
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;
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);
memset(pHdr, 0, sizeof(OneHttpHeader));
pHdr->Val = Line;
Put(Hdr->HTTPHeaders, HKEY("GET /"), pHdr, DestroyHttpHeaderHandler);
- syslog(9, "%s\n", 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);
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;
* 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 */
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, 1, NULL, Hdr, NULL);
-
do_404();
-
- syslog(9, "HTTP: 404 [%ld.%06ld] %s %s \n",
+ 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],
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);
/* How long did this transaction take? */
gettimeofday(&tx_finish, NULL);
- 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)
+ 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);
}
/*
- * 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 = FindSession(&SessionList, Hdr, &SessionListMutex);
/*
- * Create a new session if we have to
+ * If there were no qualifying sessions, then create a new one.
*/
- if (TheSession == NULL) {
+ if ((TheSession == NULL) || (TheSession->killthis != 0)) {
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) {
- syslog(9, "Session cookie requests language '%s'\n", ChrPtr(Hdr->c_language));
- set_selected_language(ChrPtr(Hdr->c_language));
- go_selected_language();
- }
+ /*
+ * 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)
+ ) {
+ syslog(LOG_DEBUG, "http-auth required but not provided");
+ OverrideRequest(Hdr, HKEY("GET /401 HTTP/1.0"));
+ Hdr->HR.prohibit_caching = 1;
}
/*
/*
* 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) {
+ if (verbose) {
+ 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(); /* do transaction */
+ session_loop();
/* How long did this transaction take? */
gettimeofday(&tx_finish, NULL);
- 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)
- );
-
+ 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,
* 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;
+ 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;
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",
"DELETE",
"HEAD",
"MOVE",
- "COPY"
+ "COPY",
+ "REPORT"
};
void
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
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... */
projects / citadel.git / blobdiff