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... */
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 ++;
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);
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);
- http_destroy_modules(Hdr);
session_destroy_modules(&Bogus);
return;
}
/* How long did this transaction take? */
gettimeofday(&tx_finish, NULL);
- lprintf(9, "SL: 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(Static);
- http_destroy_modules(Hdr);
session_destroy_modules(&Static);
return;
}
if (Hdr->HR.got_auth == AUTH_BASIC)
CheckAuthBasic(Hdr);
-/*
-TODO HKEY("/static/nocookies.html?force_close_session=yes"));
-*/
/* dbg_PrintHash(HTTPHeaders, nix, NULL); */
-
- /* Begin parsing the request. * /
-#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)) {
-#endif
- lprintf(5, "HTTP: %s %s\n", ReqStrs[Hdr.eReqType], ChrPtr(ReqLine));
-#ifdef TECH_PREVIEW
- }
-#endif
-
-*/
-
/**
* See if there's an existing session open with the desired ID or user/pass
*/
if (TheSession == NULL) {
TheSession = CreateSession(1, &SessionList, Hdr, &SessionListMutex);
+ if ((StrLength(Hdr->c_username) == 0) &&
+ (!Hdr->HR.DontNeedAuth))
+ OverrideRequest(Hdr, HKEY("GET /static/nocookies.html?force_close_session=yes HTTP/1.0"));
+
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));
/* 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);
}
void tmplput_nonce(StrBuf *Target, WCTemplputParams *TP)
}
+void
+HttpNewModule_CONTEXT
+(ParsedHttpHdrs *httpreq)
+{
+ httpreq->PlainArgs = NewStrBuf();
+ httpreq->this_page = NewStrBuf();
+}
+
+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