* fix non cookie request blocking

[citadel.git] / webcit / context_loop.c

diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index 8dcd5d687b4b5f592694fd619d1e081f3bc00af2..a3b47acad173a49913fd3590af4bce3a2d97bb69 100644 (file)
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -276,17 +276,17 @@ int ReadHttpSubject(ParsedHttpHdrs *Hdr, StrBuf *Line, StrBuf *Buf)
                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... */
        
@@ -318,7 +318,13 @@ int ReadHttpSubject(ParsedHttpHdrs *Hdr, StrBuf *Line, StrBuf *Buf)
        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;
@@ -348,7 +354,7 @@ int AnalyseHeaders(ParsedHttpHdrs *Hdr)
 /*
  * Read in the request
  */
-int ReadHTTPRequset (ParsedHttpHdrs *Hdr)
+int ReadHTTPRequest (ParsedHttpHdrs *Hdr)
 {
        const char *pch, *pchs, *pche;
        OneHttpHeader *pHdr;
@@ -358,7 +364,6 @@ int ReadHTTPRequset (ParsedHttpHdrs *Hdr)
        int isbogus = 0;
 
        HeaderName = NewStrBuf();
-       Hdr->ReadBuf = NewStrBuf();
        LastLine = NULL;
        do {
                nLine ++;
@@ -428,7 +433,16 @@ int ReadHTTPRequset (ParsedHttpHdrs *Hdr)
        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
@@ -455,7 +469,7 @@ void context_loop(ParsedHttpHdrs *Hdr)
        /*
         * Find out what it is that the web browser is asking for
         */
-       isbogus = ReadHTTPRequset(Hdr);
+       isbogus = ReadHTTPRequest(Hdr);
 
        if (!isbogus)
                isbogus = AnalyseHeaders(Hdr);
@@ -477,7 +491,6 @@ void context_loop(ParsedHttpHdrs *Hdr)
                        ChrPtr(Hdr->this_page)
                        );
                session_detach_modules(Bogus);
-               http_destroy_modules(Hdr);
                session_destroy_modules(&Bogus);
                return;
        }
@@ -494,7 +507,7 @@ void context_loop(ParsedHttpHdrs *Hdr)
                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",
@@ -504,7 +517,6 @@ void context_loop(ParsedHttpHdrs *Hdr)
                                ChrPtr(Hdr->this_page)
                                );
                session_detach_modules(Static);
-               http_destroy_modules(Hdr);
                session_destroy_modules(&Static);
                return;
        }
@@ -512,9 +524,6 @@ void context_loop(ParsedHttpHdrs *Hdr)
        if (Hdr->HR.got_auth == AUTH_BASIC) 
                CheckAuthBasic(Hdr);
 
-/*
-TODO    HKEY("/static/nocookies.html?force_close_session=yes"));
-*/
 
 /*     dbg_PrintHash(HTTPHeaders, nix, NULL);  */
 
@@ -533,6 +542,10 @@ TODO    HKEY("/static/nocookies.html?force_close_session=yes"));
        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));
@@ -562,8 +575,10 @@ TODO    HKEY("/static/nocookies.html?force_close_session=yes"));
        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,
@@ -575,8 +590,6 @@ TODO    HKEY("/static/nocookies.html?force_close_session=yes"));
 
        TheSession->Hdr = NULL;
        pthread_mutex_unlock(&TheSession->SessionMutex);        /* unbind */
-
-       http_destroy_modules(Hdr);
 }
 
 void tmplput_nonce(StrBuf *Target, WCTemplputParams *TP)
@@ -767,14 +780,33 @@ InitModule_CONTEXT
 }
        
 
+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);
 
 }