]> code.citadel.org Git - citadel.git/blobdiff - webcit/auth.c
Success! We can now log in an existing user with OpenID.
[citadel.git] / webcit / auth.c
index 5a0d14595946be77f85ef727d651c405d26f5cef..96503c1a7f33c5608694336a567d06b8dc5bb701 100644 (file)
@@ -5,22 +5,22 @@
  */
 
 #include "webcit.h"
+#include "webserver.h"
 
 /*
- * 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 */
 }
 
 
@@ -78,13 +78,20 @@ void display_login(char *mesg)
                svput("NEWUSER_BUTTON_POST", WCS_STRING, "");
        }
 
-#ifdef TECH_PREVIEW
-               svprintf(HKEY("OFFER_OPENID_LOGIN"), WCS_STRING, "<a href=\"display_openid_login\">%s</a>",
-                       "Click here to login with OpenID"       // FIXME localize when ready
+       if (1) {        // FIXME we have to check whether the server offers openid
+               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
+       }
+       else {
                svput("OFFER_OPENID_LOGIN", WCS_STRING, "");
-#endif
+       }
 
        do_template("login");
 
@@ -131,6 +138,15 @@ void display_openid_login(char *mesg)
                serv_info.serv_humannode);
        svcallback("DO_LANGUAGE_BOX", offer_languages);
 
+       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"
+       );
+
        do_template("openid_login");
        wDumpContent(2);
 }
@@ -182,8 +198,7 @@ void become_logged_in(char *user, char *pass, char *serv_response)
 
 
 /* 
- * 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)
 {
@@ -235,6 +250,8 @@ void do_login(void)
        if (WC->logged_in) {
                if (WC->need_regi) {
                        display_reg(1);
+               } else if (WC->need_vali) {
+                       validate();
                } else {
                        do_welcome();
                }
@@ -244,10 +261,143 @@ void do_login(void)
 
 }
 
+
+/* 
+ * 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)
+{
+       char buf[1024];
+       struct wcsession *WCC = WC;
+       int already_logged_in = (WCC->logged_in) ;
+       int linecount = 0;
+       char result[128] = "";
+       char username[128] = "";
+       char password[128] = "";
+
+       if (havebstr("openid.mode")) {
+               if (!strcasecmp(bstr("openid.mode"), "id_res")) {
+
+                       // FIXME id accepted but the code isn't finished
+                       serv_puts("OIDF");
+                       serv_getln(buf, sizeof buf);
+
+                       if (buf[0] == '8') {
+                               urlcontent *u;
+                               void *U;
+                               long HKLen;
+                               char *HKey;
+                               HashPos *Cursor;
+                               
+                               Cursor = GetNewHashPos ();
+                               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], 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);
+                                               }
+                                       }
+                                       ++linecount;
+                               }
+                       }
+               }
+       }
+
+       /* If we were already logged in, this was an attempt to associate an OpenID account */
+       if (already_logged_in) {
+               display_openids();
+               return;
+       }
+
+       /* Was the claimed ID associated with an existing account?  Then log in that account now. */
+       if (!strcasecmp(result, "authenticate")) {
+               serv_printf("USER %s", username);
+               serv_getln(buf, sizeof buf);
+               if (buf[0] == '3') {
+                       serv_printf("PASS %s", password);
+                       serv_getln(buf, sizeof buf);
+                       if (buf[0] == '2') {
+                               become_logged_in(username, password, buf);
+                       }
+               }
+       }
+
+       /* FIXME -- right here we have to put the code to log in a new user */
+
+       /* Did we manage to log in?  If so, continue with the normal flow... */
+       if (WC->logged_in) {
+               if (WC->need_regi) {
+                       display_reg(1);
+               } else {
+                       do_welcome();
+               }
+       } else {
+               display_openid_login(_("Your password was not accepted."));
+       }
+
+}
+
+
 /*
- * 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)