wcsession *FindSession(wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t *ListMutex)
{
- wcsession *sptr, *TheSession = NULL;
+ wcsession *sptr = NULL;
+ wcsession *TheSession = NULL;
+ if (Hdr->HR.got_auth == AUTH_BASIC) {
+ GetAuthBasic(Hdr);
+ }
+
pthread_mutex_lock(ListMutex);
- for (sptr = *wclist;
- ((sptr != NULL) && (TheSession == NULL));
- sptr = sptr->next) {
+ for (sptr = *wclist; ((sptr != NULL) && (TheSession == NULL)); sptr = sptr->next) {
- /** If HTTP-AUTH, look for a session with matching credentials */
+ /* 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;
- GetAuthBasic(Hdr);
if ((!strcasecmp(ChrPtr(Hdr->c_username), ChrPtr(sptr->wc_username))) &&
- (!strcasecmp(ChrPtr(Hdr->c_password), ChrPtr(sptr->wc_password))) )
+ (!strcasecmp(ChrPtr(Hdr->c_password), ChrPtr(sptr->wc_password))) ) {
TheSession = sptr;
+ }
+ if (TheSession == NULL)
+ lprintf(1, "found sessionkey [%ld], but credentials for [%s|%s] didn't match\n",
+ Hdr->HR.SessionKey,ChrPtr(Hdr->c_username), ChrPtr(sptr->wc_username));
break;
case AUTH_COOKIE:
- /** If cookie-session, look for a session with matching session ID */
+ /* If cookie-session, look for a session with matching session ID */
if ( (Hdr->HR.desired_session != 0) &&
- (sptr->wc_session == Hdr->HR.desired_session))
+ (sptr->wc_session == Hdr->HR.desired_session)) {
TheSession = sptr;
+ }
break;
case NO_AUTH:
break;
}
}
pthread_mutex_unlock(ListMutex);
+ if (TheSession == NULL)
+ lprintf(1, "didn't find sessionkey [%ld] for user [%s]\n",
+ Hdr->HR.SessionKey,ChrPtr(Hdr->c_username));
return TheSession;
}
{
wcsession *TheSession;
lprintf(3, "Creating a new session\n");
- TheSession = (wcsession *)
- malloc(sizeof(wcsession));
+ TheSession = (wcsession *) malloc(sizeof(wcsession));
memset(TheSession, 0, sizeof(wcsession));
TheSession->Hdr = Hdr;
TheSession->SessionKey = Hdr->HR.SessionKey;
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.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... */
}
return 0;
/*
* Read in the request
*/
-int ReadHTTPRequset (ParsedHttpHdrs *Hdr)
+int ReadHTTPRequest (ParsedHttpHdrs *Hdr)
{
const char *pch, *pchs, *pche;
OneHttpHeader *pHdr;
LastLine = NULL;
do {
nLine ++;
- Line = NewStrBuf();
+ Line = NewStrBufPlain(NULL, SIZ / 4);
if (ClientGetLine(Hdr, Line) < 0) return 1;
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
/*
* Find out what it is that the web browser is asking for
*/
- isbogus = ReadHTTPRequset(Hdr);
+ isbogus = ReadHTTPRequest(Hdr);
if (!isbogus)
isbogus = AnalyseHeaders(Hdr);
return;
}
- if ((Hdr->HR.Handler != NULL) &&
- ((Hdr->HR.Handler->Flags & ISSTATIC) != 0))
+ if ((Hdr->HR.Handler != NULL) && ((Hdr->HR.Handler->Flags & ISSTATIC) != 0))
{
wcsession *Static;
Static = CreateSession(0, NULL, Hdr, NULL);
gettimeofday(&tx_finish, NULL);
#ifdef TECH_PREVIEW
- if ((Hdr->HR.Handler == NULL) ||
+ if ((Hdr->HR.Handler != NULL) ||
((Hdr->HR.Handler->Flags & LOGCHATTY) == 0))
#endif
lprintf(9, "HTTP: 200 [%ld.%06ld] %s %s \n",
return;
}
- if (Hdr->HR.got_auth == AUTH_BASIC)
+ if (Hdr->HR.got_auth == AUTH_BASIC) {
CheckAuthBasic(Hdr);
+ }
-/*
-TODO HKEY("/static/nocookies.html?force_close_session=yes"));
-*/
-
-/* dbg_PrintHash(HTTPHeaders, nix, NULL); */
-
- /**
+ /*
* See if there's an existing session open with the desired ID or user/pass
*/
- TheSession = NULL;
+ TheSession = FindSession(&SessionList, Hdr, &SessionListMutex);
- if (TheSession == NULL) {
- TheSession = FindSession(&SessionList, Hdr, &SessionListMutex);
- }
-
- /**
+ /*
* Create a new session if we have to
*/
if (TheSession == NULL) {
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;
+ }
+ }
+
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));
gettimeofday(&tx_finish, NULL);
- if ((Hdr->HR.Handler == NULL) ||
+#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,
* 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("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 */
HttpNewModule_CONTEXT
(ParsedHttpHdrs *httpreq)
{
- httpreq->PlainArgs = NewStrBuf();
- httpreq->this_page = NewStrBuf();
+ httpreq->PlainArgs = NewStrBufPlain(NULL, SIZ);
+ httpreq->this_page = NewStrBufPlain(NULL, SIZ);
}
void