]> code.citadel.org Git - citadel.git/blobdiff - webcit/auth.c
Added some glue code for attachment of an OpenID to
[citadel.git] / webcit / auth.c
index 620f9869e94b34e9ef6654b54894475d562a8e5b..b923dd9dbdbcd77f172b7e91ebcd325e1339fc1e 100644 (file)
@@ -249,6 +249,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();
                }
@@ -259,45 +261,12 @@ void do_login(void)
 }
 
 
-/*
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<html>
-<head>
-  <link rel="openid.server" href="http://uncensored.citadel.org/~ajc/MyID.config.php">
-  <link rel="openid.delegate" href="http://uncensored.citadel.org/~ajc/MyID.config.php">
-  <title>IGnatius T Foobar</title>
-</head>
-<body text="#00ff00" bgcolor="#000000" link="#ffff00">
-
-*/
-
-
-
-/* 
- * Locate a <link> tag and, given its 'rel=' parameter, return its 'href' parameter
- */
-void extract_link(char *target_buf, int target_size, char *rel, char *source_buf)
-{
-       char *ptr = source_buf;
-
-       while (ptr = bmstrcasestr(ptr, "<link"), ptr != NULL) {
-
-       lprintf(9, "Got something\n", ptr);             // FIXME
-
-       ++ptr;
-       }
-
-
-}
-
-
 /* 
  * Perform authentication using OpenID
+ * 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")) {
@@ -310,20 +279,78 @@ 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);
-
-                       lprintf(9, "  Server: %s\n", openid_server);
-                       lprintf(9, "Delegate: %s\n", openid_delegate);
-                       // FIXME finish this
+               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) ;
+
+       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");
+
+                               while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+                                       // FIXME
+                               }
+                       }
+               }
+       }
+
+       /* If we were already logged in, this was an attempt to associate an OpenID account */
+       if (already_logged_in) {
+               display_openids();
+               return;
+       }
+
+       /* Otherwise the user is probably attempting to log in using OpenID */
        if (WC->logged_in) {
                if (WC->need_regi) {
                        display_reg(1);
@@ -337,16 +364,10 @@ void do_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)