* add logging if auth-basic session connecting fails with weird conditions

[citadel.git] / webcit / context_loop.c

diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index 3a20c7e82092a54a283457151b3d3862b188fe4f..62ee82a03cc03038fb9de87193e1bbb10ea4f69f 100644 (file)
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -138,35 +138,45 @@ int GenerateSessionID(void)
 
 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;
 }
 
@@ -174,8 +184,7 @@ wcsession *CreateSession(int Lockable, wcsession **wclist, ParsedHttpHdrs *Hdr,
 {
        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;
@@ -495,8 +504,7 @@ void context_loop(ParsedHttpHdrs *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);
@@ -521,31 +529,32 @@ void context_loop(ParsedHttpHdrs *Hdr)
                return;
        }
 
-       if (Hdr->HR.got_auth == AUTH_BASIC) 
+       if (Hdr->HR.got_auth == AUTH_BASIC) {
                CheckAuthBasic(Hdr);
+       }
 
-
-/*     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)) {
-                       OverrideRequest(Hdr, HKEY("GET /static/nocookies.html?force_close_session=yes HTTP/1.0"));
-                       Hdr->HR.prohibit_caching = 1;
+               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) {