return ++seq;
}
-
-/*
- * lingering_close() a`la Apache. see
- * http://www.apache.org/docs/misc/fin_wait_2.html for rationale
- */
-int lingering_close(int fd)
+wcsession *FindSession(wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t *ListMutex)
{
- char buf[SIZ];
- int i;
- fd_set set;
- struct timeval tv, start;
+ wcsession *sptr = NULL;
+ wcsession *TheSession = NULL;
+
+ if (Hdr->HR.got_auth == AUTH_BASIC) {
+ GetAuthBasic(Hdr);
+ }
- gettimeofday(&start, NULL);
- shutdown(fd, 1);
- do {
- do {
- gettimeofday(&tv, NULL);
- tv.tv_sec = SLEEPING - (tv.tv_sec - start.tv_sec);
- tv.tv_usec = start.tv_usec - tv.tv_usec;
- if (tv.tv_usec < 0) {
- tv.tv_sec--;
- tv.tv_usec += 1000000;
+ pthread_mutex_lock(ListMutex);
+ for (sptr = *wclist; ((sptr != NULL) && (TheSession == NULL)); sptr = sptr->next) {
+
+ /* If HTTP-AUTH, look for a session with matching credentials */
+ 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))) ) {
+ TheSession = sptr;
}
- FD_ZERO(&set);
- FD_SET(fd, &set);
- i = select(fd + 1, &set, NULL, NULL, &tv);
- } while (i == -1 && errno == EINTR);
-
- if (i <= 0)
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)) {
+ TheSession = sptr;
+ }
+ break;
+ case NO_AUTH:
+ break;
+ }
+ }
+ pthread_mutex_unlock(ListMutex);
+ return TheSession;
+}
- i = read(fd, buf, sizeof buf);
- } while (i != 0 && (i != -1 || errno == EINTR));
+wcsession *CreateSession(int Lockable, wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t *ListMutex)
+{
+ wcsession *TheSession;
+ lprintf(3, "Creating a new session\n");
+ TheSession = (wcsession *) malloc(sizeof(wcsession));
+ memset(TheSession, 0, sizeof(wcsession));
+ TheSession->Hdr = Hdr;
+ TheSession->SessionKey = Hdr->HR.SessionKey;
+ TheSession->serv_sock = (-1);
+ TheSession->chat_sock = (-1);
+ TheSession->is_mobile = -1;
- return close(fd);
-}
+ pthread_setspecific(MyConKey, (void *)TheSession);
+
+ /* If we're recreating a session that expired, it's best to give it the same
+ * session number that it had before. The client browser ought to pick up
+ * the new session number and start using it, but in some rare situations it
+ * doesn't, and that's a Bad Thing because it causes lots of spurious sessions
+ * to get created.
+ */
+ if (Hdr->HR.desired_session == 0) {
+ TheSession->wc_session = GenerateSessionID();
+ }
+ else {
+ TheSession->wc_session = Hdr->HR.desired_session;
+ }
+
+ session_new_modules(TheSession);
+ if (Lockable) {
+ pthread_mutex_init(&TheSession->SessionMutex, NULL);
+
+ if (ListMutex != NULL)
+ pthread_mutex_lock(ListMutex);
+ if (wclist != NULL) {
+ TheSession->nonce = rand();
+ TheSession->next = *wclist;
+ *wclist = TheSession;
+ }
+ if (ListMutex != NULL)
+ pthread_mutex_unlock(ListMutex);
+ }
+ return TheSession;
+}
/**
return 0;
}
-
-
-/*
- * Look for commonly-found probes of malware such as worms, viruses, trojans, and Microsoft Office.
- * Short-circuit these requests so we don't have to send them through the full processing loop.
- */
-int is_bogus(StrBuf *http_cmd) {////TODO!
- const char *url;
- int i, max;
- const char *bogus_prefixes[] = {
- "/scripts/root.exe", /* Worms and trojans and viruses, oh my! */
- "/c/winnt",
- "/MSADC/",
- "/_vti", /* Broken Microsoft DAV implementation */
- "/MSOffice", /* Stoopid MSOffice thinks everyone is IIS */
- "/nonexistenshit" /* Exploit found in the wild January 2009 */
- };
-
- url = ChrPtr(http_cmd);
- if (IsEmptyStr(url)) return(1);
- ++url;
-
- max = sizeof(bogus_prefixes) / sizeof(char *);
-
- for (i=0; i<max; ++i) {
- if (!strncasecmp(url, bogus_prefixes[i], strlen(bogus_prefixes[i]))) {
- return(2);
- }
- }
-
- return(0); /* probably ok */
+/* If it's a "force 404" situation then display the error and bail. */
+void do_404(void)
+{
+ hprintf("HTTP/1.1 404 Not found\r\n");
+ hprintf("Content-Type: text/plain\r\n");
+ wprintf("Not found\r\n");
+ end_burst();
}
-
int ReadHttpSubject(ParsedHttpHdrs *Hdr, StrBuf *Line, StrBuf *Buf)
{
const char *Args;
const char *Pos = NULL;
- Hdr->ReqLine = Line;
+ Hdr->HR.ReqLine = Line;
/* The requesttype... GET, POST... */
- StrBufExtract_token(Buf, Hdr->ReqLine, 0, ' ');
+ StrBufExtract_token(Buf, Hdr->HR.ReqLine, 0, ' ');
if (GetHash(HttpReqTypes, SKEY(Buf), &vLine) &&
(vLine != NULL))
{
- Hdr->eReqType = *(long*)vLine;
+ Hdr->HR.eReqType = *(long*)vLine;
}
else {
- Hdr->eReqType = eGET;
+ Hdr->HR.eReqType = eGET;
return 1;
}
- StrBufCutLeft(Hdr->ReqLine, StrLength(Buf) + 1);
+ StrBufCutLeft(Hdr->HR.ReqLine, StrLength(Buf) + 1);
/* the HTTP Version... */
- StrBufExtract_token(Buf, Hdr->ReqLine, 1, ' ');
- StrBufCutRight(Hdr->ReqLine, StrLength(Buf) + 1);
- if ((StrLength(Buf) == 0) ||
- is_bogus(Hdr->ReqLine)) {
- Hdr->eReqType = eGET;
+ StrBufExtract_token(Buf, Hdr->HR.ReqLine, 1, ' ');
+ StrBufCutRight(Hdr->HR.ReqLine, StrLength(Buf) + 1);
+
+ if (StrLength(Buf) == 0) {
+ Hdr->HR.eReqType = eGET;
return 1;
}
- Hdr->this_page = NewStrBufDup(Hdr->ReqLine);
+ StrBufAppendBuf(Hdr->this_page, Hdr->HR.ReqLine, 0);
/* chop Filename / query arguments */
- Args = strchr(ChrPtr(Hdr->ReqLine), '?');
+ Args = strchr(ChrPtr(Hdr->HR.ReqLine), '?');
if (Args == NULL) /* whe're not that picky about params... TODO: this will spoil '&' in filenames.*/
- Args = strchr(ChrPtr(Hdr->ReqLine), '&');
+ Args = strchr(ChrPtr(Hdr->HR.ReqLine), '&');
if (Args != NULL) {
Args ++; /* skip the ? */
- Hdr->PlainArgs = NewStrBufPlain(
- Args,
- StrLength(Hdr->ReqLine) -
- (Args - ChrPtr(Hdr->ReqLine)));
- StrBufCutAt(Hdr->ReqLine, 0, Args - 1);
+ StrBufPlain(Hdr->PlainArgs,
+ Args,
+ StrLength(Hdr->HR.ReqLine) -
+ (Args - ChrPtr(Hdr->HR.ReqLine)));
+ StrBufCutAt(Hdr->HR.ReqLine, 0, Args - 1);
} /* don't parse them yet, maybe we don't even care... */
/* now lookup what we are going to do with this... */
/* skip first slash */
- StrBufExtract_NextToken(Buf, Hdr->ReqLine, &Pos, '/');
+ StrBufExtract_NextToken(Buf, Hdr->HR.ReqLine, &Pos, '/');
do {
- StrBufExtract_NextToken(Buf, Hdr->ReqLine, &Pos, '/');
+ StrBufExtract_NextToken(Buf, Hdr->HR.ReqLine, &Pos, '/');
GetHash(HandlerHash, SKEY(Buf), &vHandler),
- Hdr->Handler = (WebcitHandler*) vHandler;
- if (Hdr->Handler == NULL)
- break;
- /* are we about to ignore some prefix like webcit/ ? */
- if ((Hdr->Handler->Flags & URLNAMESPACE) == 0)
+ Hdr->HR.Handler = (WebcitHandler*) vHandler;
+ if (Hdr->HR.Handler == NULL)
break;
+ /*
+ * If the request is prefixed by "/webcit" then chop that off. This
+ * allows a front end web server to forward all /webcit requests to us
+ * while still using the same web server port for other things.
+ */
+ if ((Hdr->HR.Handler->Flags & URLNAMESPACE) != 0)
+ continue;
+ break;
} while (1);
/* remove the handlername from the URL */
if (Pos != NULL) {
- StrBufCutLeft(Hdr->ReqLine,
- Pos - ChrPtr(Hdr->ReqLine));
+ StrBufCutLeft(Hdr->HR.ReqLine,
+ Pos - ChrPtr(Hdr->HR.ReqLine));
+ }
+
+ if (Hdr->HR.Handler != NULL) {
+ 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 (Hdr->Handler == NULL)
- return 1;
-*/
- Hdr->HTTPHeaders = NewHash(1, NULL);
return 0;
}
/*
* Read in the request
*/
-int ReadHTTPRequset (ParsedHttpHdrs *Hdr)
+int ReadHTTPRequest (ParsedHttpHdrs *Hdr)
{
const char *pch, *pchs, *pche;
OneHttpHeader *pHdr;
int isbogus = 0;
HeaderName = NewStrBuf();
- Hdr->ReadBuf = NewStrBuf();
LastLine = NULL;
do {
nLine ++;
- Line = NewStrBuf();
+ Line = NewStrBufPlain(NULL, SIZ / 4);
- if (ClientGetLine(&Hdr->http_sock, Line, Hdr->ReadBuf, &Hdr->Pos) < 0) return 1;
+ if (ClientGetLine(Hdr, Line) < 0) return 1;
if (StrLength(Line) == 0) {
FreeStrBuf(&Line);
continue;
}
if (nLine == 1) {
+ Hdr->HTTPHeaders = NewHash(1, NULL);
+ pHdr = (OneHttpHeader*) malloc(sizeof(OneHttpHeader));
+ memset(pHdr, 0, sizeof(OneHttpHeader));
+ pHdr->Val = Line;
+ Put(Hdr->HTTPHeaders, HKEY("GET /"), pHdr, DestroyHttpHeaderHandler);
+ lprintf(9, "%s\n", ChrPtr(Line));
isbogus = ReadHttpSubject(Hdr, Line, HeaderName);
if (isbogus) break;
continue;
return isbogus;
}
+void OverrideRequest(ParsedHttpHdrs *Hdr, const char *Line, long len)
+{
+ StrBuf *Buf = NewStrBuf();
+ FlushStrBuf(Hdr->HR.ReqLine);
+ StrBufPlain(Hdr->HR.ReqLine, Line, len);
+ ReadHttpSubject(Hdr, Hdr->HR.ReqLine, Buf);
+
+ FreeStrBuf(&Buf);
+}
/*
* handle one request
* function returns, the worker thread is then free to handle another
* transaction.
*/
-void context_loop(int *sock)
+void context_loop(ParsedHttpHdrs *Hdr)
{
- ParsedHttpHdrs Hdr;
int isbogus = 0;
- wcsession *TheSession, *sptr;
+ wcsession *TheSession;
struct timeval tx_start;
struct timeval tx_finish;
gettimeofday(&tx_start, NULL); /* start a stopwatch for performance timing */
- memset(&Hdr, 0, sizeof(ParsedHttpHdrs));
- Hdr.eReqType = eGET;
- Hdr.http_sock = *sock;
/*
* Find out what it is that the web browser is asking for
*/
- isbogus = ReadHTTPRequset(&Hdr);
+ isbogus = ReadHTTPRequest(Hdr);
if (!isbogus)
- isbogus = AnalyseHeaders(&Hdr);
-/*
- if (isbogus)
- StrBufPlain(ReqLine, HKEY("/404"));
-*/
+ isbogus = AnalyseHeaders(Hdr);
-/* dbg_PrintHash(HTTPHeaders, nix, NULL); */
+ if ((isbogus) ||
+ ((Hdr->HR.Handler != NULL) &&
+ ((Hdr->HR.Handler->Flags & BOGUS) != 0)))
+ {
+ wcsession *Bogus;
- /*
- * If the request is prefixed by "/webcit" then chop that off. This
- * allows a front end web server to forward all /webcit requests to us
- * while still using the same web server port for other things.
- * /
- if (!isbogus &&
- (StrLength(ReqLine) >= 8) &&
- (strstr(ChrPtr(ReqLine), "/webcit/")) ) {
- StrBufCutLeft(ReqLine, 7);
+ Bogus = CreateSession(0, NULL, Hdr, NULL);
+
+ do_404();
+
+ lprintf(9, "HTTP: 404 [%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)
+ );
+ session_detach_modules(Bogus);
+ session_destroy_modules(&Bogus);
+ return;
}
- /* Begin parsing the request. * /
+ if ((Hdr->HR.Handler != NULL) && ((Hdr->HR.Handler->Flags & ISSTATIC) != 0))
+ {
+ wcsession *Static;
+ Static = CreateSession(0, NULL, Hdr, NULL);
+
+ Hdr->HR.Handler->F();
+
+ /* How long did this transaction take? */
+ gettimeofday(&tx_finish, NULL);
+
#ifdef TECH_PREVIEW
- if ((strncmp(ChrPtr(ReqLine), "/sslg", 5) != 0) &&
- (strncmp(ChrPtr(ReqLine), "/static/", 8) != 0) &&
- (strncmp(ChrPtr(ReqLine), "/tiny_mce/", 10) != 0) &&
- (strncmp(ChrPtr(ReqLine), "/wholist_section", 16) != 0) &&
- (strstr(ChrPtr(ReqLine), "wholist_section") == NULL)) {
+ if ((Hdr->HR.Handler != NULL) ||
+ ((Hdr->HR.Handler->Flags & LOGCHATTY) == 0))
#endif
- lprintf(5, "HTTP: %s %s\n", ReqStrs[Hdr.eReqType], ChrPtr(ReqLine));
-#ifdef TECH_PREVIEW
+ lprintf(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)
+ );
+ session_detach_modules(Static);
+ session_destroy_modules(&Static);
+ return;
}
-#endif
-*/
+ if (Hdr->HR.got_auth == AUTH_BASIC) {
+ CheckAuthBasic(Hdr);
+ }
- /**
+ /*
* See if there's an existing session open with the desired ID or user/pass
*/
- TheSession = NULL;
-
- if (TheSession == NULL) {
- pthread_mutex_lock(&SessionListMutex);
- for (sptr = SessionList;
- ((sptr != NULL) && (TheSession == NULL));
- sptr = sptr->next) {
-
- /** If HTTP-AUTH, look for a session with matching credentials * /
- if ( (////TODO check auth type here...
- &&(!strcasecmp(ChrPtr(sptr->httpauth_user), httpauth_user))
- &&(!strcasecmp(ChrPtr(sptr->httpauth_pass), httpauth_pass)) ) {
- TheSession = sptr;
- }
+ TheSession = FindSession(&SessionList, Hdr, &SessionListMutex);
- /** If cookie-session, look for a session with matching session ID */
- if ( (Hdr.desired_session != 0) && (sptr->wc_session == Hdr.desired_session)) {
- TheSession = sptr;
- }
-
- }
- pthread_mutex_unlock(&SessionListMutex);
- }
-
- /**
+ /*
* Create a new session if we have to
*/
if (TheSession == NULL) {
- lprintf(3, "Creating a new session\n");
- TheSession = (wcsession *)
- malloc(sizeof(wcsession));
- memset(TheSession, 0, sizeof(wcsession));
- TheSession->Hdr = &Hdr;
- TheSession->serv_sock = (-1);
- TheSession->chat_sock = (-1);
-
- /* If we're recreating a session that expired, it's best to give it the same
- * session number that it had before. The client browser ought to pick up
- * the new session number and start using it, but in some rare situations it
- * doesn't, and that's a Bad Thing because it causes lots of spurious sessions
- * to get created.
- */
- if (Hdr.desired_session == 0) {
- TheSession->wc_session = GenerateSessionID();
+ TheSession = CreateSession(1, &SessionList, Hdr, &SessionListMutex);
+
+ if ((StrLength(Hdr->c_username) == 0) && (!Hdr->HR.DontNeedAuth)) {
+
+ if ((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;
+ }
+ else {
+ OverrideRequest(Hdr, HKEY("GET /static/nocookies.html?force_close_session=yes HTTP/1.0"));
+ Hdr->HR.prohibit_caching = 1;
+ }
}
- else {
- TheSession->wc_session = Hdr.desired_session;
+
+ if (StrLength(Hdr->c_language) > 0) {
+ lprintf(9, "Session cookie requests language '%s'\n", ChrPtr(Hdr->c_language));
+ set_selected_language(ChrPtr(Hdr->c_language));
+ go_selected_language();
}
-/*
- TheSession->httpauth_user = NewStrBufPlain(httpauth_user, -1);
- TheSession->httpauth_pass = NewStrBufPlain(httpauth_user, -1);
-*/
- pthread_setspecific(MyConKey, (void *)TheSession);
- session_new_modules(TheSession);
-
- pthread_mutex_init(&TheSession->SessionMutex, NULL);
- pthread_mutex_lock(&SessionListMutex);
- TheSession->nonce = rand();
- TheSession->next = SessionList;
- TheSession->is_mobile = -1;
- SessionList = TheSession;
- pthread_mutex_unlock(&SessionListMutex);
}
/*
pthread_setspecific(MyConKey, (void *)TheSession);
TheSession->lastreq = time(NULL); /* log */
- TheSession->Hdr = &Hdr;
+ TheSession->Hdr = Hdr;
session_attach_modules(TheSession);
session_loop(); /* do transaction */
/* How long did this transaction take? */
gettimeofday(&tx_finish, NULL);
- lprintf(9, "Transaction [%s] completed in %ld.%06ld seconds.\n",
- ChrPtr(Hdr.this_page),
- ((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
- );
+
+#ifdef TECH_PREVIEW
+ if ((Hdr->HR.Handler != NULL) &&
+ ((Hdr->HR.Handler->Flags & LOGCHATTY) == 0))
+#endif
+ lprintf(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)
+ );
session_detach_modules(TheSession);
TheSession->Hdr = NULL;
pthread_mutex_unlock(&TheSession->SessionMutex); /* unbind */
-
-
- http_destroy_modules(&Hdr);
-/* TODO
-
- FreeStrBuf(&c_username);
- FreeStrBuf(&c_password);
- FreeStrBuf(&c_roomname);
- FreeStrBuf(&c_httpauth_user);
- FreeStrBuf(&c_httpauth_pass);
-*/
- /* Free the request buffer */
- ///FreeStrBuf(&ReqLine);
-
}
void tmplput_nonce(StrBuf *Target, WCTemplputParams *TP)
StrBufAppendTemplate(Target, TP, WC->wc_roomname, 0);
}
-
-void Header_HandleCookie(StrBuf *Line, ParsedHttpHdrs *hdr)
-{
- hdr->RawCookie = Line;
- if (hdr->DontNeedAuth)
- return;
-/*
- c_username = NewStrBuf();
- c_password = NewStrBuf();
- c_roomname = NewStrBuf();
- safestrncpy(c_httpauth_string, "", sizeof c_httpauth_string);
- c_httpauth_user = NewStrBufPlain(HKEY(DEFAULT_HTTPAUTH_USER));
- c_httpauth_pass = NewStrBufPlain(HKEY(DEFAULT_HTTPAUTH_PASS));
-*/
- cookie_to_stuff(Line, &hdr->desired_session,
- hdr->c_username,
- hdr->c_password,
- hdr->c_roomname);
- hdr->got_cookie = 1;
-}
-
-
- /*
- * Browser-based sessions use cookies for session authentication
- * /
- if (!isbogus &&
- GetHash(HTTPHeaders, HKEY("COOKIE"), &vLine) &&
- (vLine != NULL)) {
- cookie_to_stuff(vLine, &desired_session,
- NULL, NULL, NULL);
- got_cookie = 1;
- }
- */
- /*
- * GroupDAV-based sessions use HTTP authentication
- */
-/*
- if (!isbogus &&
- GetHash(HTTPHeaders, HKEY("AUTHORIZATION"), &vLine) &&
- (vLine != NULL)) {
- Line = (StrBuf*)vLine;
- if (strncasecmp(ChrPtr(Line), "Basic", 5) == 0) {
- StrBufCutLeft(Line, 6);
- CtdlDecodeBase64(httpauth_string, ChrPtr(Line), StrLength(Line));
- extract_token(httpauth_user, httpauth_string, 0, ':', sizeof httpauth_user);
- extract_token(httpauth_pass, httpauth_string, 1, ':', sizeof httpauth_pass);
- }
- else
- lprintf(1, "Authentication scheme not supported! [%s]\n", ChrPtr(Line));
- }
-
-*/
-void Header_HandleAuth(StrBuf *Line, ParsedHttpHdrs *hdr)
-{
- const char *Pos = NULL;
- StrBufDecodeBase64(Line);
- StrBufExtract_NextToken(hdr->c_username, Line, &Pos, ':');
- StrBufExtract_NextToken(hdr->c_password, Line, &Pos, ':');
-}
-
void Header_HandleContentLength(StrBuf *Line, ParsedHttpHdrs *hdr)
{
- hdr->ContentLength = StrToi(Line);
+ hdr->HR.ContentLength = StrToi(Line);
}
void Header_HandleContentType(StrBuf *Line, ParsedHttpHdrs *hdr)
{
- hdr->ContentType = Line;
+ hdr->HR.ContentType = Line;
}
void Header_HandleUserAgent(StrBuf *Line, ParsedHttpHdrs *hdr)
{
- hdr->user_agent = Line;
+ hdr->HR.user_agent = Line;
#ifdef TECH_PREVIEW
/* TODO: do this later on session creating
if ((WCC->is_mobile < 0) && is_mobile_ua(&buf[12])) {
void Header_HandleHost(StrBuf *Line, ParsedHttpHdrs *hdr)
{
- if ((follow_xff) && (hdr->http_host != NULL))
+ if ((follow_xff) && (hdr->HR.http_host != NULL))
return;
else
- hdr->http_host = Line;
+ hdr->HR.http_host = Line;
}
void Header_HandleXFFHost(StrBuf *Line, ParsedHttpHdrs *hdr)
{
if (follow_xff)
- hdr->http_host = Line;
+ hdr->HR.http_host = Line;
}
void Header_HandleXFF(StrBuf *Line, ParsedHttpHdrs *hdr)
{
- hdr->browser_host = Line;
+ hdr->HR.browser_host = Line;
- while (StrBufNum_tokens(hdr->browser_host, ',') > 1) {
- StrBufRemove_token(hdr->browser_host, 0, ',');
+ while (StrBufNum_tokens(hdr->HR.browser_host, ',') > 1) {
+ StrBufRemove_token(hdr->HR.browser_host, 0, ',');
}
- StrBufTrim(hdr->browser_host);
+ StrBufTrim(hdr->HR.browser_host);
}
void Header_HandleIfModSince(StrBuf *Line, ParsedHttpHdrs *hdr)
{
- hdr->if_modified_since = httpdate_to_timestamp(Line);
+ hdr->HR.if_modified_since = httpdate_to_timestamp(Line);
}
void Header_HandleAcceptEncoding(StrBuf *Line, ParsedHttpHdrs *hdr)
* Can we compress?
*/
if (strstr(&ChrPtr(Line)[16], "gzip")) {
- hdr->gzip_ok = 1;
+ hdr->HR.gzip_ok = 1;
}
}
-
-/*
-{
- c_username = NewStrBuf();
- c_password = NewStrBuf();
- c_roomname = NewStrBuf();
- safestrncpy(c_httpauth_string, "", sizeof c_httpauth_string);
- c_httpauth_user = NewStrBufPlain(HKEY(DEFAULT_HTTPAUTH_USER));
- c_httpauth_pass = NewStrBufPlain(HKEY(DEFAULT_HTTPAUTH_PASS));
-}
-*/
- /* *
- * 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 ( (StrLength(ReqLine) > 1 )
- && (strncasecmp(ChrPtr(ReqLine), "/404", 4))
- && (Hdr.got_cookie == 0)) {
- StrBufPlain(ReqLine,
- HKEY("/static/nocookies.html"
- "?force_close_session=yes"));
- }
-*/
const char *ReqStrs[eNONE] = {
"GET",
"POST",
pHdr->H = F;
Put(HttpHeaderHandler, Name, Len, pHdr, DestroyHttpHeaderHandler);
}
-extern void blank_page(void); ///TODO: remove me
+
+
void
InitModule_CONTEXT
(void)
{
- RegisterHeaderHandler(HKEY("COOKIE"), Header_HandleCookie);
- RegisterHeaderHandler(HKEY("AUTHORIZATION"), Header_HandleAuth);
RegisterHeaderHandler(HKEY("CONTENT-LENGTH"), Header_HandleContentLength);
RegisterHeaderHandler(HKEY("CONTENT-TYPE"), Header_HandleContentType);
RegisterHeaderHandler(HKEY("USER-AGENT"), Header_HandleUserAgent);
RegisterNamespace("CURRENT_ROOM", 0, 1, tmplput_current_room, CTX_NONE);
RegisterNamespace("NONCE", 0, 0, tmplput_nonce, 0);
-
-
- WebcitAddUrlHandler(HKEY("blank"), blank_page, ANONYMOUS|BOGUS);
-
- WebcitAddUrlHandler(HKEY("webcit"), blank_page, URLNAMESPACE);
+ WebcitAddUrlHandler(HKEY("404"), do_404, ANONYMOUS|COOKIEUNNEEDED);
+/*
+ * Look for commonly-found probes of malware such as worms, viruses, trojans, and Microsoft Office.
+ * Short-circuit these requests so we don't have to send them through the full processing loop.
+ */
+ WebcitAddUrlHandler(HKEY("scripts"), do_404, ANONYMOUS|BOGUS); /* /root.exe - Worms and trojans and viruses, oh my! */
+ WebcitAddUrlHandler(HKEY("c"), do_404, ANONYMOUS|BOGUS); /* /winnt */
+ WebcitAddUrlHandler(HKEY("MSADC"), do_404, ANONYMOUS|BOGUS);
+ WebcitAddUrlHandler(HKEY("_vti"), do_404, ANONYMOUS|BOGUS); /* Broken Microsoft DAV implementation */
+ WebcitAddUrlHandler(HKEY("MSOffice"), do_404, ANONYMOUS|BOGUS); /* Stoopid MSOffice thinks everyone is IIS */
+ WebcitAddUrlHandler(HKEY("nonexistenshit"), do_404, ANONYMOUS|BOGUS); /* Exploit found in the wild January 2009 */
}
+void
+HttpNewModule_CONTEXT
+(ParsedHttpHdrs *httpreq)
+{
+ httpreq->PlainArgs = NewStrBufPlain(NULL, SIZ);
+ httpreq->this_page = NewStrBufPlain(NULL, SIZ);
+}
+
+void
+HttpDetachModule_CONTEXT
+(ParsedHttpHdrs *httpreq)
+{
+ FlushStrBuf(httpreq->PlainArgs);
+ FlushStrBuf(httpreq->this_page);
+ FlushStrBuf(httpreq->PlainArgs);
+ DeleteHash(&httpreq->HTTPHeaders);
+ memset(&httpreq->HR, 0, sizeof(HdrRefs));
+}
void
HttpDestroyModule_CONTEXT
(ParsedHttpHdrs *httpreq)
{
- FreeStrBuf(&httpreq->ReqLine);
- FreeStrBuf(&httpreq->ReadBuf);
+ FreeStrBuf(&httpreq->this_page);
FreeStrBuf(&httpreq->PlainArgs);
FreeStrBuf(&httpreq->this_page);
+ FreeStrBuf(&httpreq->PlainArgs);
DeleteHash(&httpreq->HTTPHeaders);
}
projects / citadel.git / blobdiff