* move some more vars from the session context to strbuf (the use of StrBufAppendTemp...
[citadel.git] / webcit / auth.c
index 2ee1bdd4119d6865863df2cbc7805911cd822304..77dc5c4752bc3224074d52e72356c5ec09a01574 100644 (file)
@@ -5,22 +5,26 @@
  */
 
 #include "webcit.h"
+#include "webserver.h"
+#include <ctype.h>
+
+
+void display_reg(int during_login);
 
 /*
- * user states
- * the plain text states of a user. filled in at \ function TODO initialize_ax_defs()
- * due to NLS
+ * Access level definitions.  This is initialized from a function rather than a
+ * static array so that the strings may be localized.
  */
 char *axdefs[7]; 
 
 void initialize_axdefs(void) {
-       axdefs[0] = _("Deleted");       /*!0: an erased user */
-       axdefs[1] = _("New User");      /*!1: a new user */
-       axdefs[2] = _("Problem User");  /*!2: a trouble maker */
-       axdefs[3] = _("Local User");    /*!3: user with normal privileges */
-       axdefs[4] = _("Network User");  /*!4: a user that may access network resources */
-       axdefs[5] = _("Preferred User");/*!5: a moderator */
-       axdefs[6] = _("Aide");          /*!6: chief */
+       axdefs[0] = _("Deleted");       /* an erased user */
+       axdefs[1] = _("New User");      /* a new user */
+       axdefs[2] = _("Problem User");  /* a trouble maker */
+       axdefs[3] = _("Local User");    /* user with normal privileges */
+       axdefs[4] = _("Network User");  /* a user that may access network resources */
+       axdefs[5] = _("Preferred User");/* a moderator */
+       axdefs[6] = _("Aide");          /* chief */
 }
 
 
@@ -30,62 +34,104 @@ 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)
+{
+       begin_burst();
+       output_headers(1, 0, 0, 0, 1, 0);
+       do_template("login", NULL);
+       end_burst();
+}
+
+
+
+
+/* 
+ * Display the openid-enabled login screen
+ * mesg = the error message if last attempt failed.
+ */
+void display_openid_login(char *mesg)
 {
        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("mesg", WCS_STRING, "%s", buf);
+       if ((mesg != NULL) && (!IsEmptyStr(mesg))) {
+               stresc(buf, SIZ,  mesg, 0, 0);
+               svprintf(HKEY("MESG"), WCS_STRING, "%s", buf);
        }
 
-       svprintf("LOGIN_INSTRUCTIONS", WCS_STRING,
+       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>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>. "
                "<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
+               "</ul>")
+       );
+
+       svput("HELLO", WCS_SERVCMD, "MESG hello");
+       
+       svprintf(HKEY("OFFER_CONVENTIONAL_LOGIN"), WCS_STRING,
+               "<div align=center>"
+               "<a href=\"display_login\">"
+               "%s</a>"
+               "</div>"
+               ,
+               "Log in using a user name and password"
        );
 
-       svprintf("USERNAME_BOX", WCS_STRING, "%s", _("User name:"));
-       svprintf("PASSWORD_BOX", WCS_STRING, "%s", _("Password:"));
-       svprintf("LANGUAGE_BOX", WCS_STRING, "%s", _("Language:"));
-       svprintf("LOGIN_BUTTON", WCS_STRING, "%s", _("Login"));
-       svprintf("NEWUSER_BUTTON", WCS_STRING, "%s", _("New User"));
-       svprintf("EXIT_BUTTON", WCS_STRING, "%s", _("Exit"));
-       svprintf("hello", WCS_SERVCMD, "MESG hello");
-       svprintf("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) {
-               svprintf("NEWUSER_BUTTON_PRE", WCS_STRING, "<div style=\"display:none;\">");
-               svprintf("NEWUSER_BUTTON_POST", WCS_STRING, "</div>");
+       do_template("openid_login", NULL);
+       wDumpContent(2);
+}
+
+
+void display_openid_name_request(const StrBuf *claimed_id, const StrBuf *username) 
+{
+       StrBuf *Buf = NULL;
+
+       output_headers(1, 1, 2, 0, 0, 0);
+       wprintf("<div id=\"login_screen\">\n");
+
+       Buf = NewStrBufPlain(NULL, StrLength(claimed_id));
+       StrEscAppend(Buf, claimed_id, NULL, 0, 0);
+       svprintf(HKEY("VERIFIED"), WCS_STRING, _("Your OpenID <tt>%s</tt> was successfully verified."),
+                ChrPtr(Buf));
+       SVPutBuf("CLAIMED_ID", Buf, 0);
+
+
+       if (StrLength(username) > 0) {
+                       Buf = NewStrBufPlain(NULL, StrLength(username));
+                       StrEscAppend(Buf, claimed_id, NULL, 0, 0);
+                       svprintf(HKEY("REASON"), WCS_STRING,
+                                _("However, the user name '%s' conflicts with an existing user."), 
+                                ChrPtr(Buf));
+                       FreeStrBuf(&Buf);
        }
        else {
-               svprintf("NEWUSER_BUTTON_PRE", WCS_STRING, "");
-               svprintf("NEWUSER_BUTTON_POST", WCS_STRING, "");
+               svput("REASON", WCS_STRING, "");
        }
 
-       do_template("login");
+       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>"),
+                ChrPtr(serv_info.serv_humannode));
 
+       do_template("openid_manual_create", NULL);
        wDumpContent(2);
 }
 
 
 
-
 /* Initialize the session
  *
  * This function needs to get called whenever the session changes from
@@ -98,17 +144,36 @@ void display_login(char *mesg)
  * pass                        his password
  * serv_response       The parameters returned from a Citadel USER or NEWU command
  */
-void become_logged_in(char *user, char *pass, char *serv_response)
+void become_logged_in(const StrBuf *user, const StrBuf *pass, StrBuf *serv_response)
 {
+       wcsession *WCC = WC;
        char buf[SIZ];
+       StrBuf *FloorDiv;
 
        WC->logged_in = 1;
-       extract_token(WC->wc_fullname, &serv_response[4], 0, '|', sizeof WC->wc_fullname);
-       safestrncpy(WC->wc_username, user, sizeof WC->wc_username);
-       safestrncpy(WC->wc_password, pass, sizeof WC->wc_password);
-       WC->axlevel = extract_int(&serv_response[4], 1);
-       if (WC->axlevel >= 6) {
-               WC->is_aide = 1;
+
+       if (WCC->wc_fullname == NULL)
+               WCC->wc_fullname = NewStrBufPlain(NULL, StrLength(serv_response));
+       StrBufExtract_token(WCC->wc_fullname, serv_response, 0, '|');
+       StrBufCutLeft(WCC->wc_fullname, 4 );
+       
+       if (WCC->wc_username == NULL)
+               WCC->wc_username = NewStrBufDup(user);
+       else {
+               FlushStrBuf(WCC->wc_username);
+               StrBufAppendBuf(WCC->wc_username, user, 0);
+       }
+
+       if (WCC->wc_password == NULL)
+               WCC->wc_password = NewStrBufDup(pass);
+       else {
+               FlushStrBuf(WCC->wc_password);
+               StrBufAppendBuf(WCC->wc_password, pass, 0);
+       }
+
+       WCC->axlevel = StrBufExtract_int(serv_response, 1, '|');
+       if (WCC->axlevel >= 6) { /* TODO: make this a define, else it might trick us later */
+               WCC->is_aide = 1;
        }
 
        load_preferences();
@@ -122,20 +187,20 @@ 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;
 }
 
 
 /* 
- * Login Checks
- * the logic to detect invalid passwords not to get on citservers nerves
+ * Perform authentication using a user name and password
  */
 void do_login(void)
 {
-       char buf[SIZ];
+       wcsession *WCC = WC;
+       StrBuf *Buf;
 
        if (havebstr("language")) {
                set_selected_language(bstr("language"));
@@ -146,40 +211,262 @@ void do_login(void)
                do_logout();
                return;
        }
+       Buf = NewStrBuf();
        if (havebstr("login_action")) {
                serv_printf("USER %s", bstr("name"));
-               serv_getln(buf, sizeof buf);
-               if (buf[0] == '3') {
+               StrBuf_ServGetln(Buf);
+               if (GetServerStatus(Buf, NULL) == 3) {
                        serv_printf("PASS %s", bstr("pass"));
-                       serv_getln(buf, sizeof buf);
-                       if (buf[0] == '2') {
-                               become_logged_in(bstr("name"),
-                                                bstr("pass"), buf);
+                       StrBuf_ServGetln(Buf);
+                       if (GetServerStatus(Buf, NULL) == 2) {
+                               become_logged_in(sbstr("name"), sbstr("pass"), Buf);
                        } else {
-                               display_login(&buf[4]);
+                               snprintf(WCC->ImportantMessage, 
+                                        sizeof (WCC->ImportantMessage), 
+                                        "%s", 
+                                        &(ChrPtr(Buf))[4]);
+                               display_login();
+                               FreeStrBuf(&Buf);
                                return;
                        }
                } else {
-                       display_login(&buf[4]);
+                       snprintf(WCC->ImportantMessage, 
+                                sizeof (WCC->ImportantMessage), 
+                                "%s", 
+                                &(ChrPtr(Buf))[4]);
+                       display_login();
+                       FreeStrBuf(&Buf);
                        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();
+                       FreeStrBuf(&Buf);
                        return;
                }
                serv_printf("NEWU %s", bstr("name"));
-               serv_getln(buf, sizeof buf);
-               if (buf[0] == '2') {
-                       become_logged_in(bstr("name"), bstr("pass"), buf);
+               StrBuf_ServGetln(Buf);
+               if (GetServerStatus(Buf, NULL) == 2) {
+                       become_logged_in(sbstr("name"), sbstr("pass"), Buf);
                        serv_printf("SETP %s", bstr("pass"));
-                       serv_getln(buf, sizeof buf);
+                       StrBuf_ServGetln(Buf); /* Don't care? */
+               } else {
+                       snprintf(WCC->ImportantMessage, 
+                                sizeof (WCC->ImportantMessage), 
+                                "%s", 
+                                &(ChrPtr(Buf))[4]);
+                       display_login();
+                       FreeStrBuf(&Buf);
+                       return;
+               }
+       }
+       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 {
+               snprintf(WCC->ImportantMessage, 
+                        sizeof (WCC->ImportantMessage), 
+                        "%s", 
+                        _("Your password was not accepted."));
+               display_login();
+       }
+       FreeStrBuf(&Buf);
+}
+
+/* 
+ * Try to create an account manually after an OpenID was verified
+ */
+void openid_manual_create(void)
+{
+       StrBuf *Buf;
+
+       if (havebstr("exit_action")) {
+               do_logout();
+               return;
+       }
+
+       if (havebstr("newuser_action")) {
+               Buf = NewStrBuf();
+               serv_printf("OIDC %s", bstr("name"));
+               StrBuf_ServGetln(Buf);
+               if (GetServerStatus(Buf, NULL) == 2) {
+                       StrBuf *gpass;
+
+                       gpass = NewStrBuf();
+                       serv_puts("SETP GENERATE_RANDOM_PASSWORD");
+                       StrBuf_ServGetln(gpass);
+                       StrBufCutLeft(gpass, 4);
+                       become_logged_in(sbstr("name"), gpass, Buf);
+                       FreeStrBuf(&gpass);
+               }
+               FreeStrBuf(&Buf);
+       }
+
+       if (WC->logged_in) {
+               if (WC->need_regi) {
+                       display_reg(1);
+               } else if (WC->need_vali) {
+                       validate();
                } else {
-                       display_login(&buf[4]);
+                       do_welcome();
+               }
+       } else {
+               display_openid_name_request(sbstr("openid_url"), sbstr("name"));
+       }
+
+}
+
+
+/* 
+ * Perform authentication using OpenID
+ * assemble the checkid_setup request and then redirect to the user's identity provider
+ */
+void do_openid_login(void)
+{
+       char buf[4096];
+
+       if (havebstr("language")) {
+               set_selected_language(bstr("language"));
+               go_selected_language();
+       }
+
+       if (havebstr("exit_action")) {
+               do_logout();
+               return;
+       }
+       if (havebstr("login_action")) {
+               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
+               );
+
+               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;
                }
        }
+
+       /* If we get to this point then something failed. */
+       display_openid_login(_("Your password was not accepted."));
+}
+
+/* 
+ * Complete the authentication using OpenID
+ * This function handles the positive or negative assertion from the user's Identity Provider
+ */
+void finalize_openid_login(void)
+{
+       StrBuf *Buf;
+       wcsession *WCC = WC;
+       int already_logged_in = (WCC->logged_in) ;
+       int linecount = 0;
+       StrBuf *result = NULL;
+       StrBuf *username = NULL;
+       StrBuf *password = NULL;
+       StrBuf *logged_in_response = NULL;
+       StrBuf *claimed_id = NULL;
+
+       if (havebstr("openid.mode")) {
+               if (!strcasecmp(bstr("openid.mode"), "id_res")) {
+                       Buf = NewStrBuf();
+                       serv_puts("OIDF");
+                       StrBuf_ServGetln(Buf);
+                       if (GetServerStatus(Buf, NULL) == 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 (StrBuf_ServGetln(Buf), 
+                                      (StrLength(Buf)==3) && 
+                                      !strcmp(ChrPtr(Buf), "000")) 
+                               {
+                                       if (linecount == 0) result = NewStrBufDup(Buf);
+                                       if (!strcasecmp(ChrPtr(result), "authenticate")) {
+                                               if (linecount == 1) {
+                                                       username = NewStrBufDup(Buf);
+                                               }
+                                               else if (linecount == 2) {
+                                                       password = NewStrBufDup(Buf);
+                                               }
+                                               else if (linecount == 3) {
+                                                       logged_in_response = NewStrBufDup(Buf);
+                                               }
+                                       }
+                                       else if (!strcasecmp(ChrPtr(result), "verify_only")) {
+                                               if (linecount == 1) {
+                                                       claimed_id = NewStrBufDup(Buf);
+                                               }
+                                               if (linecount == 2) {
+                                                       username = NewStrBufDup(Buf);
+                                               }
+                                       }
+                                       ++linecount;
+                               }
+                       }
+                       FreeStrBuf(&Buf);
+               }
+       }
+
+       /* If we were already logged in, this was an attempt to associate an OpenID account */
+       if (already_logged_in) {
+               display_openids();
+               FreeStrBuf(&result);
+               FreeStrBuf(&username);
+               FreeStrBuf(&password);
+               FreeStrBuf(&claimed_id);
+               FreeStrBuf(&logged_in_response);
+               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(ChrPtr(result), "authenticate")) {
+               become_logged_in(username, password, logged_in_response);
+       }
+
+       /* 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(ChrPtr(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);
@@ -187,20 +474,26 @@ void do_login(void)
                        do_welcome();
                }
        } else {
-               display_login(_("Your password was not accepted."));
+               display_openid_login(_("Your password was not accepted."));
        }
 
+       FreeStrBuf(&result);
+       FreeStrBuf(&username);
+       FreeStrBuf(&password);
+       FreeStrBuf(&claimed_id);
+       FreeStrBuf(&logged_in_response);
 }
 
+
 /*
- * 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;
@@ -242,15 +535,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));
 }
 
 
@@ -258,12 +553,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");
@@ -278,10 +570,10 @@ void do_logout(void)
 {
        char buf[SIZ];
 
-       safestrncpy(WC->wc_username, "", sizeof WC->wc_username);
-       safestrncpy(WC->wc_password, "", sizeof WC->wc_password);
-       safestrncpy(WC->wc_roomname, "", sizeof WC->wc_roomname);
-       safestrncpy(WC->wc_fullname, "", sizeof WC->wc_fullname);
+       FlushStrBuf(WC->wc_username);
+       FlushStrBuf(WC->wc_password);
+       FlushStrBuf(WC->wc_roomname);
+       FlushStrBuf(WC->wc_fullname);
 
        /** Calling output_headers() this way causes the cookies to be un-set */
        output_headers(1, 1, 0, 1, 0, 0);
@@ -385,8 +677,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)
@@ -411,7 +738,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]);
@@ -441,7 +768,7 @@ void display_reg(int during_login)
                return;
        }
 
-       vcard_msgnum = locate_user_vcard(WC->wc_fullname, -1);
+       vcard_msgnum = locate_user_vcard_in_this_room();
        if (vcard_msgnum < 0L) {
                if (during_login) do_welcome();
                else display_main_menu();
@@ -465,12 +792,18 @@ void display_reg(int during_login)
  */
 void display_changepw(void)
 {
+       WCTemplputParams SubTP;
        char buf[SIZ];
-
+       StrBuf *Buf;
        output_headers(1, 1, 1, 0, 0, 0);
 
-       svprintf("BOXTITLE", WCS_STRING, _("Change your password"));
-       do_template("beginbox");
+       Buf = NewStrBufPlain(_("Change your password"), -1);
+       memset(&SubTP, 0, sizeof(WCTemplputParams));
+       SubTP.ContextType = CTX_STRBUF;
+       SubTP.Context = Buf;
+       DoTemplate(HKEY("beginbox"), NULL, &SubTP);
+
+       FreeStrBuf(&Buf);
 
        if (!IsEmptyStr(WC->ImportantMessage)) {
                wprintf("<span class=\"errormsg\">"
@@ -485,7 +818,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:"));
@@ -504,7 +837,7 @@ void display_changepw(void)
        wprintf("</div>\n");
        wprintf("</form>\n");
 
-       do_template("endbox");
+       do_template("endbox", NULL);
        wDumpContent(1);
 }
 
@@ -548,7 +881,12 @@ void changepw(void)
        serv_getln(buf, sizeof buf);
        sprintf(WC->ImportantMessage, "%s", &buf[4]);
        if (buf[0] == '2') {
-               safestrncpy(WC->wc_password, buf, sizeof WC->wc_password);
+               if (WC->wc_password == NULL)
+                       WC->wc_password = NewStrBufPlain(buf, -1);
+               else {
+                       FlushStrBuf(WC->wc_password);
+                       StrBufAppendBufPlain(WC->wc_password,  buf, -1, 0);
+               }
                display_main_menu();
        }
        else {
@@ -556,10 +894,48 @@ void changepw(void)
        }
 }
 
+int ConditionalAide(StrBuf *Target, WCTemplputParams *TP)
+{
+       return (WC->is_aide == 0);
+}
+
+int ConditionalRoomAide(StrBuf *Target, WCTemplputParams *TP)
+{
+       return (WC->is_room_aide == 0);
+}
+
+int ConditionalRoomAcessDelete(StrBuf *Target, WCTemplputParams *TP)
+{
+       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 ;
 }