/*
- * context_loop.c
+ * $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.
*
- * $Id$
*/
#include <ctype.h>
void do_housekeeping(void)
{
- struct wcsession *sptr, *ss, *session_to_kill;
+ struct wcsession *sptr, *ss;
+ struct wcsession *sessions_to_kill = NULL;
int num_sessions = 0;
static int num_threads = MIN_WORKER_THREADS;
- do {
- session_to_kill = NULL;
- pthread_mutex_lock(&SessionListMutex);
- num_sessions = 0;
- for (sptr = SessionList; sptr != NULL; sptr = sptr->next) {
- ++num_sessions;
-
- /* Kill idle sessions */
- if ((time(NULL) - (sptr->lastreq)) >
- (time_t) WEBCIT_TIMEOUT) {
- sptr->killthis = 1;
- }
-
- /* Remove sessions flagged for kill */
- if (sptr->killthis) {
-
- lprintf(3, "Destroying session %d\n",
- sptr->wc_session);
+ /*
+ * Lock the session list, moving any candidates for euthanasia into
+ * a separate list.
+ */
+ pthread_mutex_lock(&SessionListMutex);
+ num_sessions = 0;
+ for (sptr = SessionList; sptr != NULL; sptr = sptr->next) {
+ ++num_sessions;
+
+ /* Kill idle sessions */
+ if ((time(NULL) - (sptr->lastreq)) >
+ (time_t) WEBCIT_TIMEOUT) {
+ sptr->killthis = 1;
+ }
- /* remove session from linked list */
- if (sptr == SessionList) {
- SessionList = SessionList->next;
- }
- else for (ss=SessionList;ss!=NULL;ss=ss->next) {
- if (ss->next == sptr) {
- ss->next = ss->next->next;
- }
- }
+ /* Remove sessions flagged for kill */
+ if (sptr->killthis) {
- session_to_kill = sptr;
- goto BREAKOUT;
+ /* remove session from linked list */
+ if (sptr == SessionList) {
+ SessionList = SessionList->next;
}
- }
-BREAKOUT: pthread_mutex_unlock(&SessionListMutex);
-
- if (session_to_kill != NULL) {
- pthread_mutex_lock(&session_to_kill->SessionMutex);
- close(session_to_kill->serv_sock);
- close(session_to_kill->chat_sock);
- if (session_to_kill->preferences != NULL) {
- free(session_to_kill->preferences);
+ else for (ss=SessionList;ss!=NULL;ss=ss->next) {
+ if (ss->next == sptr) {
+ ss->next = ss->next->next;
+ }
}
- free_attachments(session_to_kill);
- pthread_mutex_unlock(&session_to_kill->SessionMutex);
- free(session_to_kill);
+
+ sptr->next = sessions_to_kill;
+ sessions_to_kill = sptr;
}
+ }
+ pthread_mutex_unlock(&SessionListMutex);
- } while (session_to_kill != NULL);
+ /*
+ * 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);
+ close(sessions_to_kill->serv_sock);
+ close(sessions_to_kill->chat_sock);
+ if (sessions_to_kill->preferences != NULL) {
+ free(sessions_to_kill->preferences);
+ }
+ free_attachments(sessions_to_kill);
+ pthread_mutex_unlock(&sessions_to_kill->SessionMutex);
+ sptr = sessions_to_kill->next;
+ free(sessions_to_kill);
+ sessions_to_kill = sptr;
+ --num_sessions;
+ }
/*
- * See if we need more worker threads
+ * 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) ) {
a = client_gets(sock, buf);
if (a<1) return(-1);
} else {
- strcpy(buf, hold);
+ safestrncpy(buf, hold, SIZ);
}
strcpy(hold, "");
char buf[SIZ], hold[SIZ];
int desired_session = 0;
int got_cookie = 0;
+ int gzip_ok = 0;
struct wcsession *TheSession, *sptr;
- int outside_frameset_allowed = 0;
+ char httpauth_string[SIZ];
+ char httpauth_user[SIZ];
+ char httpauth_pass[SIZ];
+
+ strcpy(httpauth_string, "");
+ strcpy(httpauth_user, DEFAULT_HTTPAUTH_USER);
+ strcpy(httpauth_pass, DEFAULT_HTTPAUTH_PASS);
/*
* Find out what it is that the web browser is asking for
do {
if (req_gets(sock, buf, hold) < 0) return;
+ /*
+ * Can we compress?
+ */
+ if (!strncasecmp(buf, "Accept-encoding:", 16)) {
+ if (strstr(&buf[16], "gzip")) {
+ gzip_ok = 1;
+ }
+ }
+
+ /*
+ * Browser-based sessions use cookies for session authentication
+ */
if (!strncasecmp(buf, "Cookie: webcit=", 15)) {
cookie_to_stuff(&buf[15], &desired_session,
- NULL, NULL, NULL);
+ NULL, 0, NULL, 0, NULL, 0);
got_cookie = 1;
}
+ /*
+ * GroupDAV-based sessions use HTTP authentication
+ */
+ if (!strncasecmp(buf, "Authorization: Basic ", 21)) {
+ CtdlDecodeBase64(httpauth_string, &buf[21], strlen(&buf[21]));
+ extract_token(httpauth_user, httpauth_string, 0, ':', sizeof httpauth_user);
+ extract_token(httpauth_pass, httpauth_string, 1, ':', sizeof httpauth_pass);
+ }
+
+ /*
+ * Read in the request
+ */
hptr = (struct httprequest *)
malloc(sizeof(struct httprequest));
if (req == NULL)
hptr->next = NULL;
last = hptr;
- strcpy(hptr->line, buf);
+ safestrncpy(hptr->line, buf, sizeof hptr->line);
} while (strlen(buf) > 0);
- strcpy(buf, req->line);
+ safestrncpy(buf, req->line, sizeof buf);
lprintf(5, "HTTP: %s\n", buf);
/* Check for bogus requests */
* set. If there isn't, the client browser has cookies turned off
* (or doesn't support them) and we have to barf & bail.
*/
- if (!strncasecmp(buf, "GET ", 4)) strcpy(buf, &buf[4]);
- else if (!strncasecmp(buf, "HEAD ", 5)) strcpy(buf, &buf[5]);
- else if (!strncasecmp(buf, "POST ", 5)) strcpy(buf, &buf[5]);
+ remove_token(buf, 0, ' ');
if (buf[1]==' ') buf[1]=0;
/*
strcpy(req->line, "GET /static/robots.txt"
"?force_close_session=yes HTTP/1.0");
}
- if (!strncasecmp(buf, "/favicon.ico", 12)) {
+ else if (!strncasecmp(buf, "/favicon.ico", 12)) {
strcpy(req->line, "GET /static/favicon.ico");
}
&& (strncasecmp(buf, "/listsub", 8))
&& (strncasecmp(buf, "/freebusy", 9))
&& (strncasecmp(buf, "/do_logout", 10))
+ && (strncasecmp(buf, "/groupdav", 9))
&& (got_cookie == 0)) {
strcpy(req->line, "GET /static/nocookies.html"
"?force_close_session=yes HTTP/1.0");
}
- /* These are the URL's which may be executed outside of the
- * main frameset. If it's not one of these, the page will
- * need JavaScript added to force the frameset to reload.
- */
- if ( (!strcasecmp(buf, "/"))
- || (!strcasecmp(buf, "/static/mainframeset.html"))
- || (!strcasecmp(buf, "/static/robots.txt"))
- || (!strncasecmp(buf, "/do_welcome", 11))
- || (!strncasecmp(buf, "/do_logout", 10))
- || (!strncasecmp(buf, "/page_popup", 11))
- || (!strncasecmp(buf, "/page_user", 10)) /* Sometimes this is wrong */
- || (!strncasecmp(buf, "/listsub", 8))
- || (!strncasecmp(buf, "/freebusy", 9))
- || (!strncasecmp(buf, "/termquit", 9)) ) {
- outside_frameset_allowed = 1;
- }
- else {
- outside_frameset_allowed = 0;
- }
-
/*
- * See if there's an existing session open with the desired ID
+ * See if there's an existing session open with the desired ID or user/pass
*/
TheSession = NULL;
- if (desired_session != 0) {
+
+ if (TheSession == NULL) {
pthread_mutex_lock(&SessionListMutex);
for (sptr = SessionList; sptr != NULL; sptr = sptr->next) {
- if (sptr->wc_session == desired_session) {
+
+ /* If HTTP-AUTH, look for a session with matching credentials */
+ if ( (strlen(httpauth_user) > 0)
+ &&(!strcasecmp(sptr->httpauth_user, httpauth_user))
+ &&(!strcasecmp(sptr->httpauth_pass, httpauth_pass)) ) {
+ TheSession = sptr;
+ }
+
+ /* If cookie-session, look for a session with matching session ID */
+ if ( (desired_session != 0) && (sptr->wc_session == desired_session)) {
TheSession = sptr;
}
+
}
pthread_mutex_unlock(&SessionListMutex);
}
TheSession->serv_sock = (-1);
TheSession->chat_sock = (-1);
TheSession->wc_session = GenerateSessionID();
+ strcpy(TheSession->httpauth_user, httpauth_user);
+ strcpy(TheSession->httpauth_pass, httpauth_pass);
pthread_mutex_init(&TheSession->SessionMutex, NULL);
pthread_mutex_lock(&SessionListMutex);
pthread_setspecific(MyConKey, (void *)TheSession);
TheSession->http_sock = sock;
TheSession->lastreq = time(NULL); /* log */
- TheSession->outside_frameset_allowed = outside_frameset_allowed;
- session_loop(req); /* do transaction */
+ TheSession->gzip_ok = gzip_ok;
+ session_loop(req); /* do transaction */
pthread_mutex_unlock(&TheSession->SessionMutex); /* unbind */
/* Free the request buffer */
free(req);
req = hptr;
}
+
+ /* Free up any session-local substitution variables which
+ * were set during this transaction
+ */
+ clear_local_substs();
}