/* Remove sessions flagged for kill */
if (sptr->killthis) {
+ lprintf(3, "Destroying session\n");
+
/* remove session from linked list */
if (sptr == SessionList) {
SessionList = SessionList->next;
if (session_to_kill != NULL) {
pthread_mutex_lock(&session_to_kill->SessionMutex);
close(session_to_kill->serv_sock);
+ if (session_to_kill->preferences != NULL) {
+ free(session_to_kill->preferences);
+ }
pthread_mutex_unlock(&session_to_kill->SessionMutex);
free(session_to_kill);
}
return(0);
}
}
+
return(0);
}
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;
struct wcsession *TheSession, *sptr;
+ char enc[SIZ];
+ char encodings[SIZ];
+ int gzip = 0;
+ int i;
/*
* Find out what it is that the web browser is asking for
memset(hold, 0, sizeof(hold));
do {
if (req_gets(sock, buf, hold) < 0) return;
+
if (!strncasecmp(buf, "Cookie: webcit=", 15)) {
cookie_to_stuff(&buf[15], &desired_session,
NULL, NULL, NULL);
got_cookie = 1;
}
+#ifdef WITH_ZLIB
+ if (!strncasecmp(buf, "Accept-encoding: ", 17)) {
+ extract_token(encodings, &buf[17], 0, ';');
+ for (i=0; i<num_tokens(encodings, ','); ++i) {
+ extract_token(enc, encodings, i, ',');
+ if (!strcasecmp(enc, "gzip")) {
+ gzip = 1;
+ }
+ }
+ }
+#endif
+
hptr = (struct httprequest *)
malloc(sizeof(struct httprequest));
if (req == NULL)
} while (strlen(buf) > 0);
+ strcpy(buf, req->line);
+ 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);
- fprintf(stderr, "%s\n", buf);
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]);
if (buf[1]==' ') buf[1]=0;
/*
}
/* Do the non-root-cookie check now. */
- else if ( (strcmp(buf, "/")) && (got_cookie == 0)) {
+ else if ( (strcmp(buf, "/"))
+ && (strncasecmp(buf, "/listsub", 8))
+ && (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
*/
* Create a new session if we have to
*/
if (TheSession == NULL) {
- fprintf(stderr, "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));
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 and perform the transaction
*/
pthread_setspecific(MyConKey, (void *)TheSession);
TheSession->http_sock = sock;
TheSession->lastreq = time(NULL); /* log */
- session_loop(req); /* perform the requested transaction */
+ session_loop(req, gzip); /* perform the requested 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;