Ripped out the OpenID 1.1 signature validation code. OpenID 2.0 does this differently.
[citadel.git] / citadel / modules / openid / serv_openid_rp.c
index 7feb11336c4e9c242a371d9dac0177dd316d8c70..1d80c5dcccbaf18bd41e3e1659c7abd0de39b915 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * This is an implementation of OpenID 2.0 RELYING PARTY SUPPORT CURRENTLY B0RKEN AND BEING DEVEL0PZ0RED
+ * This is an implementation of OpenID 2.0 relying party support in stateless mode.
  *
  * Copyright (c) 2007-2011 by the citadel.org team
  *
 #include "user_ops.h"
 
 typedef struct _ctdl_openid {
-       StrBuf *claimed_id;
-       StrBuf *server;
+       StrBuf *op_url;                 /* OpenID Provider Endpoint URL */
+       StrBuf *claimed_id;             /* Claimed Identifier */
        int verified;
        HashList *sreg_keys;
 } ctdl_openid;
 
+enum {
+       openid_disco_none,
+       openid_disco_xrds,
+       openid_disco_html
+};
+
+
 void Free_ctdl_openid(ctdl_openid **FreeMe)
 {
-       if (*FreeMe == NULL)
+       if (*FreeMe == NULL) {
                return;
+       }
+       FreeStrBuf(&(*FreeMe)->op_url);
        FreeStrBuf(&(*FreeMe)->claimed_id);
-       FreeStrBuf(&(*FreeMe)->server);
        DeleteHash(&(*FreeMe)->sreg_keys);
        free(*FreeMe);
        *FreeMe = NULL;
@@ -339,12 +347,7 @@ void populate_vcard_from_sreg(HashList *sreg_keys) {
 void cmd_oidc(char *argbuf) {
        ctdl_openid *oiddata = (ctdl_openid *) CC->openid_data;
 
-       if (!oiddata) {
-               cprintf("%d You have not verified an OpenID yet.\n", ERROR);
-               return;
-       }
-
-       if (!oiddata->verified) {
+       if ( (!oiddata) || (!oiddata->verified) ) {
                cprintf("%d You have not verified an OpenID yet.\n", ERROR);
                return;
        }
@@ -402,7 +405,6 @@ void cmd_oidd(char *argbuf) {
 }
 
 
-
 /*
  * Attempt to auto-create a new Citadel account using the nickname from Simple Registration Extension
  */
@@ -582,46 +584,15 @@ CURL *ctdl_openid_curl_easy_init(char *errmsg) {
 }
 
 
-/*
- * Begin an HTTP fetch (returns number of bytes actually fetched, or -1 for error) using libcurl.
- */
-int fetch_http(StrBuf *url, StrBuf **target_buf)
-{
-       StrBuf *ReplyBuf;
-       CURL *curl;
-       CURLcode result;
-       char *effective_url = NULL;
-       char errmsg[1024] = "";
-
-       if (StrLength(url) <=0 ) return(-1);
-       ReplyBuf = *target_buf = NewStrBuf ();
-       if (ReplyBuf == 0) return(-1);
-
-       curl = ctdl_openid_curl_easy_init(errmsg);
-       if (!curl) return(-1);
-
-       curl_easy_setopt(curl, CURLOPT_URL, ChrPtr(url));
-       curl_easy_setopt(curl, CURLOPT_WRITEDATA, ReplyBuf);
-       curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, CurlFillStrBuf_callback);
-
-       result = curl_easy_perform(curl);
-       if (result) {
-               syslog(LOG_DEBUG, "libcurl error %d: %s", result, errmsg);
-       }
-       curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &effective_url);
-       StrBufPlain(url, effective_url, -1);
-       
-       curl_easy_cleanup(curl);
-       return StrLength(ReplyBuf);
-}
-
-
-
 struct xrds {
+       StrBuf *CharData;
        int nesting_level;
        int in_xrd;
        int current_service_priority;
-       int selected_service_priority;  /* more here later */
+       int selected_service_priority;
+       StrBuf *current_service_uri;
+       StrBuf *selected_service_uri;
+       int current_service_is_oid2auth;
 };
 
 
@@ -633,17 +604,19 @@ void xrds_xml_start(void *data, const char *supplied_el, const char **attr) {
 
        if (!strcasecmp(supplied_el, "XRD")) {
                ++xrds->in_xrd;
-               syslog(LOG_DEBUG, "*** XRD CONTAINER BEGIN ***");
        }
 
        else if (!strcasecmp(supplied_el, "service")) {
                xrds->current_service_priority = 0;
+               xrds->current_service_is_oid2auth = 0;
                for (i=0; attr[i] != NULL; i+=2) {
                        if (!strcasecmp(attr[i], "priority")) {
                                xrds->current_service_priority = atoi(attr[i+1]);
                        }
                }
        }
+
+       FlushStrBuf(xrds->CharData);
 }
 
 
@@ -654,36 +627,72 @@ void xrds_xml_end(void *data, const char *supplied_el) {
 
        if (!strcasecmp(supplied_el, "XRD")) {
                --xrds->in_xrd;
-               syslog(LOG_DEBUG, "*** XRD CONTAINER END ***");
+       }
+
+       else if (!strcasecmp(supplied_el, "type")) {
+               if (    (xrds->in_xrd)
+                       && (!strcasecmp(ChrPtr(xrds->CharData), "http://specs.openid.net/auth/2.0/server"))
+               ) {
+                       xrds->current_service_is_oid2auth = 1;
+               }
+               if (    (xrds->in_xrd)
+                       && (!strcasecmp(ChrPtr(xrds->CharData), "http://specs.openid.net/auth/2.0/signon"))
+               ) {
+                       xrds->current_service_is_oid2auth = 1;
+                       /* FIXME in this case, the Claimed ID should be considered immutable */
+               }
+       }
+
+       else if (!strcasecmp(supplied_el, "uri")) {
+               if (xrds->in_xrd) {
+                       FlushStrBuf(xrds->current_service_uri);
+                       StrBufAppendBuf(xrds->current_service_uri, xrds->CharData, 0);
+               }
        }
 
        else if (!strcasecmp(supplied_el, "service")) {
-               /* this is where we should evaluate the service and do stuff */
-               xrds->current_service_priority = 0;
+               if (    (xrds->in_xrd)
+                       && (xrds->current_service_priority < xrds->selected_service_priority)
+                       && (xrds->current_service_is_oid2auth)
+               ) {
+                       xrds->selected_service_priority = xrds->current_service_priority;
+                       FlushStrBuf(xrds->selected_service_uri);
+                       StrBufAppendBuf(xrds->selected_service_uri, xrds->current_service_uri, 0);
+               }
+
        }
+
+       FlushStrBuf(xrds->CharData);
 }
 
 
 void xrds_xml_chardata(void *data, const XML_Char *s, int len) {
        struct xrds *xrds = (struct xrds *) data;
 
-       if (xrds) ;     /* this is only here to silence the warning for now */
-       
-       /* StrBufAppendBufPlain (xrds->CData, s, len, 0); */
+       StrBufAppendBufPlain (xrds->CharData, s, len, 0);
 }
 
 
 /*
  * Parse an XRDS document.
- * If OpenID stuff is discovered, populate FIXME something and return nonzero
+ * If an OpenID Provider URL is discovered, op_url to that value and return nonzero.
  * If nothing useful happened, return 0.
  */
 int parse_xrds_document(StrBuf *ReplyBuf) {
+       ctdl_openid *oiddata = (ctdl_openid *) CC->openid_data;
        struct xrds xrds;
+       int return_value = 0;
 
-       syslog(LOG_DEBUG, "\033[32m --- XRDS DOCUMENT --- \n%s\033[0m", ChrPtr(ReplyBuf));
+       syslog(LOG_DEBUG,
+               " --- XRDS DOCUMENT BEGIN --- \n%s\n --- XRDS DOCUMENT END ---",
+               ChrPtr(ReplyBuf)
+       );
 
        memset(&xrds, 0, sizeof (struct xrds));
+       xrds.selected_service_priority = INT_MAX;
+       xrds.CharData = NewStrBuf();
+       xrds.current_service_uri = NewStrBuf();
+       xrds.selected_service_uri = NewStrBuf();
        XML_Parser xp = XML_ParserCreate(NULL);
        if (xp) {
                XML_SetUserData(xp, &xrds);
@@ -697,7 +706,20 @@ int parse_xrds_document(StrBuf *ReplyBuf) {
                syslog(LOG_ALERT, "Cannot create XML parser");
        }
 
-       return(0);      /* FIXME return nonzero if something wonderful happened */
+       if (xrds.selected_service_priority < INT_MAX) {
+               if (oiddata->op_url == NULL) {
+                       oiddata->op_url = NewStrBuf();
+               }
+               FlushStrBuf(oiddata->op_url);
+               StrBufAppendBuf(oiddata->op_url, xrds.selected_service_uri, 0);
+               return_value = openid_disco_xrds;
+       }
+
+       FreeStrBuf(&xrds.CharData);
+       FreeStrBuf(&xrds.current_service_uri);
+       FreeStrBuf(&xrds.selected_service_uri);
+
+       return(return_value);
 }
 
 
@@ -722,7 +744,6 @@ size_t yadis_headerfunction(void *ptr, size_t size, size_t nmemb, void *userdata
 }
 
 
-
 /* Attempt to perform Yadis discovery as specified in Yadis 1.0 section 6.2.5.
  * 
  * If Yadis fails, we then attempt HTML discovery using the same document.
@@ -730,7 +751,8 @@ size_t yadis_headerfunction(void *ptr, size_t size, size_t nmemb, void *userdata
  * If successful, returns nonzero and calls parse_xrds_document() to act upon the received data.
  * If fails, returns 0 and does nothing else.
  */
-int perform_openid2_discovery(StrBuf *YadisURL) {
+int perform_openid2_discovery(StrBuf *SuppliedURL) {
+       ctdl_openid *oiddata = (ctdl_openid *) CC->openid_data;
        int docbytes = (-1);
        StrBuf *ReplyBuf = NULL;
        int return_value = 0;
@@ -739,19 +761,18 @@ int perform_openid2_discovery(StrBuf *YadisURL) {
        char errmsg[1024] = "";
        struct curl_slist *my_headers = NULL;
        StrBuf *x_xrds_location = NULL;
-       ctdl_openid *oiddata = (ctdl_openid *) CC->openid_data;
 
-       if (YadisURL == NULL) return(0);
-       syslog(LOG_DEBUG, "perform_openid2_discovery(%s)", ChrPtr(YadisURL));
-       if (StrLength(YadisURL) == 0) return(0);
+       if (!SuppliedURL) return(0);
+       syslog(LOG_DEBUG, "perform_openid2_discovery(%s)", ChrPtr(SuppliedURL));
+       if (StrLength(SuppliedURL) == 0) return(0);
 
-       ReplyBuf = NewStrBuf ();
-       if (ReplyBuf == 0) return(0);
+       ReplyBuf = NewStrBuf();
+       if (!ReplyBuf) return(0);
 
        curl = ctdl_openid_curl_easy_init(errmsg);
        if (!curl) return(0);
 
-       curl_easy_setopt(curl, CURLOPT_URL, ChrPtr(YadisURL));
+       curl_easy_setopt(curl, CURLOPT_URL, ChrPtr(SuppliedURL));
        curl_easy_setopt(curl, CURLOPT_WRITEDATA, ReplyBuf);
        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, CurlFillStrBuf_callback);
 
@@ -775,8 +796,9 @@ int perform_openid2_discovery(StrBuf *YadisURL) {
         * 
         * Option 1: An HTML document with a <head> element that includes a <meta> element with http-equiv
         * attribute, X-XRDS-Location,
+        *
+        * Does any provider actually do this?  If so then we will implement it in the future.
         */
-       /* FIXME handle this somehow */
 
        /*
         * Option 2: HTTP response-headers that include an X-XRDS-Location response-header,
@@ -788,7 +810,7 @@ int perform_openid2_discovery(StrBuf *YadisURL) {
         * If the X-XRDS-Location header was delivered, we know about it at this point...
         */
        if (    (x_xrds_location)
-               && (strcmp(ChrPtr(x_xrds_location), ChrPtr(YadisURL)))
+               && (strcmp(ChrPtr(x_xrds_location), ChrPtr(SuppliedURL)))
        ) {
                syslog(LOG_DEBUG, "X-XRDS-Location: %s ... recursing!", ChrPtr(x_xrds_location));
                return_value = perform_openid2_discovery(x_xrds_location);
@@ -798,18 +820,20 @@ int perform_openid2_discovery(StrBuf *YadisURL) {
        /*
         * Option 4: the returned web page may *be* an XRDS document.  Try to parse it.
         */
-       else if (docbytes >= 0) {
+       if ( (return_value == 0) && (docbytes >= 0)) {
                return_value = parse_xrds_document(ReplyBuf);
        }
 
        /*
         * Option 5: if all else fails, attempt HTML based discovery.
         */
-       if (return_value == 0) {
-               syslog(LOG_DEBUG, "Attempting HTML discovery");
-               extract_link(oiddata->server, HKEY("openid2.provider"), ReplyBuf);
-               if (StrLength(oiddata->server) > 0) {
-                       syslog(LOG_DEBUG, "\033[31mHTML DISCO PROVIDER: %s\033[0m", ChrPtr(oiddata->server));
+       if ( (return_value == 0) && (docbytes >= 0)) {
+               if (oiddata->op_url == NULL) {
+                       oiddata->op_url = NewStrBuf();
+               }
+               extract_link(oiddata->op_url, HKEY("openid2.provider"), ReplyBuf);
+               if (StrLength(oiddata->op_url) > 0) {
+                       return_value = openid_disco_html;
                }
        }
 
@@ -824,20 +848,20 @@ int perform_openid2_discovery(StrBuf *YadisURL) {
  * Setup an OpenID authentication
  */
 void cmd_oids(char *argbuf) {
+       struct CitContext *CCC = CC;    /* CachedCitContext - performance boost */
        const char *Pos = NULL;
        StrBuf *ArgBuf = NULL;
        StrBuf *ReplyBuf = NULL;
        StrBuf *return_to = NULL;
-       StrBuf *trust_root = NULL;
-       StrBuf *openid_delegate = NULL;
        StrBuf *RedirectUrl = NULL;
-       struct CitContext *CCC = CC;    /* CachedCitContext - performance boost */
        ctdl_openid *oiddata;
+       int discovery_succeeded = 0;
 
        Free_ctdl_openid ((ctdl_openid**)&CCC->openid_data);
 
        CCC->openid_data = oiddata = malloc(sizeof(ctdl_openid));
        if (oiddata == NULL) {
+               syslog(LOG_ALERT, "malloc() failed: %s", strerror(errno));
                cprintf("%d malloc failed\n", ERROR + INTERNAL_ERROR);
                return;
        }
@@ -848,17 +872,13 @@ void cmd_oids(char *argbuf) {
 
        oiddata->verified = 0;
        oiddata->claimed_id = NewStrBufPlain(NULL, StrLength(ArgBuf));
-       trust_root = NewStrBufPlain(NULL, StrLength(ArgBuf));
        return_to = NewStrBufPlain(NULL, StrLength(ArgBuf));
 
        StrBufExtract_NextToken(oiddata->claimed_id, ArgBuf, &Pos, '|');
        StrBufExtract_NextToken(return_to, ArgBuf, &Pos, '|');
-       StrBufExtract_NextToken(trust_root, ArgBuf, &Pos, '|');
 
        syslog(LOG_DEBUG, "User-Supplied Identifier is: %s", ChrPtr(oiddata->claimed_id));
 
-
-#if 0
        /********** OpenID 2.0 section 7.3 - Discovery **********/
 
        /* Section 7.3.1 says we have to attempt XRI based discovery.
@@ -868,80 +888,66 @@ void cmd_oids(char *argbuf) {
 
        /* Attempt section 7.3.2 (Yadis discovery) and section 7.3.3 (HTML discovery);
         */
-       int yadis_succeeded = perform_openid2_discovery(oiddata->claimed_id);
-#endif
-
+       discovery_succeeded = perform_openid2_discovery(oiddata->claimed_id);
 
+       if (discovery_succeeded == 0) {
+               cprintf("%d There is no OpenID identity provider at this location.\n", ERROR);
+       }
 
-       /************ OPENID 1.1 **********/
+       else {
+               /*
+                * If we get to this point we are in possession of a valid OpenID Provider URL.
+                */
+               syslog(LOG_DEBUG, "OP URI '%s' discovered using method %d",
+                       ChrPtr(oiddata->op_url),
+                       discovery_succeeded
+               );
 
-       if (    (fetch_http(oiddata->claimed_id, &ReplyBuf) > 0)
-               && (StrLength(ReplyBuf) > 0)
-       ) {
-               openid_delegate = NewStrBuf();
-               oiddata->server = NewStrBuf();
-               extract_link(oiddata->server, HKEY("openid.server"), ReplyBuf);
-               extract_link(openid_delegate, HKEY("openid.delegate"), ReplyBuf);
-
-               if (StrLength(oiddata->server) == 0) {
-                       cprintf("%d There is no OpenID identity provider at this URL.\n", ERROR);
-                       FreeStrBuf(&ArgBuf);
-                       FreeStrBuf(&ReplyBuf);
-                       FreeStrBuf(&return_to);
-                       FreeStrBuf(&trust_root);
-                       FreeStrBuf(&openid_delegate);
-                       FreeStrBuf(&RedirectUrl);
-                       return;
+               /* We have to "normalize" our Claimed ID otherwise it will cause some OP's to barf */
+               if (cbmstrcasestr(ChrPtr(oiddata->claimed_id), "://") == NULL) {
+                       StrBuf *cid = oiddata->claimed_id;
+                       oiddata->claimed_id = NewStrBufPlain(HKEY("http://"));
+                       StrBufAppendBuf(oiddata->claimed_id, cid, 0);
+                       FreeStrBuf(&cid);
                }
 
-               /* Empty delegate is legal; we just use the openid_url instead */
-               if (StrLength(openid_delegate) == 0) {
-                       StrBufPlain(openid_delegate, SKEY(oiddata->claimed_id));
-               }
+               /*
+                * OpenID 2.0 section 9: request authentication
+                * Assemble a URL to which the user-agent will be redirected.
+                */
+       
+               RedirectUrl = NewStrBufDup(oiddata->op_url);
 
-               /* Assemble a URL to which the user-agent will be redirected. */
+               StrBufAppendBufPlain(RedirectUrl, HKEY("?openid.ns=http:%2F%2Fspecs.openid.net%2Fauth%2F2.0"), 0);
 
-               RedirectUrl = NewStrBufDup(oiddata->server);
+               StrBufAppendBufPlain(RedirectUrl, HKEY("&openid.mode=checkid_setup"), 0);
 
-               StrBufAppendBufPlain(RedirectUrl, HKEY("?openid.mode=checkid_setup"
-                                                      "&openid.identity="), 0);
-               StrBufUrlescAppend(RedirectUrl, openid_delegate, NULL);
+               StrBufAppendBufPlain(RedirectUrl, HKEY("&openid.claimed_id="), 0);
+               StrBufUrlescAppend(RedirectUrl, oiddata->claimed_id, NULL);
+
+               StrBufAppendBufPlain(RedirectUrl, HKEY("&openid.identity="), 0);
+               StrBufUrlescAppend(RedirectUrl, oiddata->claimed_id, NULL);
 
                StrBufAppendBufPlain(RedirectUrl, HKEY("&openid.return_to="), 0);
                StrBufUrlescAppend(RedirectUrl, return_to, NULL);
 
-               StrBufAppendBufPlain(RedirectUrl, HKEY("&openid.trust_root="), 0);
-               StrBufUrlescAppend(RedirectUrl, trust_root, NULL);
-
+/*
+               We probably have to do something here to set up Simple Registration
                StrBufAppendBufPlain(RedirectUrl, HKEY("&openid.sreg.optional="), 0);
                StrBufUrlescAppend(RedirectUrl, NULL, "nickname,email,fullname,postcode,country,dob,gender");
+*/
 
+               syslog(LOG_DEBUG, "\033[36m%s\033[0m", ChrPtr(RedirectUrl));
                cprintf("%d %s\n", CIT_OK, ChrPtr(RedirectUrl));
-               
-               FreeStrBuf(&ArgBuf);
-               FreeStrBuf(&ReplyBuf);
-               FreeStrBuf(&return_to);
-               FreeStrBuf(&trust_root);
-               FreeStrBuf(&openid_delegate);
-               FreeStrBuf(&RedirectUrl);
-
-               return;
        }
-
+       
        FreeStrBuf(&ArgBuf);
        FreeStrBuf(&ReplyBuf);
        FreeStrBuf(&return_to);
-       FreeStrBuf(&trust_root);
-       FreeStrBuf(&openid_delegate);
        FreeStrBuf(&RedirectUrl);
-
-       cprintf("%d Unable to fetch OpenID URL\n", ERROR);
 }
 
 
-
-
-
 /*
  * Finalize an OpenID authentication
  */
@@ -957,8 +963,8 @@ void cmd_oidf(char *argbuf) {
                cprintf("%d run OIDS first.\n", ERROR + INTERNAL_ERROR);
                return;
        }
-       if (StrLength(oiddata->server) == 0){
-               cprintf("%d need a remote server to authenticate against\n", ERROR + ILLEGAL_VALUE);
+       if (StrLength(oiddata->op_url) == 0){
+               cprintf("%d No OpenID Endpoint URL has been obtained.\n", ERROR + ILLEGAL_VALUE);
                return;
        }
        keys = NewHash(1, NULL);
@@ -970,65 +976,61 @@ void cmd_oidf(char *argbuf) {
 
        while (client_getln(buf, sizeof buf), strcmp(buf, "000")) {
                len = extract_token(thiskey, buf, 0, '|', sizeof thiskey);
-               if (len < 0)
+               if (len < 0) {
                        len = sizeof(thiskey) - 1;
+               }
                extract_token(thisdata, buf, 1, '|', sizeof thisdata);
                syslog(LOG_DEBUG, "%s: ["SIZE_T_FMT"] %s", thiskey, strlen(thisdata), thisdata);
                Put(keys, thiskey, len, strdup(thisdata), NULL);
        }
 
+       /* Check to see if this is a correct response.
+        * Start with verified=1 but then set it to 0 if anything looks wrong.
+        */
+       oiddata->verified = 1;
+
+       char *openid_ns = NULL;
+       if (    (!GetHash(keys, "ns", 2, (void *) &openid_ns))
+               || (strcasecmp(openid_ns, "http://specs.openid.net/auth/2.0"))
+       ) {
+               syslog(LOG_DEBUG, "This is not an an OpenID assertion");
+               oiddata->verified = 0;
+       }
+
+       char *openid_mode = NULL;
+       if (    (!GetHash(keys, "mode", 4, (void *) &openid_mode))
+               || (strcasecmp(openid_mode, "id_res"))
+       ) {
+               oiddata->verified = 0;
+       }
+
+       char *openid_claimed_id = NULL;
+       if (GetHash(keys, "claimed_id", 10, (void *) &openid_claimed_id)) {
+               FreeStrBuf(&oiddata->claimed_id);
+               oiddata->claimed_id = NewStrBufPlain(openid_claimed_id, -1);
+               syslog(LOG_DEBUG, "Provider is asserting the Claimed ID '%s'", ChrPtr(oiddata->claimed_id));
+       }
 
-       /* Now that we have all of the parameters, we have to validate the signature against the server */
-       syslog(LOG_DEBUG, "About to validate the signature...");
+       /* Validate the assertion against the server */
+       syslog(LOG_DEBUG, "Validating...");
 
        CURL *curl;
        CURLcode res;
        struct curl_httppost *formpost = NULL;
        struct curl_httppost *lastptr = NULL;
        char errmsg[1024] = "";
-       char *o_assoc_handle = NULL;
-       char *o_sig = NULL;
-       char *o_signed = NULL;
-       int num_signed_values;
-       int i;
-       char k_keyname[128];
-       char k_o_keyname[128];
-       char *k_value = NULL;
-       StrBuf *ReplyBuf;
+       StrBuf *ReplyBuf = NewStrBuf();
 
        curl_formadd(&formpost, &lastptr,
                CURLFORM_COPYNAME,      "openid.mode",
                CURLFORM_COPYCONTENTS,  "check_authentication",
-               CURLFORM_END);
-       syslog(LOG_DEBUG, "%25s : %s", "openid.mode", "check_authentication");
-
-       if (GetHash(keys, "assoc_handle", 12, (void *) &o_assoc_handle)) {
-               curl_formadd(&formpost, &lastptr,
-                       CURLFORM_COPYNAME,      "openid.assoc_handle",
-                       CURLFORM_COPYCONTENTS,  o_assoc_handle,
-                       CURLFORM_END);
-               syslog(LOG_DEBUG, "%25s : %s", "openid.assoc_handle", o_assoc_handle);
-       }
+               CURLFORM_END
+       );
 
-       if (GetHash(keys, "sig", 3, (void *) &o_sig)) {
-               curl_formadd(&formpost, &lastptr,
-                       CURLFORM_COPYNAME,      "openid.sig",
-                       CURLFORM_COPYCONTENTS,  o_sig,
-                       CURLFORM_END);
-                       syslog(LOG_DEBUG, "%25s : %s", "openid.sig", o_sig);
-       }
+/*
+
+FIXME put the rest of this crap in here
 
-       if (GetHash(keys, "signed", 6, (void *) &o_signed)) {
-               curl_formadd(&formpost, &lastptr,
-                       CURLFORM_COPYNAME,      "openid.signed",
-                       CURLFORM_COPYCONTENTS,  o_signed,
-                       CURLFORM_END);
-               syslog(LOG_DEBUG, "%25s : %s", "openid.signed", o_signed);
-
-               num_signed_values = num_tokens(o_signed, ',');
-               for (i=0; i<num_signed_values; ++i) {
-                       extract_token(k_keyname, o_signed, i, ',', sizeof k_keyname);
-                       if (strcasecmp(k_keyname, "mode")) {    // work around phpMyID bug
                                if (GetHash(keys, k_keyname, strlen(k_keyname), (void *) &k_value)) {
                                        snprintf(k_o_keyname, sizeof k_o_keyname, "openid.%s", k_keyname);
                                        curl_formadd(&formpost, &lastptr,
@@ -1037,18 +1039,10 @@ void cmd_oidf(char *argbuf) {
                                                CURLFORM_END);
                                        syslog(LOG_DEBUG, "%25s : %s", k_o_keyname, k_value);
                                }
-                               else {
-                                       syslog(LOG_INFO, "OpenID: signed field '%s' is missing",
-                                               k_keyname);
-                               }
-                       }
-               }
-       }
-       
-       ReplyBuf = NewStrBuf();
+*/
 
        curl = ctdl_openid_curl_easy_init(errmsg);
-       curl_easy_setopt(curl, CURLOPT_URL, ChrPtr(oiddata->server));
+       curl_easy_setopt(curl, CURLOPT_URL, ChrPtr(oiddata->op_url));
        curl_easy_setopt(curl, CURLOPT_WRITEDATA, ReplyBuf);
        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, CurlFillStrBuf_callback);
        curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost);
@@ -1056,16 +1050,19 @@ void cmd_oidf(char *argbuf) {
        res = curl_easy_perform(curl);
        if (res) {
                syslog(LOG_DEBUG, "cmd_oidf() libcurl error %d: %s", res, errmsg);
+               oiddata->verified = 0;
        }
        curl_easy_cleanup(curl);
        curl_formfree(formpost);
 
-       if (cbmstrcasestr(ChrPtr(ReplyBuf), "is_valid:true")) {
-               oiddata->verified = 1;
+       /* syslog(LOG_DEBUG, "\033[36m --- VALIDATION REPLY ---\n%s\033[0m", ChrPtr(ReplyBuf)); */
+
+       if (cbmstrcasestr(ChrPtr(ReplyBuf), "is_valid:true") == NULL) {
+               oiddata->verified = 0;
        }
        FreeStrBuf(&ReplyBuf);
 
-       syslog(LOG_DEBUG, "Authentication %s.", (oiddata->verified ? "succeeded" : "failed") );
+       syslog(LOG_DEBUG, "OpenID authentication %s", (oiddata->verified ? "succeeded" : "failed") );
 
        /* Respond to the client */