* 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"
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;
wcsession *sptr;
for (sptr = SessionList; sptr != NULL; sptr = sptr->next) {
- sptr->killthis = 1;
+ sptr->killthis = 1;
}
}
/* Kill idle sessions */
if ((time(NULL) - (sptr->lastreq)) > (time_t) WEBCIT_TIMEOUT) {
- syslog(3, "Timeout session %d\n", sptr->wc_session);
+ syslog(3, "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(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_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(3, "%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)
+ ) {
+ 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)
+ ) {
+ 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(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);
pthread_setspecific(MyConKey, (void *)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 HTTP/1.0", ChrPtr(Buf));
+ syslog(LOG_DEBUG, "Replacing with: %s", ChrPtr(NewLine));
+ return_value = ReadHttpSubject(Hdr, NewLine, Buf);
+ FreeStrBuf(&NewLine);
+ return return_value;
}
return 0;
memset(pHdr, 0, sizeof(OneHttpHeader));
pHdr->Val = Line;
Put(Hdr->HTTPHeaders, HKEY("GET /"), pHdr, DestroyHttpHeaderHandler);
- syslog(9, "%s\n", ChrPtr(Line));
+ syslog(9, "%s", ChrPtr(Line));
isbogus = ReadHttpSubject(Hdr, Line, HeaderName);
if (isbogus) break;
continue;
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(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],
/* How long did this transaction take? */
gettimeofday(&tx_finish, NULL);
- syslog(9, "HTTP: 200 [%ld.%06ld] %s %s \n",
+ 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],
}
/*
- * 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) {
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;
}
/*
TheSession->lastreq = time(NULL); /* log */
TheSession->Hdr = Hdr;
+ /*
+ * 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(); /* do transaction */
+ session_loop();
/* How long did this transaction take? */
gettimeofday(&tx_finish, NULL);
- syslog(9, "HTTP: 200 [%ld.%06ld] %s %s \n",
+ 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],
* spider crawls the site without using cookies.
*/
if ((session_may_be_reused) && (!WC->logged_in)) {
- WC->wc_session = 0;
+ WC->wc_session = 0; /* flag as available for re-use */
+ TheSession->selected_language = 0; /* clear any non-default language setting */
}
TheSession->Hdr = NULL;
"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