X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fopenid%2Fserv_openid_rp.c;h=b3a7508518e3f3ce73882d2cd252bbdcc58054b7;hb=24d57ccf671cba1fc92992573ccfa6b03a0e8dfc;hp=1d80c5dcccbaf18bd41e3e1659c7abd0de39b915;hpb=6bd5ddf20776245aa1a1cb9832d7ad82d0b0fe65;p=citadel.git diff --git a/citadel/modules/openid/serv_openid_rp.c b/citadel/modules/openid/serv_openid_rp.c index 1d80c5dcc..b3a750851 100644 --- a/citadel/modules/openid/serv_openid_rp.c +++ b/citadel/modules/openid/serv_openid_rp.c @@ -258,88 +258,6 @@ void cmd_oida(char *argbuf) { } -/* - * Attempt to register (populate the vCard) the currently-logged-in user - * using the data from Simple Registration Extension, if present. - */ -void populate_vcard_from_sreg(HashList *sreg_keys) { - - struct vCard *v; - int pop = 0; /* number of fields populated */ - char *data = NULL; - char *postcode = NULL; - char *country = NULL; - - if (!sreg_keys) return; - v = vcard_new(); - if (!v) return; - - if (GetHash(sreg_keys, "identity", 8, (void *) &data)) { - vcard_add_prop(v, "url;type=openid", data); - ++pop; - } - - if (GetHash(sreg_keys, "sreg.email", 10, (void *) &data)) { - vcard_add_prop(v, "email;internet", data); - ++pop; - } - - if (GetHash(sreg_keys, "sreg.nickname", 13, (void *) &data)) { - vcard_add_prop(v, "nickname", data); - ++pop; - } - - if (GetHash(sreg_keys, "sreg.fullname", 13, (void *) &data)) { - char n[256]; - vcard_add_prop(v, "fn", data); - vcard_fn_to_n(n, data, sizeof n); - vcard_add_prop(v, "n", n); - ++pop; - } - - if (!GetHash(sreg_keys, "sreg.postcode", 13, (void *) &postcode)) { - postcode = NULL; - } - - if (!GetHash(sreg_keys, "sreg.country", 12, (void *) &country)) { - country = NULL; - } - - if (postcode || country) { - char adr[256]; - snprintf(adr, sizeof adr, ";;;;;%s;%s", - (postcode ? postcode : ""), - (country ? country : "") - ); - vcard_add_prop(v, "adr", adr); - ++pop; - } - - if (GetHash(sreg_keys, "sreg.dob", 8, (void *) &data)) { - vcard_add_prop(v, "bday", data); - ++pop; - } - - if (GetHash(sreg_keys, "sreg.gender", 11, (void *) &data)) { - vcard_add_prop(v, "x-funambol-gender", data); - ++pop; - } - - /* Only save the vCard if there is some useful data in it */ - if (pop > 0) { - char *ser; - ser = vcard_serialize(v); - if (ser) { - CtdlWriteObject(USERCONFIGROOM, "text/x-vcard", - ser, strlen(ser)+1, &CC->user, 0, 0, 0 - ); - free(ser); - } - } - vcard_free(v); -} - - /* * Create a new user account, manually specifying the name, after successfully * verifying an OpenID (which will of course be attached to the account) @@ -360,9 +278,6 @@ void cmd_oidc(char *argbuf) { /* Now, if this logged us in, we have to attach the OpenID */ if (CC->logged_in) { attach_openid(&CC->user, oiddata->claimed_id); - if (oiddata->sreg_keys != NULL) { - populate_vcard_from_sreg(oiddata->sreg_keys); - } } } @@ -406,35 +321,76 @@ void cmd_oidd(char *argbuf) { /* - * Attempt to auto-create a new Citadel account using the nickname from Simple Registration Extension + * Attempt to auto-create a new Citadel account using the nickname from Attribute Exchange */ -int openid_create_user_via_sreg(StrBuf *claimed_id, HashList *sreg_keys) +int openid_create_user_via_ax(StrBuf *claimed_id, HashList *sreg_keys) { - char *desired_name = NULL; + char *nickname = NULL; + char *firstname = NULL; + char *lastname = NULL; char new_password[32]; long len; + const char *Key; + void *Value; if (config.c_auth_mode != AUTHMODE_NATIVE) return(1); if (config.c_disable_newu) return(2); if (CC->logged_in) return(3); - if (!GetHash(sreg_keys, "sreg.nickname", 13, (void *) &desired_name)) return(4); - syslog(LOG_DEBUG, "The desired account name is <%s>", desired_name); + HashPos *HashPos = GetNewHashPos(sreg_keys, 0); + while (GetNextHashPos(sreg_keys, HashPos, &len, &Key, &Value) != 0) { + syslog(LOG_DEBUG, "%s = %s", Key, (char *)Value); + + if (cbmstrcasestr(Key, "value.nickname") != NULL) { + nickname = (char *)Value; + } + else if ( (nickname == NULL) && (cbmstrcasestr(Key, "value.nickname") != NULL)) { + nickname = (char *)Value; + } + else if (cbmstrcasestr(Key, "value.firstname") != NULL) { + firstname = (char *)Value; + } + else if (cbmstrcasestr(Key, "value.lastname") != NULL) { + lastname = (char *)Value; + } + + } + DeleteHashPos(&HashPos); + + if (nickname == NULL) { + if ((firstname != NULL) || (lastname != NULL)) { + char fullname[1024] = ""; + if (firstname) strcpy(fullname, firstname); + if (firstname && lastname) strcat(fullname, " "); + if (lastname) strcat(fullname, lastname); + nickname = fullname; + } + } + + if (nickname == NULL) { + return(4); + } + syslog(LOG_DEBUG, "The desired account name is <%s>", nickname); - len = cutuserkey(desired_name); - if (!CtdlGetUser(&CC->user, desired_name)) { - syslog(LOG_DEBUG, "<%s> is already taken by another user.", desired_name); + len = cutuserkey(nickname); + if (!CtdlGetUser(&CC->user, nickname)) { + syslog(LOG_DEBUG, "<%s> is already taken by another user.", nickname); memset(&CC->user, 0, sizeof(struct ctdluser)); return(5); } /* The desired account name is available. Create the account and log it in! */ - if (create_user(desired_name, len, 1)) return(6); + if (create_user(nickname, len, 1)) return(6); + /* Generate a random password. + * The user doesn't care what the password is since he is using OpenID. + */ snprintf(new_password, sizeof new_password, "%08lx%08lx", random(), random()); CtdlSetPassword(new_password); + + /* Now attach the verified OpenID to this account. */ attach_openid(&CC->user, claimed_id); - populate_vcard_from_sreg(sreg_keys); + return(0); } @@ -683,11 +639,6 @@ int parse_xrds_document(StrBuf *ReplyBuf) { struct xrds xrds; int return_value = 0; - 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(); @@ -723,7 +674,6 @@ int parse_xrds_document(StrBuf *ReplyBuf) { } - /* * Callback function for perform_openid2_discovery() * We're interested in the X-XRDS-Location: header. @@ -918,7 +868,8 @@ void cmd_oids(char *argbuf) { RedirectUrl = NewStrBufDup(oiddata->op_url); - StrBufAppendBufPlain(RedirectUrl, HKEY("?openid.ns=http:%2F%2Fspecs.openid.net%2Fauth%2F2.0"), 0); + StrBufAppendBufPlain(RedirectUrl, HKEY("?openid.ns="), 0); + StrBufUrlescAppend(RedirectUrl, NULL, "http://specs.openid.net/auth/2.0"); StrBufAppendBufPlain(RedirectUrl, HKEY("&openid.mode=checkid_setup"), 0); @@ -928,16 +879,37 @@ void cmd_oids(char *argbuf) { StrBufAppendBufPlain(RedirectUrl, HKEY("&openid.identity="), 0); StrBufUrlescAppend(RedirectUrl, oiddata->claimed_id, NULL); + /* return_to tells the provider how to complete the round trip back to our site */ StrBufAppendBufPlain(RedirectUrl, HKEY("&openid.return_to="), 0); StrBufUrlescAppend(RedirectUrl, return_to, 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"); -*/ + /* Attribute Exchange + * See: + * http://openid.net/specs/openid-attribute-exchange-1_0.html + * http://code.google.com/apis/accounts/docs/OpenID.html#endpoint + * http://test-id.net/OP/AXFetch.aspx + */ - syslog(LOG_DEBUG, "\033[36m%s\033[0m", ChrPtr(RedirectUrl)); + StrBufAppendBufPlain(RedirectUrl, HKEY("&openid.ns.ax="), 0); + StrBufUrlescAppend(RedirectUrl, NULL, "http://openid.net/srv/ax/1.0"); + + StrBufAppendBufPlain(RedirectUrl, HKEY("&openid.ax.mode=fetch_request"), 0); + + StrBufAppendBufPlain(RedirectUrl, HKEY("&openid.ax.required=firstname,lastname,friendly,nickname"), 0); + + StrBufAppendBufPlain(RedirectUrl, HKEY("&openid.ax.type.firstname="), 0); + StrBufUrlescAppend(RedirectUrl, NULL, "http://axschema.org/namePerson/first"); + + StrBufAppendBufPlain(RedirectUrl, HKEY("&openid.ax.type.lastname="), 0); + StrBufUrlescAppend(RedirectUrl, NULL, "http://axschema.org/namePerson/last"); + + StrBufAppendBufPlain(RedirectUrl, HKEY("&openid.ax.type.friendly="), 0); + StrBufUrlescAppend(RedirectUrl, NULL, "http://axschema.org/namePerson/friendly"); + + StrBufAppendBufPlain(RedirectUrl, HKEY("&openid.ax.type.nickname="), 0); + StrBufUrlescAppend(RedirectUrl, NULL, "http://axschema.org/namePerson/nickname"); + + syslog(LOG_DEBUG, "OpenID: redirecting client to %s", ChrPtr(RedirectUrl)); cprintf("%d %s\n", CIT_OK, ChrPtr(RedirectUrl)); } @@ -957,6 +929,8 @@ void cmd_oidf(char *argbuf) { char thiskey[1024]; char thisdata[1024]; HashList *keys = NULL; + const char *Key; + void *Value; ctdl_openid *oiddata = (ctdl_openid *) CC->openid_data; if (oiddata == NULL) { @@ -980,7 +954,6 @@ void cmd_oidf(char *argbuf) { 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); } @@ -1027,19 +1000,19 @@ void cmd_oidf(char *argbuf) { CURLFORM_END ); -/* - -FIXME put the rest of this crap in here - - 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, - CURLFORM_COPYNAME, k_o_keyname, - CURLFORM_COPYCONTENTS, k_value, - CURLFORM_END); - syslog(LOG_DEBUG, "%25s : %s", k_o_keyname, k_value); - } -*/ + HashPos *HashPos = GetNewHashPos(keys, 0); + while (GetNextHashPos(keys, HashPos, &len, &Key, &Value) != 0) { + if (strcasecmp(Key, "mode")) { + char k_o_keyname[1024]; + snprintf(k_o_keyname, sizeof k_o_keyname, "openid.%s", (const char *)Key); + curl_formadd(&formpost, &lastptr, + CURLFORM_COPYNAME, k_o_keyname, + CURLFORM_COPYCONTENTS, (char *)Value, + CURLFORM_END + ); + } + } + DeleteHashPos(&HashPos); curl = ctdl_openid_curl_easy_init(errmsg); curl_easy_setopt(curl, CURLOPT_URL, ChrPtr(oiddata->op_url)); @@ -1055,8 +1028,7 @@ FIXME put the rest of this crap in here curl_easy_cleanup(curl); curl_formfree(formpost); - /* syslog(LOG_DEBUG, "\033[36m --- VALIDATION REPLY ---\n%s\033[0m", ChrPtr(ReplyBuf)); */ - + /* syslog(LOG_DEBUG, "Validation reply: \n%s", ChrPtr(ReplyBuf)); */ if (cbmstrcasestr(ChrPtr(ReplyBuf), "is_valid:true") == NULL) { oiddata->verified = 0; } @@ -1106,9 +1078,9 @@ FIXME put the rest of this crap in here } /* - * New user whose OpenID is verified and Simple Registration Extension is in use? + * New user whose OpenID is verified and Attribute Exchange gave us a name? */ - else if (openid_create_user_via_sreg(oiddata->claimed_id, keys) == 0) { + else if (openid_create_user_via_ax(oiddata->claimed_id, keys) == 0) { cprintf("authenticate\n%s\n%s\n", CC->user.fullname, CC->user.password); logged_in_response(); syslog(LOG_DEBUG, "Successfully auto-created new user"); @@ -1128,7 +1100,7 @@ FIXME put the rest of this crap in here else { cprintf("\n"); } - syslog(LOG_DEBUG, "The desired Simple Registration name is already taken."); + syslog(LOG_DEBUG, "The desired display name is already taken."); } } }