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;
/* the HTTP Version... */
StrBufExtract_token(Buf, Hdr->ReqLine, 1, ' ');
StrBufCutRight(Hdr->ReqLine, StrLength(Buf) + 1);
- if ((StrLength(Buf) == 0) ||
- is_bogus(Hdr->ReqLine)) {
+
+ if (StrLength(Buf) == 0) {
Hdr->eReqType = eGET;
return 1;
}
Hdr->Handler = (WebcitHandler*) vHandler;
if (Hdr->Handler == NULL)
break;
- /* are we about to ignore some prefix like webcit/ ? */
- if ((Hdr->Handler->Flags & URLNAMESPACE) == 0)
- 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->Handler->Flags & URLNAMESPACE) != 0)
+ continue;
+ break;
} while (1);
/* remove the handlername from the URL */
if (Pos != NULL) {
StrBufCutLeft(Hdr->ReqLine,
Pos - ChrPtr(Hdr->ReqLine));
}
-/*
- if (Hdr->Handler == NULL)
- return 1;
-*/
- Hdr->HTTPHeaders = NewHash(1, NULL);
+ if (Hdr->Handler != NULL) {
+ if ((Hdr->Handler->Flags & BOGUS) != 0)
+ return 1;
+ Hdr->DontNeedAuth = (Hdr->Handler->Flags & ISSTATIC) != 0;
+ }
+
+ Hdr->HTTPHeaders = NewHash(1, NULL);
return 0;
}
continue;
}
if (nLine == 1) {
+ lprintf(9, "%s\n", ChrPtr(Line));
isbogus = ReadHttpSubject(Hdr, Line, HeaderName);
if (isbogus) break;
continue;
if (!isbogus)
isbogus = AnalyseHeaders(&Hdr);
+
+ if ((isbogus) ||
+ ((Hdr.Handler != NULL) &&
+ ((Hdr.Handler->Flags & BOGUS) != 0)))
+ {
+ wcsession *Bogus;
+ Bogus = (wcsession *)
+ malloc(sizeof(wcsession));
+ memset(Bogus, 0, sizeof(wcsession));
+ pthread_setspecific(MyConKey, (void *)Bogus);
+ Bogus->Hdr = &Hdr;
+ Bogus->WBuf = NewStrBuf();
+ Bogus->HBuf = NewStrBuf();
+ session_new_modules(Bogus);
+ do_404();
+ session_detach_modules(Bogus);
+ http_destroy_modules(&Hdr);
+ session_destroy_modules(&Bogus);
+ return;
+ }
+
+ if ((Hdr.Handler != NULL) &&
+ ((Hdr.Handler->Flags & ISSTATIC) != 0))
+ {
+ wcsession *Static;
+
+ Static = (wcsession *)
+ malloc(sizeof(wcsession));
+ memset(Static, 0, sizeof(wcsession));
+ pthread_setspecific(MyConKey, (void *)Static);
+ Static->Hdr = &Hdr;
+ Static->WBuf = NewStrBuf();
+ Static->HBuf = NewStrBuf();
+ Static->serv_sock = (-1);
+ Static->chat_sock = (-1);
+ Static->is_mobile = -1;
+ session_new_modules(Static);
+
+ Hdr.Handler->F();
+
+ /* 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
+ );
+
+ session_detach_modules(Static);
+ http_destroy_modules(&Hdr);
+ session_destroy_modules(&Static);
+ return;
+ }
+
+ if (Hdr.got_auth == AUTH_BASIC)
+ CheckAuthBasic(&Hdr);
+
/*
- if (isbogus)
- StrBufPlain(ReqLine, HKEY("/404"));
+TODO HKEY("/static/nocookies.html?force_close_session=yes"));
*/
/* dbg_PrintHash(HTTPHeaders, nix, NULL); */
- /*
- * 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);
- }
/* Begin parsing the request. * /
#ifdef TECH_PREVIEW
((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;
- }
-
+ /** If HTTP-AUTH, look for a session with matching credentials */
+ switch (Hdr.got_auth)
+ {
+ case AUTH_BASIC:
+ if ( (Hdr.SessionKey != sptr->SessionKey))
+ continue;
+ GetAuthBasic(&Hdr);
+ if ((!strcasecmp(ChrPtr(Hdr.c_username), ChrPtr(sptr->wc_username))) &&
+ (!strcasecmp(ChrPtr(Hdr.c_password), ChrPtr(sptr->wc_password))) )
+ TheSession = sptr;
+ break;
+ case AUTH_COOKIE:
/** If cookie-session, look for a session with matching session ID */
- if ( (Hdr.desired_session != 0) && (sptr->wc_session == Hdr.desired_session)) {
- TheSession = sptr;
+ if ( (Hdr.desired_session != 0) &&
+ (sptr->wc_session == Hdr.desired_session))
+ TheSession = sptr;
+ break;
+ case NO_AUTH:
+ break;
}
-
}
pthread_mutex_unlock(&SessionListMutex);
}
malloc(sizeof(wcsession));
memset(TheSession, 0, sizeof(wcsession));
TheSession->Hdr = &Hdr;
+ TheSession->SessionKey = Hdr.SessionKey;
TheSession->serv_sock = (-1);
TheSession->chat_sock = (-1);
else {
TheSession->wc_session = Hdr.desired_session;
}
-/*
- TheSession->httpauth_user = NewStrBufPlain(httpauth_user, -1);
- TheSession->httpauth_pass = NewStrBufPlain(httpauth_user, -1);
-*/
+
pthread_setspecific(MyConKey, (void *)TheSession);
session_new_modules(TheSession);
TheSession->is_mobile = -1;
SessionList = TheSession;
pthread_mutex_unlock(&SessionListMutex);
+
+ 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->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->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 */
}
projects / citadel.git / blobdiff