Normalize our Claimed ID if necessary

diff --git a/citadel/modules/openid/serv_openid_rp.c b/citadel/modules/openid/serv_openid_rp.c
index 910defca231d0d02fcb91b57942d6c6d769d5f74..e9bfcf199d4e2751201909c6ea4fff62e1595b6a 100644 (file)
--- a/citadel/modules/openid/serv_openid_rp.c
+++ b/citadel/modules/openid/serv_openid_rp.c
@@ -66,7 +66,6 @@ enum {
 };
 
 
-
 void Free_ctdl_openid(ctdl_openid **FreeMe)
 {
        if (*FreeMe == NULL) {
@@ -352,12 +351,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;
        }
@@ -415,7 +409,6 @@ void cmd_oidd(char *argbuf) {
 }
 
 
-
 /*
  * Attempt to auto-create a new Citadel account using the nickname from Simple Registration Extension
  */
@@ -881,7 +874,6 @@ void cmd_oids(char *argbuf) {
 
        syslog(LOG_DEBUG, "User-Supplied Identifier is: %s", ChrPtr(oiddata->claimed_id));
 
-
        /********** OpenID 2.0 section 7.3 - Discovery **********/
 
        /* Section 7.3.1 says we have to attempt XRI based discovery.
@@ -906,20 +898,31 @@ void cmd_oids(char *argbuf) {
                        discovery_succeeded
                );
 
-               /* Assemble a URL to which the user-agent will be redirected. */
+               /* 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);
+               }
+
+               /*
+                * OpenID 2.0 section 9: request authentication
+                * Assemble a URL to which the user-agent will be redirected.
+                */
        
                RedirectUrl = NewStrBufDup(oiddata->op_url);
-       
+
                StrBufAppendBufPlain(RedirectUrl, HKEY("?openid.ns=http:%2F%2Fspecs.openid.net%2Fauth%2F2.0"), 0);
 
                StrBufAppendBufPlain(RedirectUrl, HKEY("&openid.mode=checkid_setup"), 0);
 
                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);
 
@@ -939,9 +942,6 @@ void cmd_oids(char *argbuf) {
 }
 
 
-
-
-
 /*
  * Finalize an OpenID authentication
  */
@@ -958,7 +958,7 @@ void cmd_oidf(char *argbuf) {
                return;
        }
        if (StrLength(oiddata->op_url) == 0){
-               cprintf("%d need a remote server to authenticate against\n", ERROR + ILLEGAL_VALUE);
+               cprintf("%d No OpenID Endpoint URL has been obtained.\n", ERROR + ILLEGAL_VALUE);
                return;
        }
        keys = NewHash(1, NULL);
@@ -977,9 +977,8 @@ void cmd_oidf(char *argbuf) {
                Put(keys, thiskey, len, strdup(thisdata), NULL);
        }
 
-
        /* 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...");
+       syslog(LOG_DEBUG, "Validating signature...");
 
        CURL *curl;
        CURLcode res;
@@ -1060,6 +1059,10 @@ void cmd_oidf(char *argbuf) {
        curl_easy_cleanup(curl);
        curl_formfree(formpost);
 
+
+       syslog(LOG_DEBUG, "\033[36m --- VALIDATION REPLY ---\n%s\033[0m", ChrPtr(ReplyBuf));
+
+
        if (cbmstrcasestr(ChrPtr(ReplyBuf), "is_valid:true")) {
                oiddata->verified = 1;
        }