]> code.citadel.org Git - citadel.git/blobdiff - webcit/auth.c
projects / citadel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
The monitoring page plays really stupid games with the session. Eliminate all.
[citadel.git] / webcit / auth.c
diff --git a/webcit/auth.c b/webcit/auth.c
index 9d2eaa3e66b2d49c694aa24f4566d97ea3ccfd1a..994c00c976322826aed4032210effee66d5b41b0 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -64,7 +64,7 @@ void display_login(void)
 {
        begin_burst();
        output_headers(1, 0, 0, 0, 1, 0);
-       do_template("login", NULL);
+       do_template("login");
        end_burst();
 }
 
@@ -196,7 +196,7 @@ void openid_manual_create(void)
        if (havebstr("exit_action")) {
                begin_burst();
                output_headers(1, 0, 0, 0, 1, 0);
-               do_template("authpopup_finished", NULL);
+               do_template("authpopup_finished");
                end_burst();
                return;
        }
@@ -224,7 +224,7 @@ void openid_manual_create(void)
                if (WC->logged_in) {
                        begin_burst();
                        output_headers(1, 0, 0, 0, 1, 0);
-                       do_template("authpopup_finished", NULL);
+                       do_template("authpopup_finished");
                        end_burst();
                }
        } else {
@@ -237,7 +237,7 @@ void openid_manual_create(void)
                begin_burst();
                output_headers(1, 0, 0, 0, 1, 0);
                wc_printf("<html><body>");
-               do_template("openid_manual_create", NULL);
+               do_template("openid_manual_create");
                wc_printf("</body></html>");
                end_burst();
        }
@@ -303,6 +303,7 @@ void finalize_openid_login(void)
                                long HKLen;
                                const char *HKey;
                                HashPos *Cursor;
+                               int len;
                                
                                Cursor = GetNewHashPos (WCC->Hdr->urlstrings, 0);
                                while (GetNextHashPos(WCC->Hdr->urlstrings, Cursor, &HKLen, &HKey, &U)) {
@@ -315,7 +316,9 @@ void finalize_openid_login(void)
                                serv_puts("000");
 
                                linecount = 0;
-                               while (StrBuf_ServGetln(Buf), strcmp(ChrPtr(Buf), "000")) 
+                               while (len = StrBuf_ServGetln(Buf), 
+                                      ((len >= 0) &&
+                                       ((len != 3) || strcmp(ChrPtr(Buf), "000") )))
                                {
                                        if (linecount == 0) result = NewStrBufDup(Buf);
                                        if (!strcasecmp(ChrPtr(result), "authenticate")) {
@@ -361,7 +364,7 @@ void finalize_openid_login(void)
                if (WC->logged_in) {
                        begin_burst();
                        output_headers(1, 0, 0, 0, 1, 0);
-                       do_template("authpopup_finished", NULL);
+                       do_template("authpopup_finished");
                        end_burst();
                } else {
                        begin_burst();
@@ -386,7 +389,7 @@ void finalize_openid_login(void)
                begin_burst();
                output_headers(1, 0, 0, 0, 1, 0);
                wc_printf("<html><body>");
-               do_template("openid_manual_create", NULL);
+               do_template("openid_manual_create");
                wc_printf("</body></html>");
                end_burst();
        }
@@ -504,16 +507,19 @@ void do_logout(void)
        serv_getln(buf, sizeof buf);
        WCC->logged_in = 0;
 
-       if (WC->serv_info->serv_supports_guest) {
-               display_default_landing_page();
-               return;
-       }
-
        FlushStrBuf(WCC->CurRoom.name);
 
        /* Calling output_headers() this way causes the cookies to be un-set */
        output_headers(1, 1, 0, 1, 0, 0);
 
+       /* For sites in guest mode, redirect to the landing page after we're logged out */
+       if (WC->serv_info->serv_supports_guest) {
+               wc_printf("     <script type=\"text/javascript\">       "
+                       "       window.location='/';                    "
+                       "       </script>                               "
+               );
+       }
+
        wc_printf("<div id=\"logout_screen\">");
         wc_printf("<div class=\"box\">");
         wc_printf("<div class=\"boxlabel\">");
@@ -544,11 +550,38 @@ void do_logout(void)
        wc_printf(_("Log in again"));
        wc_printf("</a></span>");
        wc_printf("</div></div></div>\n");
+       if (WC->serv_info->serv_supports_guest) {
+               display_default_landing_page();
+               return;
+       }
+
        wDumpContent(2);
        end_webcit_session();
 }
 
 
+/* 
+ * Special page for monitoring scripts etc
+ */
+void monitor(void)
+{
+       output_headers(0, 0, 0, 0, 0, 0);
+
+       hprintf("Content-type: text/plain\r\n"
+               "Server: " PACKAGE_STRING "\r\n"
+               "Connection: close\r\n"
+       );
+       begin_burst();
+
+       wc_printf("Connection to Citadel server at %s:%s : %s\r\n",
+               ctdlhost, ctdlport,
+               (WC->connected ? "SUCCESS" : "FAIL")
+       );
+
+       wDumpContent(0);
+}
+
+
 /*
  * validate new users
  */
@@ -559,14 +592,11 @@ void validate(void)
        char buf[SIZ];
        int a;
 
-       output_headers(1, 1, 2, 0, 0, 0);
-       wc_printf("<div id=\"banner\">\n");
-       wc_printf("<h1>");
-       wc_printf(_("Validate new users"));
-       wc_printf("</h1>");
-       wc_printf("</div>\n");
+       output_headers(1, 1, 1, 0, 0, 0);
 
-       wc_printf("<div id=\"content\" class=\"service\">\n");
+        do_template("box_begin_1");
+        StrBufAppendBufPlain(WC->WBuf, _("Validate new users"), -1, 0);
+        do_template("box_begin_2");
 
        /* If the user just submitted a validation, process it... */
        safestrncpy(buf, bstr("user"), sizeof buf);
@@ -615,7 +645,7 @@ void validate(void)
                                int haveChar = 0;
                                int haveNum = 0;
                                int haveOther = 0;
-                               int count = 0;
+                               int haveLong = 0;
                                pch = buf;
                                while (!IsEmptyStr(pch))
                                {
@@ -627,10 +657,13 @@ void validate(void)
                                                haveOther = 1;
                                        pch ++;
                                }
-                               count = pch - buf;
-                               if (count > 7)
-                                       count = 0;
-                               switch (count){
+                               if (pch - buf > 7)
+                                       haveLong = 1;
+                               switch (haveLong + 
+                                       haveChar + 
+                                       haveNum + 
+                                       haveOther)
+                               {
                                case 0:
                                        pch = _("very weak");
                                        break;
@@ -680,6 +713,7 @@ void validate(void)
 
        wc_printf("</div>\n");
        wc_printf("</td></tr></table>\n");
+       do_template("box_end");
        wDumpContent(1);
 }
 
@@ -755,7 +789,7 @@ void display_changepw(void)
        memset(&SubTP, 0, sizeof(WCTemplputParams));
        SubTP.Filter.ContextType = CTX_STRBUF;
        SubTP.Context = Buf;
-       DoTemplate(HKEY("beginbox"), NULL, &SubTP);
+       DoTemplate(HKEY("box_begin"), NULL, &SubTP);
 
        FreeStrBuf(&Buf);
 
@@ -791,7 +825,7 @@ void display_changepw(void)
        wc_printf("</div>\n");
        wc_printf("</form>\n");
 
-       do_template("endbox", NULL);
+       do_template("box_end");
        wDumpContent(1);
 }
 
@@ -1024,6 +1058,7 @@ InitModule_AUTH
        WebcitAddUrlHandler(HKEY("changepw"), "", 0, changepw, 0);
        WebcitAddUrlHandler(HKEY("termquit"), "", 0, do_logout, 0);
        WebcitAddUrlHandler(HKEY("do_logout"), "", 0, do_logout, ANONYMOUS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE);
+       WebcitAddUrlHandler(HKEY("monitor"), "", 0, monitor, ANONYMOUS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE);
        WebcitAddUrlHandler(HKEY("ajax_login_username_password"), "", 0, ajax_login_username_password, AJAX|ANONYMOUS);
        WebcitAddUrlHandler(HKEY("ajax_login_newuser"), "", 0, ajax_login_newuser, AJAX|ANONYMOUS);
        WebcitAddUrlHandler(HKEY("switch_language"), "", 0, switch_language, ANONYMOUS);
Citadel server, clients, utilities