/*
- * This is an implementation of OpenID 2.0 RELYING PARTY SUPPORT CURRENTLY B0RKEN AND BEING DEVEL0PZ0RED
-
-
- OPENID2 BRANCH -- NEEDS TO BE MERGEZ0RED !!!!!!111
-
+ * This is an implementation of OpenID 2.0 relying party support in stateless mode.
*
* Copyright (c) 2007-2011 by the citadel.org team
*
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) {
}
-/*
- * 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)
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;
}
/* 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);
- }
}
}
}
-
/*
- * 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;
+ }
+ }
- len = cutuserkey(desired_name);
- if (!CtdlGetUser(&CC->user, desired_name)) {
- syslog(LOG_DEBUG, "<%s> is already taken by another user.", desired_name);
+ if (nickname == NULL) {
+ return(4);
+ }
+ syslog(LOG_DEBUG, "The desired account name is <%s>", nickname);
+
+ 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);
}
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;
};
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);
}
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) {
struct xrds xrds;
int return_value = 0;
- syslog(LOG_DEBUG, "\033[32m --- XRDS DOCUMENT --- \n%s\033[0m", 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);
syslog(LOG_ALERT, "Cannot create XML parser");
}
- if (StrLength(oiddata->op_url) > 0) {
- syslog(LOG_DEBUG, "\033[31mOP VIA XRDS DISCO: %s\033[0m", ChrPtr(oiddata->op_url));
- return_value = 1;
+ 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);
}
-
/*
* Callback function for perform_openid2_discovery()
* We're interested in the X-XRDS-Location: header.
}
-
/* 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.
* 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;
struct curl_slist *my_headers = NULL;
StrBuf *x_xrds_location = NULL;
- 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);
*
* 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,
* 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);
/*
* 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");
+ 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) {
- syslog(LOG_DEBUG, "\033[31mOP VIA HTML DISCO: %s\033[0m", ChrPtr(oiddata->op_url));
- return_value = 1;
+ return_value = openid_disco_html;
}
}
StrBuf *ArgBuf = NULL;
StrBuf *ReplyBuf = NULL;
StrBuf *return_to = NULL;
- StrBuf *trust_root = NULL;
- StrBuf *openid_delegate = NULL;
StrBuf *RedirectUrl = NULL;
ctdl_openid *oiddata;
int discovery_succeeded = 0;
return;
}
memset(oiddata, 0, sizeof(ctdl_openid));
- CCC->openid_data = (void *) oiddata;
ArgBuf = NewStrBufPlain(argbuf, -1);
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));
-
/********** OpenID 2.0 section 7.3 - Discovery **********/
/* Section 7.3.1 says we have to attempt XRI based discovery.
*/
discovery_succeeded = perform_openid2_discovery(oiddata->claimed_id);
- /* Empty delegate is legal; we just use the openid_url instead */
- if (StrLength(openid_delegate) == 0) {
- StrBufPlain(openid_delegate, SKEY(oiddata->claimed_id));
- }
-
- if (StrLength(oiddata->op_url) == 0) {
- cprintf("%d There is no OpenID identity provider at this URL.\n", ERROR);
+ if (discovery_succeeded == 0) {
+ cprintf("%d There is no OpenID identity provider at this location.\n", ERROR);
}
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
+ );
- /* 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.mode=checkid_setup"
- "&openid.identity="), 0);
- StrBufUrlescAppend(RedirectUrl, openid_delegate, NULL);
-
+
+ StrBufAppendBufPlain(RedirectUrl, HKEY("?openid.ns="), 0);
+ StrBufUrlescAppend(RedirectUrl, NULL, "http://specs.openid.net/auth/2.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);
+
+ /* 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);
-
- StrBufAppendBufPlain(RedirectUrl, HKEY("&openid.trust_root="), 0);
- StrBufUrlescAppend(RedirectUrl, trust_root, NULL);
-
- 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
+ */
+
+ 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));
}
FreeStrBuf(&ArgBuf);
FreeStrBuf(&ReplyBuf);
FreeStrBuf(&return_to);
- FreeStrBuf(&trust_root);
- FreeStrBuf(&openid_delegate);
FreeStrBuf(&RedirectUrl);
}
-
-
-
/*
* Finalize an OpenID authentication
*/
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) {
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);
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;
+ }
- /* 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...");
+ 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));
+ }
+
+ /* 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);
- }
-
- 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);
- }
-
- 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,
- CURLFORM_COPYNAME, k_o_keyname,
- CURLFORM_COPYCONTENTS, k_value,
- CURLFORM_END);
- syslog(LOG_DEBUG, "%25s : %s", k_o_keyname, k_value);
- }
- else {
- syslog(LOG_INFO, "OpenID: signed field '%s' is missing",
- k_keyname);
- }
- }
+ CURLFORM_END
+ );
+
+ 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
+ );
}
}
-
- ReplyBuf = NewStrBuf();
+ DeleteHashPos(&HashPos);
curl = ctdl_openid_curl_easy_init(errmsg);
curl_easy_setopt(curl, CURLOPT_URL, ChrPtr(oiddata->op_url));
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, "Validation reply: \n%s", 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 */
}
/*
- * 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");
else {
cprintf("\n");
}
- syslog(LOG_DEBUG, "The desired Simple Registration name is already taken.");
+ syslog(LOG_DEBUG, "The desired display name is already taken.");
}
}
}