]> code.citadel.org Git - citadel.git/blobdiff - webcit/auth.c
* --pedantic cleanup.
[citadel.git] / webcit / auth.c
index e637da46a73d89342f720339d43468a8f8b54601..77c2d457f503996e1c3a79aaa9c839c007a570e1 100644 (file)
@@ -6,6 +6,10 @@
 
 #include "webcit.h"
 #include "webserver.h"
+#include <ctype.h>
+
+
+void display_reg(int during_login);
 
 /*
  * Access level definitions.  This is initialized from a function rather than a
@@ -30,71 +34,12 @@ void initialize_axdefs(void) {
  * Display the login screen
  * mesg = the error message if last attempt failed.
  */
-void display_login(char *mesg)
+void display_login(void)
 {
-       char buf[SIZ];
-
-       output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"login_screen\">\n");
-
-       if (mesg != NULL) if (!IsEmptyStr(mesg)) {
-                       stresc(buf, SIZ,  mesg, 0, 0);
-                       svprintf(HKEY("MESG"), WCS_STRING, "%s", buf);
-       }
-
-       svprintf(HKEY("LOGIN_INSTRUCTIONS"), WCS_STRING,
-               _("<ul>"
-               "<li><b>If you already have an account on %s</b>, "
-               "enter your user name and password and click &quot;Login.&quot; "
-               "<li><b>If you are a new user</b>, enter the name and password "
-               "you wish to use, "
-               "and click &quot;New User.&quot; "
-               "<li>Please log off properly when finished. "
-               "<li>You must use a browser that supports <i>frames</i> and "
-               "<i>cookies</i>. "
-               "<li>Also keep in mind that if your browser is "
-               "configured to block pop-up windows, you will not be able "
-               "to receive any instant messages.<br />"
-               "</ul>"),
-               serv_info.serv_humannode
-       );
-
-       svput("USERNAME_BOX", WCS_STRING, _("User name:"));
-       svput("PASSWORD_BOX", WCS_STRING, _("Password:"));
-       svput("LANGUAGE_BOX", WCS_STRING, _("Language:"));
-       svput("LOGIN_BUTTON", WCS_STRING, _("Login"));
-       svput("NEWUSER_BUTTON", WCS_STRING, _("New User"));
-       svput("EXIT_BUTTON", WCS_STRING, _("Exit"));
-       svput("HELLO", WCS_SERVCMD, "MESG hello");
-       svprintf(HKEY("BOXTITLE"), WCS_STRING, _("%s - powered by <a href=\"http://www.citadel.org\">Citadel</a>"),
-               serv_info.serv_humannode);
-       svcallback("DO_LANGUAGE_BOX", offer_languages);
-       if (serv_info.serv_newuser_disabled) {
-               svput("NEWUSER_BUTTON_PRE", WCS_STRING, "<div style=\"display:none;\">");
-               svput("NEWUSER_BUTTON_POST", WCS_STRING, "</div>");
-       }
-       else {
-               svput("NEWUSER_BUTTON_PRE", WCS_STRING, "");
-               svput("NEWUSER_BUTTON_POST", WCS_STRING, "");
-       }
-
-#ifdef TECH_PREVIEW
-               svprintf(HKEY("OFFER_OPENID_LOGIN"), WCS_STRING,
-                       "<div align=center>"
-                       "<a href=\"display_openid_login\">"
-                       "<img src=\"static/openid-small.gif\" border=0 valign=middle>"
-                       "%s</a>"
-                       "</div>"
-                       ,
-                       "Log in using OpenID"
-               );
-#else
-               svput("OFFER_OPENID_LOGIN", WCS_STRING, "");
-#endif
-
-       do_template("login");
-
-       wDumpContent(2);
+       begin_burst();
+       output_headers(1, 0, 0, 0, 1, 0);
+       do_template("login", NULL);
+       end_burst();
 }
 
 
@@ -111,14 +56,16 @@ void display_openid_login(char *mesg)
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"login_screen\">\n");
 
-       if (mesg != NULL) if (!IsEmptyStr(mesg)) {
-                       stresc(buf, SIZ,  mesg, 0, 0);
-                       svprintf(HKEY("MESG"), WCS_STRING, "%s", buf);
+       if ((mesg != NULL) && (!IsEmptyStr(mesg))) {
+               stresc(buf, SIZ,  mesg, 0, 0);
+               svprintf(HKEY("MESG"), WCS_STRING, "%s", buf);
        }
 
        svprintf(HKEY("LOGIN_INSTRUCTIONS"), WCS_STRING,
                _("<ul>"
                "<li>Enter your OpenID URL and click &quot;Login&quot;."
+               "<li><a href=\"http://www.citadel.org/doku.php/documentation:openid\">"
+               "Click here to learn what OpenID is and how Citadel is using it.</a>"
                "<li>Please log off properly when finished. "
                "<li>You must use a browser that supports <i>frames</i> and "
                "<i>cookies</i>. "
@@ -128,15 +75,8 @@ void display_openid_login(char *mesg)
                "</ul>")
        );
 
-       svput("OPENID_BOX", WCS_STRING, _("OpenID URL:"));
-       svput("LANGUAGE_BOX", WCS_STRING, _("Language:"));
-       svput("LOGIN_BUTTON", WCS_STRING, _("Login"));
-       svput("EXIT_BUTTON", WCS_STRING, _("Exit"));
        svput("HELLO", WCS_SERVCMD, "MESG hello");
-       svprintf(HKEY("BOXTITLE"), WCS_STRING, _("%s - powered by <a href=\"http://www.citadel.org\">Citadel</a>"),
-               serv_info.serv_humannode);
-       svcallback("DO_LANGUAGE_BOX", offer_languages);
-
+       
        svprintf(HKEY("OFFER_CONVENTIONAL_LOGIN"), WCS_STRING,
                "<div align=center>"
                "<a href=\"display_login\">"
@@ -146,11 +86,45 @@ void display_openid_login(char *mesg)
                "Log in using a user name and password"
        );
 
-       do_template("openid_login");
+       do_template("openid_login", NULL);
        wDumpContent(2);
 }
 
 
+void display_openid_name_request(char *claimed_id, char *username) {
+       char buf[SIZ];
+
+       output_headers(1, 1, 2, 0, 0, 0);
+       wprintf("<div id=\"login_screen\">\n");
+
+       stresc(buf, sizeof buf, claimed_id, 0, 0);
+       svprintf(HKEY("VERIFIED"), WCS_STRING, _("Your OpenID <tt>%s</tt> was successfully verified."),
+               claimed_id);
+       svput("CLAIMED_ID", WCS_STRING, claimed_id);
+
+
+       if (!IsEmptyStr(username)) {
+               stresc(buf, sizeof buf, username, 0, 0);
+               svprintf(HKEY("REASON"), WCS_STRING,
+                       _("However, the user name '%s' conflicts with an existing user."), username);
+       }
+       else {
+               svput("REASON", WCS_STRING, "");
+       }
+
+       svput("ACTION_REQUESTED", WCS_STRING, _("Please specify the user name you would like to use."));
+
+       svput("USERNAME_BOX", WCS_STRING, _("User name:"));
+       svput("NEWUSER_BUTTON", WCS_STRING, _("New User"));
+       svput("EXIT_BUTTON", WCS_STRING, _("Exit"));
+
+       svprintf(HKEY("BOXTITLE"), WCS_STRING, _("%s - powered by <a href=\"http://www.citadel.org\">Citadel</a>"),
+               serv_info.serv_humannode);
+
+       do_template("openid_manual_create", NULL);
+       wDumpContent(2);
+}
+
 
 
 /* Initialize the session
@@ -168,6 +142,7 @@ void display_openid_login(char *mesg)
 void become_logged_in(char *user, char *pass, char *serv_response)
 {
        char buf[SIZ];
+       StrBuf *FloorDiv;
 
        WC->logged_in = 1;
        extract_token(WC->wc_fullname, &serv_response[4], 0, '|', sizeof WC->wc_fullname);
@@ -189,10 +164,10 @@ void become_logged_in(char *user, char *pass, char *serv_response)
                extract_token(WC->cs_inet_email, &buf[4], 3, '|', sizeof WC->cs_inet_email);
        }
 
-       get_preference("current_iconbar", buf, sizeof buf);
-       WC->current_iconbar = atoi(buf);
+       get_pref_long("current_iconbar", &WC->current_iconbar, current_iconbar_menu);
 
-       get_preference("floordiv_expanded", WC->floordiv_expanded, sizeof WC->floordiv_expanded);
+       get_preference("floordiv_expanded", &FloorDiv);
+       WC->floordiv_expanded = FloorDiv;
 }
 
 
@@ -201,6 +176,7 @@ void become_logged_in(char *user, char *pass, char *serv_response)
  */
 void do_login(void)
 {
+       wcsession *WCC = WC;
        char buf[SIZ];
 
        if (havebstr("language")) {
@@ -219,20 +195,31 @@ void do_login(void)
                        serv_printf("PASS %s", bstr("pass"));
                        serv_getln(buf, sizeof buf);
                        if (buf[0] == '2') {
-                               become_logged_in(bstr("name"),
-                                                bstr("pass"), buf);
+                               become_logged_in(bstr("name"), bstr("pass"), buf);
                        } else {
-                               display_login(&buf[4]);
+                               snprintf(WCC->ImportantMessage, 
+                                        sizeof (WCC->ImportantMessage), 
+                                        "%s", 
+                                        &buf[4]);
+                               display_login();
                                return;
                        }
                } else {
-                       display_login(&buf[4]);
+                       snprintf(WCC->ImportantMessage, 
+                                sizeof (WCC->ImportantMessage), 
+                                "%s", 
+                                &buf[4]);
+                       display_login();
                        return;
                }
        }
        if (havebstr("newuser_action")) {
                if (!havebstr("pass")) {
-                       display_login(_("Blank passwords are not allowed."));
+                       snprintf(WCC->ImportantMessage, 
+                                sizeof (WCC->ImportantMessage), 
+                                "%s", 
+                                _("Blank passwords are not allowed."));
+                       display_login();
                        return;
                }
                serv_printf("NEWU %s", bstr("name"));
@@ -242,105 +229,77 @@ void do_login(void)
                        serv_printf("SETP %s", bstr("pass"));
                        serv_getln(buf, sizeof buf);
                } else {
-                       display_login(&buf[4]);
+                       snprintf(WCC->ImportantMessage, 
+                                sizeof (WCC->ImportantMessage), 
+                                "%s", 
+                                &buf[4]);
+                       display_login();
                        return;
                }
        }
-       if (WC->logged_in) {
-               if (WC->need_regi) {
+       if (WCC->logged_in) {
+               set_preference("language", NewStrBufPlain(bstr("language"), -1), 1);
+               if (WCC->need_regi) {
                        display_reg(1);
+               } else if (WCC->need_vali) {
+                       validate();
                } else {
                        do_welcome();
                }
        } else {
-               display_login(_("Your password was not accepted."));
+               snprintf(WCC->ImportantMessage, 
+                        sizeof (WCC->ImportantMessage), 
+                        "%s", 
+                        _("Your password was not accepted."));
+               display_login();
        }
 
 }
 
-
 /* 
- * Locate a <link> tag and, given its 'rel=' parameter, return its 'href' parameter
+ * Try to create an account manually after an OpenID was verified
  */
-void extract_link(char *target_buf, int target_size, char *rel, char *source_buf)
+void openid_manual_create(void)
 {
-       char *ptr = source_buf;
-
-       if (!target_buf) return;
-       if (!rel) return;
-       if (!source_buf) return;
-
-       target_buf[0] = 0;
-
-       while (ptr = bmstrcasestr(ptr, "<link"), ptr != NULL) {
-
-               char work_buffer[1024];
-               char *link_tag_start = NULL;
-               char *link_tag_end = NULL;
-
-               char rel_tag[1024];
-               char href_tag[1024];
+       char buf[1024];
 
-               link_tag_start = ptr;
-               link_tag_end = strchr(ptr, '>');
-               rel_tag[0] = 0;
-               href_tag[0] = 0;
-
-               if ((link_tag_end) && (link_tag_end > link_tag_start)) {
-                       int len;
-                       len = link_tag_end - link_tag_start;
-                       if (len > sizeof work_buffer) len = sizeof work_buffer;
-                       memcpy(work_buffer, link_tag_start, len);
-               
-                       char *rel_start = NULL;
-                       char *rel_end = NULL;
-                       rel_start = bmstrcasestr(work_buffer, "rel=");
-                       if (rel_start) {
-                               rel_start = strchr(rel_start, '\"');
-                               if (rel_start) {
-                                       ++rel_start;
-                                       rel_end = strchr(rel_start, '\"');
-                                       if ((rel_end) && (rel_end > rel_start)) {
-                                               safestrncpy(rel_tag, rel_start, rel_end - rel_start + 1);
-                                       }
-                               }
-                       }
-
-                       char *href_start = NULL;
-                       char *href_end = NULL;
-                       href_start = bmstrcasestr(work_buffer, "href=");
-                       if (href_start) {
-                               href_start = strchr(href_start, '\"');
-                               if (href_start) {
-                                       ++href_start;
-                                       href_end = strchr(href_start, '\"');
-                                       if ((href_end) && (href_end > href_start)) {
-                                               safestrncpy(href_tag, href_start, href_end - href_start + 1);
-                                       }
-                               }
-                       }
-
-                       if (!strcasecmp(rel, rel_tag)) {
-                               safestrncpy(target_buf, href_tag, target_size);
-                               return;
-                       }
+       if (havebstr("exit_action")) {
+               do_logout();
+               return;
+       }
 
+       if (havebstr("newuser_action")) {
+               serv_printf("OIDC %s", bstr("name"));
+               serv_getln(buf, sizeof buf);
+               if (buf[0] == '2') {
+                       char gpass[1024] = "";
+                       serv_puts("SETP GENERATE_RANDOM_PASSWORD");
+                       serv_getln(gpass, sizeof gpass);
+                       become_logged_in(bstr("name"), &gpass[4], buf);
                }
-
-       ++ptr;
        }
 
+       if (WC->logged_in) {
+               if (WC->need_regi) {
+                       display_reg(1);
+               } else if (WC->need_vali) {
+                       validate();
+               } else {
+                       do_welcome();
+               }
+       } else {
+               display_openid_name_request(bstr("openid_url"), bstr("name"));
+       }
 
 }
 
 
 /* 
  * Perform authentication using OpenID
- * assemble the checkid_immediate request and then redirect to the user's identity provider
+ * assemble the checkid_setup request and then redirect to the user's identity provider
  */
 void do_openid_login(void)
 {
-       int i;
        char buf[4096];
 
        if (havebstr("language")) {
@@ -353,47 +312,22 @@ void do_openid_login(void)
                return;
        }
        if (havebstr("login_action")) {
-               i = fetch_http(bstr("openid_url"), buf, sizeof buf - 1);
-               buf[sizeof buf - 1] = 0;
-               if (i > 0) {
-                       char openid_server[1024];
-                       char openid_delegate[1024];
-                       
-                       extract_link(openid_server, sizeof openid_server, "openid.server", buf);
-                       extract_link(openid_delegate, sizeof openid_delegate, "openid.delegate", buf);
-
-                       /* Empty delegate is legal; we just use the openid_url instead */
-                       if (IsEmptyStr(openid_delegate)) {
-                               safestrncpy(openid_delegate, bstr("openid_url"), sizeof openid_delegate);
-                       }
+               snprintf(buf, sizeof buf,
+                       "OIDS %s|%s://%s/finalize_openid_login|%s://%s",
+                       bstr("openid_url"),
+                       (is_https ? "https" : "http"), WC->http_host,
+                       (is_https ? "https" : "http"), WC->http_host
+               );
 
-                       /* Now we know where to redirect to. */
-
-                       char redirect_string[4096];
-                       char escaped_identity[1024];
-                       char escaped_return_to[1024];
-                       char escaped_trust_root[1024];
-
-                       stresc(escaped_identity, sizeof escaped_identity, openid_delegate, 0, 1);
-
-                       snprintf(buf, sizeof buf, "%s://%s/finish_openid_login",
-                               (is_https ? "https" : "http"), WC->http_host);
-                       stresc(escaped_return_to, sizeof escaped_identity, buf, 0, 1);
-
-                       snprintf(buf, sizeof buf, "%s://%s",
-                               (is_https ? "https" : "http"), WC->http_host);
-                       stresc(escaped_trust_root, sizeof escaped_identity, buf, 0, 1);
-
-                       snprintf(redirect_string, sizeof redirect_string,
-                               "%s"
-                               "?openid.mode=checkid_immediate"
-                               "&openid_identity=%s"
-                               "&openid.return_to=%s"
-                               "&openid.trust_root=%s"
-                               ,
-                               openid_server, escaped_identity, escaped_return_to, escaped_trust_root
-                       );
-                       http_redirect(redirect_string);
+               serv_puts(buf);
+               serv_getln(buf, sizeof buf);
+               if (buf[0] == '2') {
+                       lprintf(CTDL_DEBUG, "OpenID server contacted; redirecting to %s\n", &buf[4]);
+                       http_redirect(&buf[4]);
+                       return;
+               }
+               else {
+                       display_openid_login(&buf[4]);
                        return;
                }
        }
@@ -403,31 +337,95 @@ void do_openid_login(void)
 }
 
 /* 
- * Perform authentication using OpenID
- * assemble the checkid_immediate request and then redirect to the user's identity provider
+ * Complete the authentication using OpenID
+ * This function handles the positive or negative assertion from the user's Identity Provider
  */
-void finish_openid_login(void)
+void finalize_openid_login(void)
 {
-       if (havebstr("openid.user_setup_url")) {
-               http_redirect(bstr("openid.user_setup_url"));
-               return;
-       }
+       char buf[1024];
+       wcsession *WCC = WC;
+       int already_logged_in = (WCC->logged_in) ;
+       int linecount = 0;
+       char result[128] = "";
+       char username[128] = "";
+       char password[128] = "";
+       char logged_in_response[1024] = "";
+       char claimed_id[1024] = "";
 
        if (havebstr("openid.mode")) {
-               if (!strcasecmp(bstr("openid.mode"), "error")) {
-                       if (havebstr("openid.error")) {
-                               display_openid_login(bstr("openid.error"));
-                       }
-                       else {
-                               display_openid_login(_("Your password was not accepted."));
+               if (!strcasecmp(bstr("openid.mode"), "id_res")) {
+
+                       serv_puts("OIDF");
+                       serv_getln(buf, sizeof buf);
+
+                       if (buf[0] == '8') {
+                               urlcontent *u;
+                               void *U;
+                               long HKLen;
+                               const char *HKey;
+                               HashPos *Cursor;
+                               
+                               Cursor = GetNewHashPos (WCC->urlstrings, 0);
+                               while (GetNextHashPos(WCC->urlstrings, Cursor, &HKLen, &HKey, &U)) {
+                                       u = (urlcontent*) U;
+                                       if (!strncasecmp(u->url_key, "openid.", 7)) {
+                                               serv_printf("%s|%s", &u->url_key[7], ChrPtr(u->url_data));
+                                       }
+                               }
+
+                               serv_puts("000");
+
+                               linecount = 0;
+                               while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+                                       if (linecount == 0) safestrncpy(result, buf, sizeof result);
+                                       if (!strcasecmp(result, "authenticate")) {
+                                               if (linecount == 1) {
+                                                       safestrncpy(username, buf, sizeof username);
+                                               }
+                                               else if (linecount == 2) {
+                                                       safestrncpy(password, buf, sizeof password);
+                                               }
+                                               else if (linecount == 3) {
+                                                       safestrncpy(logged_in_response, buf,
+                                                               sizeof logged_in_response);
+                                               }
+                                       }
+                                       else if (!strcasecmp(result, "verify_only")) {
+                                               if (linecount == 1) {
+                                                       safestrncpy(claimed_id, buf, sizeof claimed_id);
+                                               }
+                                               if (linecount == 2) {
+                                                       safestrncpy(username, buf, sizeof username);
+                                               }
+                                       }
+                                       ++linecount;
+                               }
                        }
-                       return;
                }
        }
 
+       /* If we were already logged in, this was an attempt to associate an OpenID account */
+       if (already_logged_in) {
+               display_openids();
+               return;
+       }
+
+       /* If this operation logged us in, either by connecting with an existing account or by
+        * auto-creating one using Simple Registration Extension, we're already on our way.
+        */
+       if (!strcasecmp(result, "authenticate")) {
+               become_logged_in(username, password, logged_in_response);
+       }
 
-       // FIXME finish this
+       /* The specified OpenID was verified but the desired user name was either not specified via SRI
+        * or conflicts with an existing user.  Either way the user will need to specify a new name.
+        */
+
+       else if (!strcasecmp(result, "verify_only")) {
+               display_openid_name_request(claimed_id, username);
+       }
 
+       /* Did we manage to log in?  If so, continue with the normal flow... */
        if (WC->logged_in) {
                if (WC->need_regi) {
                        display_reg(1);
@@ -441,21 +439,15 @@ void finish_openid_login(void)
 }
 
 
-
-
-
-
-
-
 /*
- * display the user a welcome screen.
+ * Display a welcome screen to the user.
  *
- * if this is the first time login, and the web based setup is enabled, 
+ * If this is the first time login, and the web based setup is enabled, 
  * lead the user through the setup routines
  */
 void do_welcome(void)
 {
-       char buf[SIZ];
+       StrBuf *Buf;
 #ifdef XXX_NOT_FINISHED_YET_XXX
        FILE *fp;
        int i;
@@ -497,15 +489,17 @@ void do_welcome(void)
        /*
         * Go to the user's preferred start page
         */
-       get_preference("startpage", buf, sizeof buf);
-       if (IsEmptyStr(buf)) {
-               safestrncpy(buf, "dotskip&room=_BASEROOM_", sizeof buf);
-               set_preference("startpage", buf, 1);
+       if (!get_preference("startpage", &Buf)) {
+               Buf = NewStrBuf ();
+               StrBufPrintf(Buf, "dotskip&room=_BASEROOM_");
+               set_preference("startpage", Buf, 1);
        }
-       if (buf[0] == '/') {
-               strcpy(buf, &buf[1]);
+       if (ChrPtr(Buf)[0] == '/') {
+               StrBufCutLeft(Buf, 1);
        }
-       http_redirect(buf);
+       if (StrLength(Buf) == 0)
+               StrBufAppendBufPlain(Buf, "dotgoto?room=_BASEROOM_", -1, 0);
+       http_redirect(ChrPtr(Buf));
 }
 
 
@@ -513,12 +507,9 @@ void do_welcome(void)
  * Disconnect from the Citadel server, and end this WebCit session
  */
 void end_webcit_session(void) {
-       char buf[256];
-
+       
        if (WC->logged_in) {
-               sprintf(buf, "%d", WC->current_iconbar);
-               set_preference("current_iconbar", buf, 0);
-               set_preference("floordiv_expanded", WC->floordiv_expanded, 1);
+               set_pref_long("current_iconbar", WC->current_iconbar, 0);
        }
 
        serv_puts("QUIT");
@@ -640,8 +631,43 @@ void validate(void)
                        if (a == 1)
                                wprintf("#%s<br /><H1>%s</H1>",
                                        buf, &cmd[4]);
-                       if (a == 2)
-                               wprintf("PW: %s<br />\n", buf);
+                       if (a == 2) {
+                               char *pch;
+                               int haveChar = 0;
+                               int haveNum = 0;
+                               int haveOther = 0;
+                               int count = 0;
+                               pch = buf;
+                               while (!IsEmptyStr(pch))
+                               {
+                                       if (isdigit(*pch))
+                                               haveNum = 1;
+                                       else if (isalpha(*pch))
+                                               haveChar = 1;
+                                       else
+                                               haveOther = 1;
+                                       pch ++;
+                               }
+                               count = pch - buf;
+                               if (count > 7)
+                                       count = 0;
+                               switch (count){
+                               case 0:
+                                       pch = _("very weak");
+                                       break;
+                               case 1:
+                                       pch = _("weak");
+                                       break;
+                               case 2:
+                                       pch = _("ok");
+                                       break;
+                               case 3:
+                               default:
+                                       pch = _("strong");
+                               }
+
+                               wprintf("PW: %s<br />\n", pch);
+                       }
                        if (a == 3)
                                wprintf("%s<br />\n", buf);
                        if (a == 4)
@@ -666,7 +692,7 @@ void validate(void)
        wprintf(_("Select access level for this user:"));
        wprintf("<br />\n");
        for (a = 0; a <= 6; ++a) {
-               wprintf("<a href=\"validate?nonce=%ld?user=", WC->nonce);
+               wprintf("<a href=\"validate?nonce=%d?user=", WC->nonce);
                urlescputs(user);
                wprintf("&axlevel=%d\">%s</A>&nbsp;&nbsp;&nbsp;\n",
                        a, axdefs[a]);
@@ -721,11 +747,13 @@ void display_reg(int during_login)
 void display_changepw(void)
 {
        char buf[SIZ];
-
+       StrBuf *Buf;
        output_headers(1, 1, 1, 0, 0, 0);
 
-       svput("BOXTITLE", WCS_STRING, _("Change your password"));
-       do_template("beginbox");
+       Buf = NewStrBufPlain(_("Change your password"), -1);
+       DoTemplate(HKEY("beginbox"), NULL, Buf, CTX_STRBUF);
+
+       FreeStrBuf(&Buf);
 
        if (!IsEmptyStr(WC->ImportantMessage)) {
                wprintf("<span class=\"errormsg\">"
@@ -740,7 +768,7 @@ void display_changepw(void)
        }
 
        wprintf("<form name=\"changepwform\" action=\"changepw\" method=\"post\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
        wprintf("<table class=\"altern\" ");
        wprintf("<tr class=\"even\"><td>");
        wprintf(_("Enter new password:"));
@@ -759,7 +787,7 @@ void display_changepw(void)
        wprintf("</div>\n");
        wprintf("</form>\n");
 
-       do_template("endbox");
+       do_template("endbox", NULL);
        wDumpContent(1);
 }
 
@@ -811,10 +839,48 @@ void changepw(void)
        }
 }
 
+int ConditionalAide(WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+       return (WC->is_aide == 0);
+}
+
+int ConditionalRoomAide(WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+       return (WC->is_room_aide == 0);
+}
+
+int ConditionalRoomAcessDelete(WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+       wcsession *WCC = WC;
+       return ( (WCC->is_room_aide) || (WCC->is_mailbox) || (WCC->room_flags2 & QR2_COLLABDEL) );
+}
 
 
-void InitModule_AUTH(void)
+
+void _display_openid_login(void) {display_openid_login(NULL);}
+void _display_reg(void) {display_reg(0);}
+
+
+void 
+InitModule_AUTH
+(void)
 {
-       WebcitAddUrlHandler(HKEY("do_welcome"), do_welcome, 0);
+       WebcitAddUrlHandler(HKEY("do_welcome"), do_welcome, ANONYMOUS);
+       WebcitAddUrlHandler(HKEY("login"), do_login, ANONYMOUS);
+       WebcitAddUrlHandler(HKEY("display_openid_login"), _display_openid_login, ANONYMOUS);
+       WebcitAddUrlHandler(HKEY("openid_login"), do_openid_login, ANONYMOUS);
+       WebcitAddUrlHandler(HKEY("finalize_openid_login"), finalize_openid_login, ANONYMOUS);
+       WebcitAddUrlHandler(HKEY("openid_manual_create"), openid_manual_create, ANONYMOUS);
+       WebcitAddUrlHandler(HKEY("do_logout"), do_logout, 0);
+       WebcitAddUrlHandler(HKEY("validate"), validate, 0);
+       WebcitAddUrlHandler(HKEY("display_reg"), _display_reg, 0);
+       WebcitAddUrlHandler(HKEY("display_changepw"), display_changepw, 0);
+       WebcitAddUrlHandler(HKEY("changepw"), changepw, 0);
+       WebcitAddUrlHandler(HKEY("termquit"), do_logout, 0);
+
+       RegisterConditional(HKEY("COND:AIDE"), 2, ConditionalAide, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOMAIDE"), 2, ConditionalRoomAide, CTX_NONE);
+       RegisterConditional(HKEY("COND:ACCESS:DELETE"), 2, ConditionalRoomAcessDelete, CTX_NONE);
+
        return ;
 }