/*
- * context_loop.c
+ * $Id$
*
* This is the other half of the webserver. It handles the task of hooking
- * up HTTP requests with the session they belong to, using HTTP cookies to
+ * 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 spawned.
+ * active session, a new session is started.
*
- * $Id$
*/
#include <ctype.h>
pthread_key_t MyConKey; /* TSD key for MySession() */
+
+void free_attachments(struct wcsession *sess) {
+ struct wc_attachment *att;
+
+ while (sess->first_attachment != NULL) {
+ att = sess->first_attachment;
+ sess->first_attachment = sess->first_attachment->next;
+ free(att->data);
+ free(att);
+ }
+}
+
+
void do_housekeeping(void)
{
- struct wcsession *sptr;
+ struct wcsession *sptr, *ss;
+ struct 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);
-
- /* Kill idle sessions */
+ num_sessions = 0;
for (sptr = SessionList; sptr != NULL; sptr = sptr->next) {
- if ((time(NULL) - (sptr->lastreq)) > (time_t) WEBCIT_TIMEOUT) {
- /* FIX do something here */
+ ++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) {
+
+ /* 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;
+ }
+ }
+
+ sptr->next = sessions_to_kill;
+ sessions_to_kill = sptr;
+ }
+ }
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);
+ 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;
+ }
+
+ /*
+ * 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) ) {
+ spawn_another_worker_thread();
+ ++num_threads;
+ lprintf(3, "There are %d sessions and %d threads active.\n",
+ num_sessions, num_threads);
+ }
}
void housekeeping_loop(void)
{
while (1) {
- sleep(HOUSEKEEPING);
+ sleeeeeeeeeep(HOUSEKEEPING);
do_housekeeping();
}
}
* Generate a unique WebCit session ID (which is not the same thing as the
* Citadel session ID).
*
- * FIX ... we really should check to make sure we're generating a truly
- * unique session ID by traversing the SessionList.
+ * FIXME ... ensure that session number is truly unique
*
*/
int GenerateSessionID(void)
}
-void gets0(int fd, char buf[])
-{
-
- buf[0] = 0;
- do {
- buf[strlen(buf) + 1] = 0;
- read(fd, &buf[strlen(buf)], 1);
- } while (buf[strlen(buf) - 1] >= 32);
- buf[strlen(buf) - 1] = 0;
-}
-
/*
* Collapse multiple cookies on one line
*/
-void req_gets(int sock, char *buf, char *hold)
+int req_gets(int sock, char *buf, char *hold)
{
int a;
if (strlen(hold) == 0) {
- client_gets(sock, buf);
+ strcpy(buf, "");
+ a = client_gets(sock, buf);
+ if (a<1) return(-1);
} else {
- strcpy(buf, hold);
+ safestrncpy(buf, hold, SIZ);
}
strcpy(hold, "");
buf[a] = 0;
while (isspace(hold[8]))
strcpy(&hold[8], &hold[9]);
- return;
+ return(0);
}
}
+
+ return(0);
}
/*
* http://www.apache.org/docs/misc/fin_wait_2.html for rationale
*/
-static int lingering_close(int fd)
+int lingering_close(int fd)
{
- char buf[256];
+ char buf[SIZ];
int i;
fd_set set;
struct timeval tv, start;
+/*
+ * Check for bogus requests coming from (for example) brain-dead
+ * Windoze boxes that are infected with the latest worm-of-the-week.
+ * If we detect one of these, bail out without bothering our Citadel
+ * server.
+ */
+int is_bogus(char *http_cmd) {
+
+ if (!strncasecmp(http_cmd, "GET /scripts/root.exe", 21)) return(1);
+ if (!strncasecmp(http_cmd, "GET /c/winnt", 12)) return(2);
+ if (!strncasecmp(http_cmd, "GET /MSADC/", 11)) return(3);
+
+ return(0); /* probably ok */
+}
+
+
/*
* This loop gets called once for every HTTP connection made to WebCit. At
struct httprequest *req = NULL;
struct httprequest *last = NULL;
struct httprequest *hptr;
- char buf[256], hold[256];
+ char buf[SIZ], hold[SIZ];
int desired_session = 0;
int got_cookie = 0;
+ int gzip_ok = 0;
struct wcsession *TheSession, *sptr;
- int CloseSession = 0;
+ char httpauth_string[SIZ];
+ char httpauth_user[SIZ];
+ char httpauth_pass[SIZ];
-
- fprintf(stderr, "Reading request from socket %d\n", sock);
+ 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
*/
+ memset(hold, 0, sizeof(hold));
do {
- req_gets(sock, buf, hold);
+ 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);
+ safestrncpy(buf, req->line, sizeof buf);
+ lprintf(5, "HTTP: %s\n", buf);
+
+ /* Check for bogus requests */
+ if (is_bogus(buf)) goto bail;
/*
* If requesting a non-root page, there should already be a cookie
* set. If there isn't, the client browser has cookies turned off
* (or doesn't support them) and we have to barf & bail.
*/
- strcpy(buf, req->line);
- if (!strncasecmp(buf, "GET ", 4)) strcpy(buf, &buf[4]);
- else if (!strncasecmp(buf, "HEAD ", 5)) strcpy(buf, &buf[5]);
+ remove_token(buf, 0, ' ');
if (buf[1]==' ') buf[1]=0;
/*
* While we're at it, gracefully handle requests for the
- * robots.txt file...
+ * robots.txt and favicon.ico files.
*/
if (!strncasecmp(buf, "/robots.txt", 11)) {
- strcpy(req->line, "GET /static/robots.txt HTTP/1.0");
+ strcpy(req->line, "GET /static/robots.txt"
+ "?force_close_session=yes HTTP/1.0");
}
-
- /* Do the non-root-cookie check now. */
- else if ( (strcmp(buf, "/")) && (got_cookie == 0)) {
- strcpy(req->line, "GET /static/nocookies.html HTTP/1.0");
+ else if (!strncasecmp(buf, "/favicon.ico", 12)) {
+ strcpy(req->line, "GET /static/favicon.ico");
}
-
+ /* These are the URL's which may be executed without a
+ * session cookie already set. If it's not one of these,
+ * force the session to close because cookies are
+ * probably disabled on the client browser.
+ */
+ else if ( (strcmp(buf, "/"))
+ && (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");
+ }
/*
- * 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);
}
* Create a new session if we have to
*/
if (TheSession == NULL) {
- printf("Creating a new session\n");
+ lprintf(3, "Creating a new session\n");
TheSession = (struct wcsession *)
malloc(sizeof(struct wcsession));
memset(TheSession, 0, sizeof(struct wcsession));
+ 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_mutex_unlock(&SessionListMutex);
}
-
/*
- *
- * FIX ... check session integrity here before continuing
- *
+ * A future improvement might be to check the session integrity
+ * at this point before continuing.
*/
-
-
/*
- * Bind to the session
+ * Bind to the session and perform the transaction
*/
- pthread_mutex_lock(&TheSession->SessionMutex);
+ pthread_mutex_lock(&TheSession->SessionMutex); /* bind */
pthread_setspecific(MyConKey, (void *)TheSession);
- TheSession->lastreq = time(NULL);
TheSession->http_sock = sock;
-
- /*
- * Perform the WebCit transaction
- */
- fprintf(stderr, "Transaction: %s\n", req->line);
- session_loop(req);
- fprintf(stderr, "Returned from transaction loop\n");
-
- /*
- * If the last response included a "close session" directive,
- * remove the context now.
- */
- if (CloseSession) {
- /* FIX remove_session(TheSession, 1); */
- } else {
-
- pthread_mutex_unlock(&TheSession->SessionMutex);
- }
+ TheSession->lastreq = time(NULL); /* log */
+ TheSession->gzip_ok = gzip_ok;
+ session_loop(req); /* do transaction */
+ pthread_mutex_unlock(&TheSession->SessionMutex); /* unbind */
/* Free the request buffer */
- while (req != NULL) {
+bail: while (req != NULL) {
hptr = req->next;
free(req);
req = hptr;
}
- /*
- * Now our HTTP connection is done. Close the socket and exit this
- * function, so the worker thread can handle a new HTTP connection.
+ /* Free up any session-local substitution variables which
+ * were set during this transaction
*/
- printf(" Closing socket %d ... ret=%d\n", sock,
- lingering_close(sock));
- return;
+ clear_local_substs();
}
projects / citadel.git / blobdiff