X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fopenid%2Fserv_openid_rp.c;h=09fd48e9bba59d4ec41c6d7ac33a5a02b8f81870;hb=bdfa2e9b6af7e32b11461433a28dd6551f830888;hp=b74a3f88653ae5ed20143430128c9111235667b8;hpb=4b70719359d4be829a4a78f2198a9da61f36f652;p=citadel.git

diff --git a/citadel/modules/openid/serv_openid_rp.c b/citadel/modules/openid/serv_openid_rp.c
index b74a3f886..09fd48e9b 100644
--- a/citadel/modules/openid/serv_openid_rp.c
+++ b/citadel/modules/openid/serv_openid_rp.c
@@ -1,8 +1,20 @@
 /*
- * $Id$
+ * This is an implementation of OpenID 2.0 relying party support in stateless mode.
  *
- * This is an implementation of OpenID 1.1 Relying Party support, in stateless mode.
+ * Copyright (c) 2007-2019 by the citadel.org team
  *
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "sysdep.h"
@@ -30,19 +42,50 @@
 #include <string.h>
 #include <limits.h>
 #include <curl/curl.h>
+#include <expat.h>
 #include "ctdl_module.h"
 #include "config.h"
 #include "citserver.h"
 #include "user_ops.h"
 
-struct ctdl_openid {
-	char claimed_id[1024];
-	char server[1024];
+typedef struct _ctdl_openid {
+	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) {
+		return;
+	}
+	FreeStrBuf(&(*FreeMe)->op_url);
+	FreeStrBuf(&(*FreeMe)->claimed_id);
+	DeleteHash(&(*FreeMe)->sreg_keys);
+	free(*FreeMe);
+	*FreeMe = NULL;
+}
+
+
+/*
+ * This cleanup function blows away the temporary memory used by this module.
+ */
+void openid_cleanup_function(void) {
+	struct CitContext *CCC = CC;	/* CachedCitContext - performance boost */
 
+	if (CCC->openid_data != NULL) {
+		syslog(LOG_DEBUG, "openid: Clearing OpenID session state");
+		Free_ctdl_openid((ctdl_openid **) &CCC->openid_data);
+	}
+}
 
 
 /**************************************************************************/
@@ -69,76 +112,77 @@ struct ctdl_openid {
 
 
 /*
- * Attach an OpenID to a Citadel account
+ * Attach an external authenticator (such as an OpenID) to a Citadel account
  */
-int attach_openid(struct ctdluser *who, char *claimed_id)
+int attach_extauth(struct ctdluser *who, StrBuf *claimed_id)
 {
 	struct cdbdata *cdboi;
 	long fetched_usernum;
 	char *data;
 	int data_len;
+	char buf[2048];
 
 	if (!who) return(1);
-	if (!claimed_id) return(1);
-	if (IsEmptyStr(claimed_id)) return(1);
+	if (StrLength(claimed_id)==0) return(1);
 
-	/* Check to see if this OpenID is already in the database */
+	/* Check to see if this authenticator is already in the database */
 
-	cdboi = cdb_fetch(CDB_OPENID, claimed_id, strlen(claimed_id));
+	cdboi = cdb_fetch(CDB_EXTAUTH, ChrPtr(claimed_id), StrLength(claimed_id));
 	if (cdboi != NULL) {
 		memcpy(&fetched_usernum, cdboi->ptr, sizeof(long));
 		cdb_free(cdboi);
 
 		if (fetched_usernum == who->usernum) {
-			CtdlLogPrintf(CTDL_INFO, "%s already associated; no action is taken\n", claimed_id);
+			syslog(LOG_INFO, "openid: %s already associated; no action is taken", ChrPtr(claimed_id));
 			return(0);
 		}
 		else {
-			CtdlLogPrintf(CTDL_INFO, "%s already belongs to another user\n", claimed_id);
+			syslog(LOG_INFO, "openid: %s already belongs to another user", ChrPtr(claimed_id));
 			return(3);
 		}
 	}
 
 	/* Not already in the database, so attach it now */
 
-	data_len = sizeof(long) + strlen(claimed_id) + 1;
+	data_len = sizeof(long) + StrLength(claimed_id) + 1;
 	data = malloc(data_len);
 
 	memcpy(data, &who->usernum, sizeof(long));
-	memcpy(&data[sizeof(long)], claimed_id, strlen(claimed_id) + 1);
+	memcpy(&data[sizeof(long)], ChrPtr(claimed_id), StrLength(claimed_id) + 1);
 
-	cdb_store(CDB_OPENID, claimed_id, strlen(claimed_id), data, data_len);
+	cdb_store(CDB_EXTAUTH, ChrPtr(claimed_id), StrLength(claimed_id), data, data_len);
 	free(data);
 
-	CtdlLogPrintf(CTDL_INFO, "%s has been attached to %s (%ld)\n",
-		claimed_id, who->fullname, who->usernum);
+	snprintf(buf, sizeof buf, "User <%s> (#%ld) is now associated with %s\n", who->fullname, who->usernum, ChrPtr(claimed_id));
+	CtdlAideMessage(buf, "External authenticator claim");
+	syslog(LOG_INFO, "openid: %s", buf);
 	return(0);
 }
 
 
-
 /*
  * When a user is being deleted, we have to delete any OpenID associations
  */
-void openid_purge(struct ctdluser *usbuf) {
+void extauth_purge(struct ctdluser *usbuf) {
 	struct cdbdata *cdboi;
 	HashList *keys = NULL;
 	HashPos *HashPos;
 	char *deleteme = NULL;
 	long len;
 	void *Value;
-	char *Key;
+	const char *Key;
+	long usernum = 0L;
 
 	keys = NewHash(1, NULL);
 	if (!keys) return;
 
-
-	cdb_rewind(CDB_OPENID);
-	while (cdboi = cdb_next_item(CDB_OPENID), cdboi != NULL) {
+	cdb_rewind(CDB_EXTAUTH);
+	while (cdboi = cdb_next_item(CDB_EXTAUTH), cdboi != NULL) {
 		if (cdboi->len > sizeof(long)) {
-			if (((long)*(cdboi->ptr)) == usbuf->usernum) {
+			memcpy(&usernum, cdboi->ptr, sizeof(long));
+			if (usernum == usbuf->usernum) {
 				deleteme = strdup(cdboi->ptr + sizeof(long)),
-				Put(keys, deleteme, strlen(deleteme), deleteme, generic_free_handler);
+				Put(keys, deleteme, strlen(deleteme), deleteme, NULL);
 			}
 		}
 		cdb_free(cdboi);
@@ -146,11 +190,11 @@ void openid_purge(struct ctdluser *usbuf) {
 
 	/* Go through the hash list, deleting keys we stored in it */
 
-	HashPos = GetNewHashPos();
+	HashPos = GetNewHashPos(keys, 0);
 	while (GetNextHashPos(keys, HashPos, &len, &Key, &Value)!=0)
 	{
-		CtdlLogPrintf(CTDL_DEBUG, "Deleting associated OpenID <%s>\n", Value);
-		cdb_delete(CDB_OPENID, Value, strlen(Value));
+		syslog(LOG_DEBUG, "openid: deleting associated external authenticator <%s>", (char*)Value);
+		cdb_delete(CDB_EXTAUTH, Value, strlen(Value));
 		/* note: don't free(Value) -- deleting the hash list will handle this for us */
 	}
 	DeleteHashPos(&HashPos);
@@ -158,20 +202,27 @@ void openid_purge(struct ctdluser *usbuf) {
 }
 
 
-
 /*
  * List the OpenIDs associated with the currently logged in account
  */
 void cmd_oidl(char *argbuf) {
 	struct cdbdata *cdboi;
+	long usernum = 0L;
 
+	if (CtdlGetConfigInt("c_disable_newu"))
+	{
+		cprintf("%d this system does not support openid.\n", ERROR + CMD_NOT_SUPPORTED);
+		return;
+	}
 	if (CtdlAccessCheck(ac_logged_in)) return;
-	cdb_rewind(CDB_OPENID);
-	cprintf("%d Associated OpenIDs:\n", LISTING_FOLLOWS);
 
-	while (cdboi = cdb_next_item(CDB_OPENID), cdboi != NULL) {
+	cdb_rewind(CDB_EXTAUTH);
+	cprintf("%d Associated external authenticators:\n", LISTING_FOLLOWS);
+
+	while (cdboi = cdb_next_item(CDB_EXTAUTH), cdboi != NULL) {
 		if (cdboi->len > sizeof(long)) {
-			if (((long)*(cdboi->ptr)) == CC->user.usernum) {
+			memcpy(&usernum, cdboi->ptr, sizeof(long));
+			if (usernum == CC->user.usernum) {
 				cprintf("%s\n", cdboi->ptr + sizeof(long));
 			}
 		}
@@ -181,14 +232,56 @@ void cmd_oidl(char *argbuf) {
 }
 
 
+/*
+ * List ALL OpenIDs in the database
+ */
+void cmd_oida(char *argbuf) {
+	struct cdbdata *cdboi;
+	long usernum;
+	struct ctdluser usbuf;
+
+	if (CtdlGetConfigInt("c_disable_newu"))
+	{
+		cprintf("%d this system does not support openid.\n",
+			ERROR + CMD_NOT_SUPPORTED);
+		return;
+	}
+	if (CtdlAccessCheck(ac_aide)) return;
+	cdb_rewind(CDB_EXTAUTH);
+	cprintf("%d List of all OpenIDs in the database:\n", LISTING_FOLLOWS);
+
+	while (cdboi = cdb_next_item(CDB_EXTAUTH), cdboi != NULL) {
+		if (cdboi->len > sizeof(long)) {
+			memcpy(&usernum, cdboi->ptr, sizeof(long));
+			if (CtdlGetUserByNumber(&usbuf, usernum) != 0) {
+				usbuf.fullname[0] = 0;
+			} 
+			cprintf("%s|%ld|%s\n",
+				cdboi->ptr + sizeof(long),
+				usernum,
+				usbuf.fullname
+			);
+		}
+		cdb_free(cdboi);
+	}
+	cprintf("000\n");
+}
+
+
 /*
  * 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) {
-	struct ctdl_openid *oiddata = (struct ctdl_openid *) CC->openid_data;
+	ctdl_openid *oiddata = (ctdl_openid *) CC->openid_data;
 
-	if (!oiddata->verified) {
+	if (CtdlGetConfigInt("c_disable_newu"))
+	{
+		cprintf("%d this system does not support openid.\n",
+			ERROR + CMD_NOT_SUPPORTED);
+		return;
+	}
+	if ( (!oiddata) || (!oiddata->verified) ) {
 		cprintf("%d You have not verified an OpenID yet.\n", ERROR);
 		return;
 	}
@@ -200,11 +293,10 @@ 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);
+		attach_extauth(&CC->user, oiddata->claimed_id);
 	}
-}
-
 
+}
 
 
 /*
@@ -214,17 +306,25 @@ void cmd_oidd(char *argbuf) {
 	struct cdbdata *cdboi;
 	char id_to_detach[1024];
 	int this_is_mine = 0;
+	long usernum = 0L;
 
+	if (CtdlGetConfigInt("c_disable_newu"))
+	{
+		cprintf("%d this system does not support openid.\n",
+			ERROR + CMD_NOT_SUPPORTED);
+		return;
+	}
 	if (CtdlAccessCheck(ac_logged_in)) return;
 	extract_token(id_to_detach, argbuf, 0, '|', sizeof id_to_detach);
 	if (IsEmptyStr(id_to_detach)) {
 		cprintf("%d An empty OpenID URL is not allowed.\n", ERROR + ILLEGAL_VALUE);
 	}
 
-	cdb_rewind(CDB_OPENID);
-	while (cdboi = cdb_next_item(CDB_OPENID), cdboi != NULL) {
+	cdb_rewind(CDB_EXTAUTH);
+	while (cdboi = cdb_next_item(CDB_EXTAUTH), cdboi != NULL) {
 		if (cdboi->len > sizeof(long)) {
-			if (((long)*(cdboi->ptr)) == CC->user.usernum) {
+			memcpy(&usernum, cdboi->ptr, sizeof(long));
+			if (usernum == CC->user.usernum) {
 				this_is_mine = 1;
 			}
 		}
@@ -237,63 +337,96 @@ void cmd_oidd(char *argbuf) {
 		return;
 	}
 
-	cdb_delete(CDB_OPENID, id_to_detach, strlen(id_to_detach));
+	cdb_delete(CDB_EXTAUTH, id_to_detach, strlen(id_to_detach));
 	cprintf("%d %s detached from your account.\n", CIT_OK, id_to_detach);
 }
 
 
-
 /*
- * 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_sri(char *claimed_id, HashList *sri_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 (CtdlGetConfigInt("c_auth_mode") != AUTHMODE_NATIVE) return(1);
+	if (CtdlGetConfigInt("c_disable_newu")) return(2);
 	if (CC->logged_in) return(3);
-	if (!GetHash(sri_keys, "sreg.nickname", 13, (void *) &desired_name)) return(4);
 
-	CtdlLogPrintf(CTDL_DEBUG, "The desired account name is <%s>\n", desired_name);
+	HashPos *HashPos = GetNewHashPos(sreg_keys, 0);
+	while (GetNextHashPos(sreg_keys, HashPos, &len, &Key, &Value) != 0) {
+		syslog(LOG_DEBUG, "openid: %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 (!getuser(&CC->user, desired_name)) {
-		CtdlLogPrintf(CTDL_DEBUG, "<%s> is already taken by another user.\n", desired_name);
+	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, "openid: the desired account name is <%s>", nickname);
+
+	len = cutusername(nickname);
+	if (!CtdlGetUser(&CC->user, nickname)) {
+		syslog(LOG_DEBUG, "openid: <%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, 1)) return(6);
+	if (create_user(nickname, CREATE_USER_BECOME_USER, NATIVE_AUTH_UID)) 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);
-	attach_openid(&CC->user, claimed_id);
-	return(0);
-}
 
-// FIXME we still have to set up the vCard
-
-// identity = [50]  http://uncensored.citadel.org/~ajc/MyID.config.php
-// sreg.nickname = [17]  IGnatius T Foobar
-// sreg.email = [26]  ajc@uncensored.citadel.org
-// sreg.fullname = [10]  Art Cancro
-// sreg.postcode = [5]  10549
-// sreg.country = [2]  US
+	/* Now attach the verified OpenID to this account. */
+	attach_extauth(&CC->user, claimed_id);
 
+	return(0);
+}
 
 
 /*
  * If a user account exists which is associated with the Claimed ID, log it in and return zero.
  * Otherwise it returns nonzero.
  */
-int login_via_openid(char *claimed_id)
+int login_via_extauth(StrBuf *claimed_id)
 {
 	struct cdbdata *cdboi;
 	long usernum = 0;
 
-	cdboi = cdb_fetch(CDB_OPENID, claimed_id, strlen(claimed_id));
+	cdboi = cdb_fetch(CDB_EXTAUTH, ChrPtr(claimed_id), StrLength(claimed_id));
 	if (cdboi == NULL) {
 		return(-1);
 	}
@@ -301,7 +434,7 @@ int login_via_openid(char *claimed_id)
 	memcpy(&usernum, cdboi->ptr, sizeof(long));
 	cdb_free(cdboi);
 
-	if (!getuserbynumber(&CC->user, usernum)) {
+	if (!CtdlGetUserByNumber(&CC->user, usernum)) {
 		/* Now become the user we just created */
 		safestrncpy(CC->curr_user, CC->user.fullname, sizeof CC->curr_user);
 		do_login();
@@ -326,153 +459,360 @@ int login_via_openid(char *claimed_id)
 /* 
  * Locate a <link> tag and, given its 'rel=' parameter, return its 'href' parameter
  */
-void extract_link(char *target_buf, int target_size, char *rel, char *source_buf)
+void extract_link(StrBuf *target_buf, const char *rel, long repllen, StrBuf *source_buf)
 {
-	char *ptr = source_buf;
+	int i;
+	const char *ptr;
+	const char *href_start = NULL;
+	const char *href_end = NULL;
+	const char *link_tag_start = NULL;
+	const char *link_tag_end = NULL;
+	const char *rel_start = NULL;
+	const char *rel_end = NULL;
 
 	if (!target_buf) return;
 	if (!rel) return;
 	if (!source_buf) return;
 
-	target_buf[0] = 0;
-
-	while (ptr = bmstrcasestr(ptr, "<link"), ptr != NULL) {
+	ptr = ChrPtr(source_buf);
 
-		char work_buffer[2048];
-		char *link_tag_start = NULL;
-		char *link_tag_end = NULL;
-
-		char rel_tag[2048];
-		char href_tag[2048];
+	FlushStrBuf(target_buf);
+	while (ptr = cbmstrcasestr(ptr, "<link"), ptr != NULL) {
 
 		link_tag_start = ptr;
 		link_tag_end = strchr(ptr, '>');
-		rel_tag[0] = 0;
-		href_tag[0] = 0;
-
-		if ((link_tag_end) && (link_tag_end > link_tag_start)) {
-			int len;
-			len = link_tag_end - link_tag_start;
-			if (len > sizeof work_buffer) len = sizeof work_buffer;
-			memcpy(work_buffer, link_tag_start, len);
-		
-			char *rel_start = NULL;
-			char *rel_end = NULL;
-			rel_start = bmstrcasestr(work_buffer, "rel=");
-			if (rel_start) {
-				rel_start = strchr(rel_start, '\"');
-				if (rel_start) {
-					++rel_start;
-					rel_end = strchr(rel_start, '\"');
-					if ((rel_end) && (rel_end > rel_start)) {
-						safestrncpy(rel_tag, rel_start, rel_end - rel_start + 1);
-					}
-				}
-			}
+		if (link_tag_end == NULL)
+			break;
+		for (i=0; i < 1; i++ ){
+			rel_start = cbmstrcasestr(link_tag_start, "rel=");
+			if ((rel_start == NULL) ||
+			    (rel_start > link_tag_end)) 
+				continue;
+
+			rel_start = strchr(rel_start, '\"');
+			if ((rel_start == NULL) ||
+			    (rel_start > link_tag_end)) 
+				continue;
+			++rel_start;
+			rel_end = strchr(rel_start, '\"');
+			if ((rel_end == NULL) ||
+			    (rel_end == rel_start) ||
+			    (rel_end >= link_tag_end) ) 
+				continue;
+			if (strncasecmp(rel, rel_start, repllen)!= 0)
+				continue; /* didn't match? never mind... */
+			
+			href_start = cbmstrcasestr(link_tag_start, "href=");
+			if ((href_start == NULL) || 
+			    (href_start >= link_tag_end)) 
+				continue;
+			href_start = strchr(href_start, '\"');
+			if ((href_start == NULL) |
+			    (href_start >= link_tag_end)) 
+				continue;
+			++href_start;
+			href_end = strchr(href_start, '\"');
+			if ((href_end == NULL) || 
+			    (href_end == href_start) ||
+			    (href_start >= link_tag_end)) 
+				continue;
+			StrBufPlain(target_buf, href_start, href_end - href_start);
+		}
+		ptr = link_tag_end;	
+	}
+}
 
-			char *href_start = NULL;
-			char *href_end = NULL;
-			href_start = bmstrcasestr(work_buffer, "href=");
-			if (href_start) {
-				href_start = strchr(href_start, '\"');
-				if (href_start) {
-					++href_start;
-					href_end = strchr(href_start, '\"');
-					if ((href_end) && (href_end > href_start)) {
-						safestrncpy(href_tag, href_start, href_end - href_start + 1);
-					}
-				}
-			}
 
-			if (!strcasecmp(rel, rel_tag)) {
-				safestrncpy(target_buf, href_tag, target_size);
-				return;
-			}
+/*
+ * Wrapper for curl_easy_init() that includes the options common to all calls
+ * used in this module. 
+ */
+CURL *ctdl_openid_curl_easy_init(char *errmsg) {
+	CURL *curl;
 
-		}
+	curl = curl_easy_init();
+	if (!curl) {
+		return(curl);
+	}
+
+	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);
+	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0);
+
+	if (errmsg) {
+		curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errmsg);
+	}
+	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+#ifdef CURLOPT_HTTP_CONTENT_DECODING
+	curl_easy_setopt(curl, CURLOPT_HTTP_CONTENT_DECODING, 1);
+	curl_easy_setopt(curl, CURLOPT_ENCODING, "");
+#endif
+	curl_easy_setopt(curl, CURLOPT_USERAGENT, CITADEL);
+	curl_easy_setopt(curl, CURLOPT_TIMEOUT, 30);		/* die after 30 seconds */
+
+	if (
+		(!IsEmptyStr(CtdlGetConfigStr("c_ip_addr")))
+		&& (strcmp(CtdlGetConfigStr("c_ip_addr"), "*"))
+		&& (strcmp(CtdlGetConfigStr("c_ip_addr"), "::"))
+		&& (strcmp(CtdlGetConfigStr("c_ip_addr"), "0.0.0.0"))
+	) {
+		curl_easy_setopt(curl, CURLOPT_INTERFACE, CtdlGetConfigStr("c_ip_addr"));
+	}
+
+	return(curl);
+}
+
+
+struct xrds {
+	StrBuf *CharData;
+	int nesting_level;
+	int in_xrd;
+	int current_service_priority;
+	int selected_service_priority;
+	StrBuf *current_service_uri;
+	StrBuf *selected_service_uri;
+	int current_service_is_oid2auth;
+};
+
+
+void xrds_xml_start(void *data, const char *supplied_el, const char **attr) {
+	struct xrds *xrds = (struct xrds *) data;
+	int i;
+
+	++xrds->nesting_level;
 
-	++ptr;
+	if (!strcasecmp(supplied_el, "XRD")) {
+		++xrds->in_xrd;
 	}
 
+	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);
 }
 
 
+void xrds_xml_end(void *data, const char *supplied_el) {
+	struct xrds *xrds = (struct xrds *) data;
 
-struct fh_data {
-	char *buf;
-	int total_bytes_received;
-	int maxbytes;
-};
+	--xrds->nesting_level;
 
+	if (!strcasecmp(supplied_el, "XRD")) {
+		--xrds->in_xrd;
+	}
 
-size_t fh_callback(void *ptr, size_t size, size_t nmemb, void *stream)
-{
-	struct fh_data *fh = (struct fh_data *) stream;
-	int got_bytes = (size * nmemb);
+	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 */
+		}
+	}
 
-	if (fh->total_bytes_received + got_bytes > fh->maxbytes) {
-		got_bytes = fh->maxbytes - fh->total_bytes_received;
+	else if (!strcasecmp(supplied_el, "uri")) {
+		if (xrds->in_xrd) {
+			FlushStrBuf(xrds->current_service_uri);
+			StrBufAppendBuf(xrds->current_service_uri, xrds->CharData, 0);
+		}
 	}
-	if (got_bytes > 0) {
-		memcpy(&fh->buf[fh->total_bytes_received], ptr, got_bytes);
-		fh->total_bytes_received += got_bytes;
+
+	else if (!strcasecmp(supplied_el, "service")) {
+		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);
+		}
+
 	}
 
-	return (size * nmemb);	/* always succeed; libcurl doesn't need to know if we truncated it */
+	FlushStrBuf(xrds->CharData);
+}
+
+
+void xrds_xml_chardata(void *data, const XML_Char *s, int len) {
+	struct xrds *xrds = (struct xrds *) data;
+
+	StrBufAppendBufPlain (xrds->CharData, s, len, 0);
 }
 
 
+/*
+ * Parse an XRDS document.
+ * 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;
+
+	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);
+		XML_SetElementHandler(xp, xrds_xml_start, xrds_xml_end);
+		XML_SetCharacterDataHandler(xp, xrds_xml_chardata);
+		XML_Parse(xp, ChrPtr(ReplyBuf), StrLength(ReplyBuf), 0);
+		XML_Parse(xp, "", 0, 1);
+		XML_ParserFree(xp);
+	}
+	else {
+		syslog(LOG_ERR, "openid: cannot create XML parser");
+	}
+
+	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);
+}
+
 
 /*
- * Begin an HTTP fetch (returns number of bytes actually fetched, or -1 for error) using libcurl.
+ * Callback function for perform_openid2_discovery()
+ * We're interested in the X-XRDS-Location: header.
+ */
+size_t yadis_headerfunction(void *ptr, size_t size, size_t nmemb, void *userdata) {
+	char hdr[1024];
+	StrBuf **x_xrds_location = (StrBuf **) userdata;
+
+	memcpy(hdr, ptr, (size*nmemb));
+	hdr[size*nmemb] = 0;
+
+	if (!strncasecmp(hdr, "X-XRDS-Location:", 16)) {
+		*x_xrds_location = NewStrBufPlain(&hdr[16], ((size*nmemb)-16));
+		StrBufTrim(*x_xrds_location);
+	}
+
+	return(size * nmemb);
+}
+
+
+/* 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 'normalize_len' is nonzero, the caller is specifying the buffer size of 'url', and is
- * requesting that the effective (normalized) URL be copied back to it.
+ * If successful, returns nonzero and calls parse_xrds_document() to act upon the received data.
+ * If fails, returns 0 and does nothing else.
  */
-int fetch_http(char *url, char *target_buf, int maxbytes, int normalize_len)
-{
+int perform_openid2_discovery(StrBuf *SuppliedURL) {
+	ctdl_openid *oiddata = (ctdl_openid *) CC->openid_data;
+	int docbytes = (-1);
+	StrBuf *ReplyBuf = NULL;
+	int return_value = 0;
 	CURL *curl;
-	CURLcode res;
+	CURLcode result;
 	char errmsg[1024] = "";
-	struct fh_data fh = {
-		target_buf,
-		0,
-		maxbytes
-	};
-	char *effective_url = NULL;
+	struct curl_slist *my_headers = NULL;
+	StrBuf *x_xrds_location = NULL;
 
-	if (!url) return(-1);
-	if (!target_buf) return(-1);
-	memset(target_buf, 0, maxbytes);
+	if (!SuppliedURL) return(0);
+	syslog(LOG_DEBUG, "openid: perform_openid2_discovery(%s)", ChrPtr(SuppliedURL));
+	if (StrLength(SuppliedURL) == 0) return(0);
 
-	curl = curl_easy_init();
-	if (!curl) {
-		CtdlLogPrintf(CTDL_ALERT, "Unable to initialize libcurl.\n");
-		return(-1);
+	ReplyBuf = NewStrBuf();
+	if (!ReplyBuf) return(0);
+
+	curl = ctdl_openid_curl_easy_init(errmsg);
+	if (!curl) return(0);
+
+	curl_easy_setopt(curl, CURLOPT_URL, ChrPtr(SuppliedURL));
+	curl_easy_setopt(curl, CURLOPT_WRITEDATA, ReplyBuf);
+	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, CurlFillStrBuf_callback);
+
+	my_headers = curl_slist_append(my_headers, "Accept:");	/* disable the default Accept: header */
+	my_headers = curl_slist_append(my_headers, "Accept: application/xrds+xml");
+	curl_easy_setopt(curl, CURLOPT_HTTPHEADER, my_headers);
+
+	curl_easy_setopt(curl, CURLOPT_WRITEHEADER, &x_xrds_location);
+	curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, yadis_headerfunction);
+
+	result = curl_easy_perform(curl);
+	if (result) {
+		syslog(LOG_DEBUG, "openid: libcurl error %d: %s", result, errmsg);
 	}
+	curl_slist_free_all(my_headers);
+	curl_easy_cleanup(curl);
+	docbytes = StrLength(ReplyBuf);
 
-	curl_easy_setopt(curl, CURLOPT_URL, url);
-	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);
-	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0);
-	curl_easy_setopt(curl, CURLOPT_WRITEDATA, &fh);
-	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fh_callback);
-	curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errmsg);
-	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
-	curl_easy_setopt(curl, CURLOPT_USERAGENT, CITADEL);
-	if (!IsEmptyStr(config.c_ip_addr)) {
-		curl_easy_setopt(curl, CURLOPT_INTERFACE, config.c_ip_addr);
+	/*
+	 * The response from the server will be one of:
+	 * 
+	 * 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.
+	 */
+
+	/*
+	 * Option 2: HTTP response-headers that include an X-XRDS-Location response-header,
+	 *           together with a document.
+	 * Option 3: HTTP response-headers only, which MAY include an X-XRDS-Location response-header,
+	 *           a contenttype response-header specifying MIME media type,
+	 *           application/xrds+xml, or both.
+	 *
+	 * 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(SuppliedURL)))
+	) {
+		syslog(LOG_DEBUG, "openid: X-XRDS-Location: %s ... recursing!", ChrPtr(x_xrds_location));
+		return_value = perform_openid2_discovery(x_xrds_location);
+		FreeStrBuf(&x_xrds_location);
 	}
-	res = curl_easy_perform(curl);
-	if (res) {
-		CtdlLogPrintf(CTDL_DEBUG, "fetch_http() libcurl error %d: %s\n", res, errmsg);
+
+	/*
+	 * Option 4: the returned web page may *be* an XRDS document.  Try to parse it.
+	 */
+	if ( (return_value == 0) && (docbytes >= 0)) {
+		return_value = parse_xrds_document(ReplyBuf);
 	}
-	if (normalize_len > 0) {
-		curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &effective_url);
-		safestrncpy(url, effective_url, normalize_len);
+
+	/*
+	 * Option 5: if all else fails, attempt HTML based 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) {
+			return_value = openid_disco_html;
+		}
 	}
-	curl_easy_cleanup(curl);
-	return fh.total_bytes_received;
+
+	if (ReplyBuf != NULL) {
+		FreeStrBuf(&ReplyBuf);
+	}
+	return(return_value);
 }
 
 
@@ -480,222 +820,253 @@ int fetch_http(char *url, char *target_buf, int maxbytes, int normalize_len)
  * Setup an OpenID authentication
  */
 void cmd_oids(char *argbuf) {
-	char return_to[1024];
-	char trust_root[1024];
-	int i;
-	char buf[SIZ];
 	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);
+	const char *Pos = NULL;
+	StrBuf *ArgBuf = NULL;
+	StrBuf *ReplyBuf = NULL;
+	StrBuf *return_to = NULL;
+	StrBuf *RedirectUrl = NULL;
+	ctdl_openid *oiddata;
+	int discovery_succeeded = 0;
+
+	if (CtdlGetConfigInt("c_disable_newu"))
+	{
+		cprintf("%d this system does not support openid.\n",
+			ERROR + CMD_NOT_SUPPORTED);
 		return;
 	}
-	 */
+	Free_ctdl_openid ((ctdl_openid**)&CCC->openid_data);
 
-	if (CCC->openid_data != NULL) {
-		free(CCC->openid_data);
-	}
-	oiddata = malloc(sizeof(struct ctdl_openid));
+	CCC->openid_data = oiddata = malloc(sizeof(ctdl_openid));
 	if (oiddata == NULL) {
+		syslog(LOG_ERR, "openid: malloc() failed: %m");
 		cprintf("%d malloc failed\n", ERROR + INTERNAL_ERROR);
 		return;
 	}
-	memset(oiddata, 0, sizeof(struct ctdl_openid));
-	CCC->openid_data = (void *) oiddata;
+	memset(oiddata, 0, sizeof(ctdl_openid));
+
+	ArgBuf = NewStrBufPlain(argbuf, -1);
 
-	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->verified = 0;
+	oiddata->claimed_id = NewStrBufPlain(NULL, StrLength(ArgBuf));
+	return_to = NewStrBufPlain(NULL, StrLength(ArgBuf));
 
-	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);
-	buf[sizeof buf - 1] = 0;
-	if (i > 0) {
-		char openid_delegate[1024];
+	StrBufExtract_NextToken(oiddata->claimed_id, ArgBuf, &Pos, '|');
+	StrBufExtract_NextToken(return_to, ArgBuf, &Pos, '|');
 
-		extract_link(oiddata->server, sizeof oiddata->server, "openid.server", buf);
-		extract_link(openid_delegate, sizeof openid_delegate, "openid.delegate", buf);
+	syslog(LOG_DEBUG, "openid: user-Supplied Identifier is: %s", ChrPtr(oiddata->claimed_id));
 
-		if (IsEmptyStr(oiddata->server)) {
-			cprintf("%d There is no OpenID identity provider at this URL.\n", ERROR);
-			return;
-		}
+	/********** OpenID 2.0 section 7.3 - Discovery **********/
 
-		/* Empty delegate is legal; we just use the openid_url instead */
-		if (IsEmptyStr(openid_delegate)) {
-			safestrncpy(openid_delegate, oiddata->claimed_id, sizeof openid_delegate);
-		}
+	/* Section 7.3.1 says we have to attempt XRI based discovery.
+	 * No one is using this, no one is asking for it, no one wants it.
+	 * So we're not even going to bother attempting this mode.
+	 */
 
-		/* Assemble a URL to which the user-agent will be redirected. */
-		char redirect_string[4096];
-		char escaped_identity[512];
-		char escaped_return_to[2048];
-		char escaped_trust_root[1024];
-		char escaped_sreg_optional[256];
-
-		urlesc(escaped_identity, sizeof escaped_identity, openid_delegate);
-		urlesc(escaped_return_to, sizeof escaped_return_to, return_to);
-		urlesc(escaped_trust_root, sizeof escaped_trust_root, trust_root);
-		urlesc(escaped_sreg_optional, sizeof escaped_sreg_optional,
-			"nickname,email,fullname,postcode,country");
-
-		snprintf(redirect_string, sizeof redirect_string,
-			"%s"
-			"?openid.mode=checkid_setup"
-			"&openid.identity=%s"
-			"&openid.return_to=%s"
-			"&openid.trust_root=%s"
-			"&openid.sreg.optional=%s"
-			,
-			oiddata->server,
-			escaped_identity,
-			escaped_return_to,
-			escaped_trust_root,
-			escaped_sreg_optional
-		);
-		cprintf("%d %s\n", CIT_OK, redirect_string);
-		return;
+	/* Attempt section 7.3.2 (Yadis discovery) and section 7.3.3 (HTML discovery);
+	 */
+	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);
 	}
 
-	cprintf("%d Unable to fetch OpenID URL\n", ERROR);
-}
+	else {
+		/*
+		 * If we get to this point we are in possession of a valid OpenID Provider URL.
+		 */
+		syslog(LOG_DEBUG, "openid: OP URI '%s' discovered using method %d",
+			ChrPtr(oiddata->op_url),
+			discovery_succeeded
+		);
+
+		/* 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="), 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);
 
+		/* 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(&RedirectUrl);
+}
 
 
 /*
  * Finalize an OpenID authentication
  */
 void cmd_oidf(char *argbuf) {
+	long len;
 	char buf[2048];
 	char thiskey[1024];
 	char thisdata[1024];
 	HashList *keys = NULL;
-	struct ctdl_openid *oiddata = (struct ctdl_openid *) CC->openid_data;
+	const char *Key;
+	void *Value;
+	ctdl_openid *oiddata = (ctdl_openid *) CC->openid_data;
 
+	if (CtdlGetConfigInt("c_disable_newu"))
+	{
+		cprintf("%d this system does not support openid.\n",
+			ERROR + CMD_NOT_SUPPORTED);
+		return;
+	}
+	if (oiddata == NULL) {
+		cprintf("%d run OIDS first.\n", ERROR + INTERNAL_ERROR);
+		return;
+	}
+	if (StrLength(oiddata->op_url) == 0){
+		cprintf("%d No OpenID Endpoint URL has been obtained.\n", ERROR + ILLEGAL_VALUE);
+		return;
+	}
 	keys = NewHash(1, NULL);
 	if (!keys) {
 		cprintf("%d NewHash() failed\n", ERROR + INTERNAL_ERROR);
 		return;
 	}
-	
 	cprintf("%d Transmit OpenID data now\n", START_CHAT_MODE);
 
 	while (client_getln(buf, sizeof buf), strcmp(buf, "000")) {
-		extract_token(thiskey, buf, 0, '|', sizeof thiskey);
+		len = extract_token(thiskey, buf, 0, '|', sizeof thiskey);
+		if (len < 0) {
+			len = sizeof(thiskey) - 1;
+		}
 		extract_token(thisdata, buf, 1, '|', sizeof thisdata);
-		CtdlLogPrintf(CTDL_DEBUG, "%s: [%d] %s\n", thiskey, strlen(thisdata), thisdata);
-		Put(keys, thiskey, strlen(thiskey), strdup(thisdata), generic_free_handler);
+		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, "openid: this is not an an OpenID assertion");
+		oiddata->verified = 0;
+	}
 
-	/* Now that we have all of the parameters, we have to validate the signature against the server */
-	CtdlLogPrintf(CTDL_DEBUG, "About to validate the signature...\n");
+	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, "openid: provider is asserting the Claimed ID '%s'", ChrPtr(oiddata->claimed_id));
+	}
+
+	/* Validate the assertion against the server */
+	syslog(LOG_DEBUG, "openid: 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;
-	char valbuf[1024];
-
-	struct fh_data fh = {
-		valbuf,
-		0,
-		sizeof valbuf
-	};
+	StrBuf *ReplyBuf = NewStrBuf();
 
 	curl_formadd(&formpost, &lastptr,
 		CURLFORM_COPYNAME,	"openid.mode",
 		CURLFORM_COPYCONTENTS,	"check_authentication",
-		CURLFORM_END);
-	CtdlLogPrintf(CTDL_DEBUG, "%25s : %s\n", "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);
-		CtdlLogPrintf(CTDL_DEBUG, "%25s : %s\n", "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);
-			CtdlLogPrintf(CTDL_DEBUG, "%25s : %s\n", "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);
-		CtdlLogPrintf(CTDL_DEBUG, "%25s : %s\n", "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);
-					CtdlLogPrintf(CTDL_DEBUG, "%25s : %s\n", k_o_keyname, k_value);
-				}
-				else {
-					CtdlLogPrintf(CTDL_INFO, "OpenID: signed field '%s' is missing\n",
-						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
+			);
 		}
 	}
+	DeleteHashPos(&HashPos);
 
-	curl = curl_easy_init();
-	curl_easy_setopt(curl, CURLOPT_URL, oiddata->server);
-	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);
-	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0);
-	curl_easy_setopt(curl, CURLOPT_WRITEDATA, &fh);
-	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fh_callback);
+	curl = ctdl_openid_curl_easy_init(errmsg);
+	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);
-	curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errmsg);
-	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
-	curl_easy_setopt(curl, CURLOPT_USERAGENT, CITADEL);
-	if (!IsEmptyStr(config.c_ip_addr)) {
-		curl_easy_setopt(curl, CURLOPT_INTERFACE, config.c_ip_addr);
-	}
 
 	res = curl_easy_perform(curl);
 	if (res) {
-		CtdlLogPrintf(CTDL_DEBUG, "cmd_oidf() libcurl error %d: %s\n", res, errmsg);
+		syslog(LOG_DEBUG, "openid: cmd_oidf() libcurl error %d: %s", res, errmsg);
+		oiddata->verified = 0;
 	}
 	curl_easy_cleanup(curl);
 	curl_formfree(formpost);
 
-	valbuf[fh.total_bytes_received] = 0;
-
-	if (bmstrcasestr(valbuf, "is_valid:true")) {
-		oiddata->verified = 1;
+	if (cbmstrcasestr(ChrPtr(ReplyBuf), "is_valid:true") == NULL) {
+		oiddata->verified = 0;
 	}
+	FreeStrBuf(&ReplyBuf);
 
-	CtdlLogPrintf(CTDL_DEBUG, "Authentication %s.\n", (oiddata->verified ? "succeeded" : "failed") );
+	syslog(LOG_DEBUG, "openid: authentication %s", (oiddata->verified ? "succeeded" : "failed") );
 
 	/* Respond to the client */
 
@@ -703,11 +1074,13 @@ void cmd_oidf(char *argbuf) {
 
 		/* If we were already logged in, attach the OpenID to the user's account */
 		if (CC->logged_in) {
-			if (attach_openid(&CC->user, oiddata->claimed_id) == 0) {
+			if (attach_extauth(&CC->user, oiddata->claimed_id) == 0) {
 				cprintf("attach\n");
+				syslog(LOG_DEBUG, "openid: attach succeeded");
 			}
 			else {
 				cprintf("fail\n");
+				syslog(LOG_DEBUG, "openid: attach failed");
 			}
 		}
 
@@ -721,17 +1094,28 @@ void cmd_oidf(char *argbuf) {
 			 * is associated with the account, they already have password equivalency and can
 			 * login, so they could just as easily change the password, etc.
 			 */
-			if (login_via_openid(oiddata->claimed_id) == 0) {
+			if (login_via_extauth(oiddata->claimed_id) == 0) {
 				cprintf("authenticate\n%s\n%s\n", CC->user.fullname, CC->user.password);
 				logged_in_response();
+				syslog(LOG_DEBUG, "openid: logged in using previously claimed OpenID");
 			}
 
 			/*
-			 * New user whose OpenID is verified and Simple Registration Extension is in use?
+			 * If this system does not allow self-service new user registration, the
+			 * remaining modes do not apply, so fail here and now.
 			 */
-			else if (openid_create_user_via_sri(oiddata->claimed_id, keys) == 0) {
+			else if (CtdlGetConfigInt("c_disable_newu")) {
+				cprintf("fail\n");
+				syslog(LOG_DEBUG, "openid: creating user failed due to local policy");
+			}
+
+			/*
+			 * New user whose OpenID is verified and Attribute Exchange gave us a name?
+			 */
+			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, "openid: successfully auto-created new user");
 			}
 
 			/*
@@ -741,13 +1125,14 @@ void cmd_oidf(char *argbuf) {
 			else {
 				char *desired_name = NULL;
 				cprintf("verify_only\n");
-				cprintf("%s\n", oiddata->claimed_id);
+				cprintf("%s\n", ChrPtr(oiddata->claimed_id));
 				if (GetHash(keys, "sreg.nickname", 13, (void *) &desired_name)) {
 					cprintf("%s\n", desired_name);
 				}
 				else {
 					cprintf("\n");
 				}
+				syslog(LOG_DEBUG, "openid: the desired display name is already taken.");
 			}
 		}
 	}
@@ -756,21 +1141,11 @@ void cmd_oidf(char *argbuf) {
 	}
 	cprintf("000\n");
 
-	/*
-	 * We will eventually do something with the data in the hash list.
-	 *
-	long len;
-	void *Value;
-	char *Key;
-	HashPos *HashPos;
-	HashPos = GetNewHashPos();
-	while (GetNextHashPos(keys, HashPos, &len, &Key, &Value)!=0)
-	{
+	if (oiddata->sreg_keys != NULL) {
+		DeleteHash(&oiddata->sreg_keys);
+		oiddata->sreg_keys = NULL;
 	}
-	DeleteHashPos(&HashPos);
-	 */
-
-	DeleteHash(&keys);		/* This will free() all the key data for us */
+	oiddata->sreg_keys = keys;
 }
 
 
@@ -782,32 +1157,26 @@ void cmd_oidf(char *argbuf) {
 /**************************************************************************/
 
 
-/*
- * This cleanup function blows away the temporary memory used by this module.
- */
-void openid_cleanup_function(void) {
-
-	if (CC->openid_data != NULL) {
-		CtdlLogPrintf(CTDL_DEBUG, "Clearing OpenID session state\n");
-		free(CC->openid_data);
-	}
-}
 
 
 CTDL_MODULE_INIT(openid_rp)
 {
-	if (!threading)
-	{
-		curl_global_init(CURL_GLOBAL_ALL);
-		CtdlRegisterProtoHook(cmd_oids, "OIDS", "Setup OpenID authentication");
-		CtdlRegisterProtoHook(cmd_oidf, "OIDF", "Finalize OpenID authentication");
-		CtdlRegisterProtoHook(cmd_oidl, "OIDL", "List OpenIDs associated with an account");
-		CtdlRegisterProtoHook(cmd_oidd, "OIDD", "Detach an OpenID from an account");
-		CtdlRegisterProtoHook(cmd_oidc, "OIDC", "Create a new user after validating an OpenID");
-		CtdlRegisterSessionHook(openid_cleanup_function, EVT_LOGOUT);
-		CtdlRegisterUserHook(openid_purge, EVT_PURGEUSER);
-	}
-
-	/* return our Subversion id for the Log */
-	return "$Id$";
+	if (!threading) {
+
+		/* Only enable the OpenID command set when native mode authentication is in use. */
+		if (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_NATIVE) {
+			CtdlRegisterProtoHook(cmd_oids, "OIDS", "Setup OpenID authentication");
+			CtdlRegisterProtoHook(cmd_oidf, "OIDF", "Finalize OpenID authentication");
+			CtdlRegisterProtoHook(cmd_oidl, "OIDL", "List OpenIDs associated with an account");
+			CtdlRegisterProtoHook(cmd_oidd, "OIDD", "Detach an OpenID from an account");
+			CtdlRegisterProtoHook(cmd_oidc, "OIDC", "Create new user after validating OpenID");
+			CtdlRegisterProtoHook(cmd_oida, "OIDA", "List all OpenIDs in the database");
+		}
+		CtdlRegisterSessionHook(openid_cleanup_function, EVT_LOGOUT, PRIO_LOGOUT + 10);
+		CtdlRegisterUserHook(extauth_purge, EVT_PURGEUSER);
+		openid_level_supported = 1;	/* This module supports OpenID 1.0 only */
+	}
+
+	/* return our module name for the log */
+	return "openid_rp";
 }