/* Only one thread may manipulate SessionList at a time... */
pthread_mutex_t SessionListMutex;
-wcsession *SessionList = NULL; /**< our sessions ????*/
+wcsession *SessionList = NULL; /* Linked list of all webcit sessions */
-pthread_key_t MyConKey; /**< TSD key for MySession() */
+pthread_key_t MyConKey; /* TSD key for MySession() */
HashList *HttpReqTypes = NULL;
HashList *HttpHeaderHandler = NULL;
extern HashList *HandlerHash;
+int num_threads = 1; /* Number of worker threads. Start at 1 because the parent counts. */
void DestroyHttpHeaderHandler(void *V)
{
wcsession *sptr, *ss;
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.
*/
for (sptr = SessionList; sptr != NULL; sptr = sptr->next) {
++num_sessions;
- /** Kill idle sessions */
- if ((time(NULL) - (sptr->lastreq)) >
- (time_t) WEBCIT_TIMEOUT) {
+ /* Kill idle sessions */
+ if ((time(NULL) - (sptr->lastreq)) > (time_t) WEBCIT_TIMEOUT) {
sptr->killthis = 1;
}
- /** Remove sessions flagged for kill */
+ /* Remove sessions flagged for kill */
if (sptr->killthis) {
/** remove session from linked list */
}
pthread_mutex_unlock(&SessionListMutex);
- /**
+ /*
* Now free up and destroy the culled sessions.
*/
while (sessions_to_kill != NULL) {
--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) ) {
+ 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);
}
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;
}
-/**
- * \brief Detects a 'mobile' user agent
+/*
+ * Detects a 'mobile' user agent
*/
int is_mobile_ua(char *user_agent) {
if (strstr(user_agent,"iPhone OS") != NULL) {
return 1;
}
- Hdr->this_page = NewStrBufDup(Hdr->HR.ReqLine);
+ StrBufAppendBuf(Hdr->this_page, Hdr->HR.ReqLine, 0);
/* chop Filename / query arguments */
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->HR.ReqLine), '&');
if (Args != NULL) {
Args ++; /* skip the ? */
- Hdr->PlainArgs = NewStrBufPlain(
- Args,
- StrLength(Hdr->HR.ReqLine) -
- (Args - ChrPtr(Hdr->HR.ReqLine)));
+ 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... */
break;
} while (1);
/* remove the handlername from the URL */
- if (Pos != NULL) {
+ if ((Pos != NULL) && (Pos != StrBufNOTNULL)){
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.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;
int isbogus = 0;
HeaderName = NewStrBuf();
- Hdr->ReadBuf = NewStrBuf();
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);
+ Hdr->HR.dav_depth = 32767; /* TODO: find a general way to have non-0 defaults */
if (!isbogus)
isbogus = AnalyseHeaders(Hdr);
ChrPtr(Hdr->this_page)
);
session_detach_modules(Bogus);
- http_destroy_modules(Hdr);
session_destroy_modules(&Bogus);
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",
ChrPtr(Hdr->this_page)
);
session_detach_modules(Static);
- http_destroy_modules(Hdr);
session_destroy_modules(&Static);
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;
-
- if (TheSession == NULL) {
- TheSession = FindSession(&SessionList, Hdr, &SessionListMutex);
- }
+ 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,
TheSession->Hdr = NULL;
pthread_mutex_unlock(&TheSession->SessionMutex); /* unbind */
-
- http_destroy_modules(Hdr);
}
void tmplput_nonce(StrBuf *Target, WCTemplputParams *TP)
RegisterHeaderHandler(HKEY("CONTENT-LENGTH"), Header_HandleContentLength);
RegisterHeaderHandler(HKEY("CONTENT-TYPE"), Header_HandleContentType);
RegisterHeaderHandler(HKEY("USER-AGENT"), Header_HandleUserAgent);
- RegisterHeaderHandler(HKEY("X-FORWARDED-HOST"), Header_HandleXFFHost);
+ RegisterHeaderHandler(HKEY("X-FORWARDED-HOST"), Header_HandleXFFHost); /* Apache way... */
+ RegisterHeaderHandler(HKEY("X-REAL-IP"), Header_HandleXFFHost); /* NGinX way... */
RegisterHeaderHandler(HKEY("HOST"), Header_HandleHost);
RegisterHeaderHandler(HKEY("X-FORWARDED-FOR"), Header_HandleXFF);
RegisterHeaderHandler(HKEY("ACCEPT-ENCODING"), Header_HandleAcceptEncoding);
RegisterHeaderHandler(HKEY("IF-MODIFIED-SINCE"), Header_HandleIfModSince);
- RegisterNamespace("CURRENT_USER", 0, 1, tmplput_current_user, CTX_NONE);
- RegisterNamespace("CURRENT_ROOM", 0, 1, tmplput_current_room, CTX_NONE);
- RegisterNamespace("NONCE", 0, 0, tmplput_nonce, 0);
+ RegisterNamespace("CURRENT_USER", 0, 1, tmplput_current_user, NULL, CTX_NONE);
+ RegisterNamespace("CURRENT_ROOM", 0, 1, tmplput_current_room, NULL, CTX_NONE);
+ RegisterNamespace("NONCE", 0, 0, tmplput_nonce, NULL, 0);
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("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 */
}
+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->ReadBuf);
+ FreeStrBuf(&httpreq->this_page);
FreeStrBuf(&httpreq->PlainArgs);
FreeStrBuf(&httpreq->this_page);
+ FreeStrBuf(&httpreq->PlainArgs);
DeleteHash(&httpreq->HTTPHeaders);
}
projects / citadel.git / blobdiff