Moved a variable off the stack and into session state

[citadel.git] / citadel / modules / openid / serv_openid_rp.c

diff --git a/citadel/modules/openid/serv_openid_rp.c b/citadel/modules/openid/serv_openid_rp.c
index bb0734b4c4b02250e02cebd2e0d8043f4c8ac4a3..c6765517f20d7db1b450d53a84b5affd4c03a42e 100644 (file)
--- a/citadel/modules/openid/serv_openid_rp.c
+++ b/citadel/modules/openid/serv_openid_rp.c
@@ -36,9 +36,59 @@
 struct ctdl_openid {
        char claimed_id[1024];
        char server[1024];
+       int validated;
 };
 
 
+
+
+
+/**************************************************************************/
+/*                                                                        */
+/* Functions in this section handle Citadel internal OpenID mapping stuff */
+/*                                                                        */
+/**************************************************************************/
+
+
+/*
+ * Attach or detach an OpenID to a Citadel account
+ */
+
+enum {
+       moa_detach,
+       moa_attach
+};
+
+int modify_openid_associations(struct ctdluser *who, char *claimed_id, int operation)
+{
+       if (!who) return(1);
+       if (!claimed_id) return(1);
+       if (IsEmptyStr(claimed_id)) return(1);
+
+       return(2);              // error because we are not done yet FIXME
+}
+
+
+/*
+ * When a user is being deleted, we have to delete any OpenID associations
+ */
+void openid_purge(struct ctdluser *usbuf) {
+       /* FIXME finish this */
+}
+
+
+
+
+
+
+
+/**************************************************************************/
+/*                                                                        */
+/* Functions in this section handle OpenID protocol                       */
+/*                                                                        */
+/**************************************************************************/
+
+
 /* 
  * Locate a <link> tag and, given its 'rel=' parameter, return its 'href' parameter
  */
@@ -203,10 +253,14 @@ void cmd_oids(char *argbuf) {
        struct CitContext *CCC = CC;    /* CachedCitContext - performance boost */
        struct ctdl_openid *oiddata;
 
+       /* commented out because we may be attempting to attach an OpenID to
+        * an existing account that is logged in
+        *
        if (CCC->logged_in) {
                cprintf("%d Already logged in.\n", ERROR + ALREADY_LOGGED_IN);
                return;
        }
+        */
 
        if (CCC->openid_data != NULL) {
                free(CCC->openid_data);
@@ -222,6 +276,7 @@ void cmd_oids(char *argbuf) {
        extract_token(oiddata->claimed_id, argbuf, 0, '|', sizeof oiddata->claimed_id);
        extract_token(return_to, argbuf, 1, '|', sizeof return_to);
        extract_token(trust_root, argbuf, 2, '|', sizeof trust_root);
+       oiddata->validated = 0;
 
        i = fetch_http(oiddata->claimed_id, buf, sizeof buf - 1, sizeof oiddata->claimed_id);
        CtdlLogPrintf(CTDL_DEBUG, "Normalized URL and Claimed ID is: %s\n", oiddata->claimed_id);
@@ -329,8 +384,8 @@ void cmd_oidf(char *argbuf) {
        char k_keyname[128];
        char k_o_keyname[128];
        char *k_value = NULL;
-
        char valbuf[1024];
+
        struct fh_data fh = {
                valbuf,
                0,
@@ -408,17 +463,36 @@ void cmd_oidf(char *argbuf) {
        curl_formfree(formpost);
 
        valbuf[fh.total_bytes_received] = 0;
+
        if (bmstrcasestr(valbuf, "is_valid:true")) {
-               CtdlLogPrintf(CTDL_DEBUG, "\e[32mVALIDATION SUCCEEDED!!  WOWOWOWWW!!\e[0m\n", valbuf);
-       }
-       else {
-               CtdlLogPrintf(CTDL_DEBUG, "\e[31mVALIDATION FAILED.  DIACF.\e[0m\n", valbuf);
+               oiddata->validated = 1;
        }
 
-       /* FIXME do something with the results */
+       CtdlLogPrintf(CTDL_DEBUG, "Authentication %s.\n", (oiddata->validated ? "succeeded" : "failed") );
 
        /* Respond to the client */
-       cprintf("message|FIXME finish this\n");
+
+       if (oiddata->validated) {
+
+               /* If we were already logged in, attach the OpenID to the user's account */
+               if (CC->logged_in) {
+                       if (modify_openid_associations(&CC->user, oiddata->claimed_id, moa_attach) == 0) {
+                               cprintf("attach\n");
+                       }
+                       else {
+                               cprintf("fail\n");
+                       }
+               }
+
+               /* Otherwise, a user is attempting to log in using the validated OpenID */      
+               else {
+                       cprintf("fail\n");              // FIXME do the login here!!
+               }
+
+       }
+       else {
+               cprintf("fail\n");
+       }
        cprintf("000\n");
 
        /* Free the hash list */
@@ -448,6 +522,15 @@ void cmd_oidf(char *argbuf) {
 // sig = [28]  vixxxU4MAqWfxxxxCfrHv3TxxxhEw=
 
 
+
+
+/**************************************************************************/
+/*                                                                        */
+/* Functions in this section handle module initialization and shutdown    */
+/*                                                                        */
+/**************************************************************************/
+
+
 /*
  * This cleanup function blows away the temporary memory used by this module.
  */
@@ -459,7 +542,6 @@ void openid_cleanup_function(void) {
 }
 
 
-
 CTDL_MODULE_INIT(openid_rp)
 {
        if (!threading)
@@ -468,6 +550,7 @@ CTDL_MODULE_INIT(openid_rp)
                CtdlRegisterProtoHook(cmd_oids, "OIDS", "Setup OpenID authentication");
                CtdlRegisterProtoHook(cmd_oidf, "OIDF", "Finalize OpenID authentication");
                CtdlRegisterSessionHook(openid_cleanup_function, EVT_STOP);
+               CtdlRegisterUserHook(openid_purge, EVT_PURGEUSER);
        }
 
        /* return our Subversion id for the Log */