]> code.citadel.org Git - citadel.git/blobdiff - webcit/webcit.c
projects / citadel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
* add logging if auth-basic session connecting fails with weird conditions
[citadel.git] / webcit / webcit.c
diff --git a/webcit/webcit.c b/webcit/webcit.c
index 08dff525967c5b4557e39d6e2269d9bc9580655f..869793a2c2ace1b4c524d9d388b99c2e3c2dbaef 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -241,6 +241,7 @@ void http_redirect(const char *whichpage) {
        hprintf("Location: %s\r\n", whichpage);
        hprintf("URI: %s\r\n", whichpage);
        hprintf("Content-type: text/html; charset=utf-8\r\n");
+       begin_burst();
        wprintf("<html><body>");
        wprintf("Go <a href=\"%s\">here</A>.", whichpage);
        wprintf("</body></html>\n");
@@ -366,18 +367,34 @@ void display_success(char *successmessage)
  * Authorization required page 
  * This is probably temporary and should be revisited 
  */
-void authorization_required(const char *message)
+void authorization_required(void)
 {
+       wcsession *WCC = WC;
+       const char *message = "";
+
        hprintf("HTTP/1.1 401 Authorization Required\r\n");
+       hprintf(
+               "Server: %s / %s\r\n"
+               "Connection: close\r\n",
+               PACKAGE_STRING, ChrPtr(WC->serv_info->serv_software)
+       );
        hprintf("WWW-Authenticate: Basic realm=\"%s\"\r\n", ChrPtr(WC->serv_info->serv_humannode));
        hprintf("Content-Type: text/html\r\n");
+       begin_burst();
        wprintf("<h1>");
        wprintf(_("Authorization Required"));
        wprintf("</h1>\r\n");
+       
+
+       if (WCC->ImportantMsg != NULL)
+               message = ChrPtr(WCC->ImportantMsg);
+       else if (WCC->ImportantMessage != NULL)
+               message = WCC->ImportantMessage;
+
        wprintf(_("The resource you requested requires a valid username and password. "
                "You could not be logged in: %s\n"), message);
        wDumpContent(0);
-       
+       end_webcit_session();
 }
 
 /*
@@ -534,6 +551,9 @@ void ReadPostData(void)
                        WCC->Hdr->HR.ContentLength + 
                        body_start;
                mime_parser(ChrPtr(content), content_end, *upload_handler, NULL, NULL, NULL, 0);
+       } else if (WCC->Hdr->HR.ContentLength > 0) {
+               WCC->upload = content;
+               content = NULL;
        }
        FreeStrBuf(&content);
 }
@@ -548,8 +568,6 @@ void session_loop(void)
        int xhttp;
        StrBuf *Buf;
        
-       char buf[SIZ];
-
        /*
         * We stuff these with the values coming from the client cookies,
         * so we can use them to reconnect a timed out session if we have to.
@@ -585,6 +603,7 @@ void session_loop(void)
                        lprintf(9, "Ignoring request with mismatched nonce.\n");
                        hprintf("HTTP/1.1 404 Security check failed\r\n");
                        hprintf("Content-Type: text/plain\r\n\r\n");
+                       begin_burst();
                        wprintf("Security check failed.\r\n");
                        end_burst();
                        goto SKIP_ALL_THIS_CRAP;
@@ -620,7 +639,8 @@ void session_loop(void)
                                                 WCC->Hdr->c_password, Buf);
                        } else {
                                /* Should only display when password is wrong */
-                               authorization_required(&buf[4]);
+                               WCC->ImportantMsg = NewStrBufPlain(ChrPtr(Buf) + 4, StrLength(Buf) - 4);
+                               authorization_required();
                                FreeStrBuf(&Buf);
                                goto SKIP_ALL_THIS_CRAP;
                        }
@@ -676,10 +696,25 @@ void session_loop(void)
        }
        /* When all else fais, display the main menu. */
        else {
-               if (!WCC->logged_in) 
-                       display_login(NULL);
-               else
-                       display_main_menu();
+               /* 
+                * ordinary browser users get a nice login screen, DAV etc. requsets
+                * are given a 401 so they can handle it appropriate.
+                */
+               if (!WCC->logged_in)  {
+                       if (xhttp)
+                               authorization_required();
+                       else 
+                               display_login(NULL);
+               }
+               /*
+                * Toplevel dav requests? or just a flat browser request? 
+                */
+               else {
+                       if (xhttp)
+                               groupdav_main();
+                       else
+                               display_main_menu();
+               }
        }
 
 SKIP_ALL_THIS_CRAP:
@@ -755,18 +790,19 @@ InitModule_WEBCIT
        WebcitAddUrlHandler(HKEY("ajax_servcmd"), ajax_servcmd, 0);
        WebcitAddUrlHandler(HKEY("webcit"), blank_page, URLNAMESPACE);
 
+       WebcitAddUrlHandler(HKEY("401"), authorization_required, ANONYMOUS|COOKIEUNNEEDED);
        RegisterConditional(HKEY("COND:IMPMSG"), 0, ConditionalImportantMesage, CTX_NONE);
        RegisterNamespace("CSSLOCAL", 0, 0, tmplput_csslocal, CTX_NONE);
        RegisterNamespace("IMPORTANTMESSAGE", 0, 0, tmplput_importantmessage, CTX_NONE);
        RegisterNamespace("TRAILING_JAVASCRIPT", 0, 0, tmplput_trailing_javascript, CTX_NONE);
 
-       snprintf(dir, SIZ, "%s/static.local/webcit.css", static_local_dir);
+       snprintf(dir, SIZ, "%s/webcit.css", static_local_dir);
        if (!access(dir, R_OK)) {
                lprintf(9, "Using local Stylesheet [%s]\n", dir);
                csslocal = NewStrBufPlain(HKEY("<link href=\"static.local/webcit.css\" rel=\"stylesheet\" type=\"text/css\">"));
        }
        else
-               lprintf(9, "Didn't find site local Stylesheet [%s]\n", dir);
+               lprintf(9, "No Site-local Stylesheet [%s] installed. \n", dir);
 
 }
 
@@ -803,7 +839,7 @@ SessionDetachModule_WEBCIT
 {
        DeleteHash(&sess->Hdr->urlstrings);// TODO?
        if (sess->upload_length > 0) {
-               free(sess->upload);
+               FreeStrBuf(&sess->upload);
                sess->upload_length = 0;
        }
        FreeStrBuf(&sess->trailing_javascript);
Citadel server, clients, utilities