X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fopenid%2Fserv_openid_rp.c;h=c82a6c286a0a5175fe3a2f1a646f4ddf2873ff11;hb=e26a8dee20d1726b4995821f717f867f50fc5659;hp=603efac2a423a3ccdb6085bbc958631c27d7af35;hpb=78298be115a3638e569b065b34ad27a0b7d74e2e;p=citadel.git

diff --git a/citadel/modules/openid/serv_openid_rp.c b/citadel/modules/openid/serv_openid_rp.c
index 603efac2a..c82a6c286 100644
--- a/citadel/modules/openid/serv_openid_rp.c
+++ b/citadel/modules/openid/serv_openid_rp.c
@@ -1,8 +1,21 @@
 /*
- * $Id$
- *
  * This is an implementation of OpenID 1.1 Relying Party support, in stateless mode.
  *
+ * Copyright (c) 2007-2010 by the citadel.org team
+ *
+ * This program is free 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "sysdep.h"
@@ -35,15 +48,36 @@
 #include "citserver.h"
 #include "user_ops.h"
 
-struct ctdl_openid {
-	char claimed_id[1024];
-	char server[1024];
+typedef struct _ctdl_openid {
+	StrBuf *claimed_id;
+	StrBuf *server;
 	int verified;
 	HashList *sreg_keys;
-};
+} ctdl_openid;
+
+void Free_ctdl_openid(ctdl_openid **FreeMe)
+{
+	if (*FreeMe == NULL)
+		return;
+	FreeStrBuf(&(*FreeMe)->claimed_id);
+	FreeStrBuf(&(*FreeMe)->server);
+	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, "Clearing OpenID session state\n");
+		Free_ctdl_openid((ctdl_openid **) &CCC->openid_data);
+	}
+}
 
 
 /**************************************************************************/
@@ -72,7 +106,7 @@ struct ctdl_openid {
 /*
  * Attach an OpenID to a Citadel account
  */
-int attach_openid(struct ctdluser *who, char *claimed_id)
+int attach_openid(struct ctdluser *who, StrBuf *claimed_id)
 {
 	struct cdbdata *cdboi;
 	long fetched_usernum;
@@ -81,41 +115,40 @@ int attach_openid(struct ctdluser *who, char *claimed_id)
 	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 */
 
-	cdboi = cdb_fetch(CDB_OPENID, claimed_id, strlen(claimed_id));
+	cdboi = cdb_fetch(CDB_OPENID, 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, "%s already associated; no action is taken\n", ChrPtr(claimed_id));
 			return(0);
 		}
 		else {
-			CtdlLogPrintf(CTDL_INFO, "%s already belongs to another user\n", claimed_id);
+			syslog(LOG_INFO, "%s already belongs to another user\n", 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_OPENID, ChrPtr(claimed_id), StrLength(claimed_id), data, data_len);
 	free(data);
 
 	snprintf(buf, sizeof buf, "User <%s> (#%ld) has claimed the OpenID URL %s\n",
-		who->fullname, who->usernum, claimed_id);
-	aide_message(buf, "OpenID claim");
-	CtdlLogPrintf(CTDL_INFO, "%s", buf);
+		 who->fullname, who->usernum, ChrPtr(claimed_id));
+	CtdlAideMessage(buf, "OpenID claim");
+	syslog(LOG_INFO, "%s", buf);
 	return(0);
 }
 
@@ -132,6 +165,7 @@ void openid_purge(struct ctdluser *usbuf) {
 	long len;
 	void *Value;
 	const char *Key;
+	long usernum = 0L;
 
 	keys = NewHash(1, NULL);
 	if (!keys) return;
@@ -140,9 +174,10 @@ void openid_purge(struct ctdluser *usbuf) {
 	cdb_rewind(CDB_OPENID);
 	while (cdboi = cdb_next_item(CDB_OPENID), 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);
@@ -153,7 +188,7 @@ void openid_purge(struct ctdluser *usbuf) {
 	HashPos = GetNewHashPos(keys, 0);
 	while (GetNextHashPos(keys, HashPos, &len, &Key, &Value)!=0)
 	{
-		CtdlLogPrintf(CTDL_DEBUG, "Deleting associated OpenID <%s>\n", Value);
+		syslog(LOG_DEBUG, "Deleting associated OpenID <%s>\n", (char*)Value);
 		cdb_delete(CDB_OPENID, Value, strlen(Value));
 		/* note: don't free(Value) -- deleting the hash list will handle this for us */
 	}
@@ -168,6 +203,7 @@ void openid_purge(struct ctdluser *usbuf) {
  */
 void cmd_oidl(char *argbuf) {
 	struct cdbdata *cdboi;
+	long usernum = 0L;
 
 	if (CtdlAccessCheck(ac_logged_in)) return;
 	cdb_rewind(CDB_OPENID);
@@ -175,7 +211,8 @@ void cmd_oidl(char *argbuf) {
 
 	while (cdboi = cdb_next_item(CDB_OPENID), 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));
 			}
 		}
@@ -200,7 +237,7 @@ void cmd_oida(char *argbuf) {
 	while (cdboi = cdb_next_item(CDB_OPENID), cdboi != NULL) {
 		if (cdboi->len > sizeof(long)) {
 			memcpy(&usernum, cdboi->ptr, sizeof(long));
-			if (getuserbynumber(&usbuf, usernum) != 0) {
+			if (CtdlGetUserByNumber(&usbuf, usernum) != 0) {
 				usbuf.fullname[0] = 0;
 			} 
 			cprintf("%s|%ld|%s\n",
@@ -302,7 +339,7 @@ void populate_vcard_from_sreg(HashList *sreg_keys) {
  * 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) {
 		cprintf("%d You have not verified an OpenID yet.\n", ERROR);
@@ -339,6 +376,7 @@ void cmd_oidd(char *argbuf) {
 	struct cdbdata *cdboi;
 	char id_to_detach[1024];
 	int this_is_mine = 0;
+	long usernum = 0L;
 
 	if (CtdlAccessCheck(ac_logged_in)) return;
 	extract_token(id_to_detach, argbuf, 0, '|', sizeof id_to_detach);
@@ -349,7 +387,8 @@ void cmd_oidd(char *argbuf) {
 	cdb_rewind(CDB_OPENID);
 	while (cdboi = cdb_next_item(CDB_OPENID), 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;
 			}
 		}
@@ -371,26 +410,28 @@ void cmd_oidd(char *argbuf) {
 /*
  * Attempt to auto-create a new Citadel account using the nickname from Simple Registration Extension
  */
-int openid_create_user_via_sreg(char *claimed_id, HashList *sreg_keys)
+int openid_create_user_via_sreg(StrBuf *claimed_id, HashList *sreg_keys)
 {
 	char *desired_name = NULL;
 	char new_password[32];
+	long len;
 
 	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);
 
-	CtdlLogPrintf(CTDL_DEBUG, "The desired account name is <%s>\n", desired_name);
+	syslog(LOG_DEBUG, "The desired account name is <%s>\n", desired_name);
 
-	if (!getuser(&CC->user, desired_name)) {
-		CtdlLogPrintf(CTDL_DEBUG, "<%s> is already taken by another user.\n", desired_name);
+	len = cutuserkey(desired_name);
+	if (!CtdlGetUser(&CC->user, desired_name)) {
+		syslog(LOG_DEBUG, "<%s> is already taken by another user.\n", desired_name);
 		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(desired_name, len, 1)) return(6);
 
 	snprintf(new_password, sizeof new_password, "%08lx%08lx", random(), random());
 	CtdlSetPassword(new_password);
@@ -404,12 +445,12 @@ int openid_create_user_via_sreg(char *claimed_id, HashList *sreg_keys)
  * 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_openid(StrBuf *claimed_id)
 {
 	struct cdbdata *cdboi;
 	long usernum = 0;
 
-	cdboi = cdb_fetch(CDB_OPENID, claimed_id, strlen(claimed_id));
+	cdboi = cdb_fetch(CDB_OPENID, ChrPtr(claimed_id), StrLength(claimed_id));
 	if (cdboi == NULL) {
 		return(-1);
 	}
@@ -417,7 +458,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();
@@ -442,137 +483,101 @@ 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) {
-
-		char work_buffer[2048];
-		char *link_tag_start = NULL;
-		char *link_tag_end = NULL;
+	ptr = ChrPtr(source_buf);
 
-		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);
-					}
-				}
-			}
-
-			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;
-			}
-
+		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;
+		ptr = link_tag_end;	
 	}
-
-
 }
 
 
-
-struct fh_data {
-	char *buf;
-	int total_bytes_received;
-	int maxbytes;
-};
-
-
-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);
-
-	if (fh->total_bytes_received + got_bytes > fh->maxbytes) {
-		got_bytes = fh->maxbytes - fh->total_bytes_received;
-	}
-	if (got_bytes > 0) {
-		memcpy(&fh->buf[fh->total_bytes_received], ptr, got_bytes);
-		fh->total_bytes_received += got_bytes;
-	}
-
-	return (size * nmemb);	/* always succeed; libcurl doesn't need to know if we truncated it */
-}
-
-
-
 /*
  * Begin an HTTP fetch (returns number of bytes actually fetched, or -1 for error) using libcurl.
  *
  * 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.
  */
-int fetch_http(char *url, char *target_buf, int maxbytes, int normalize_len)
+int fetch_http(StrBuf *url, StrBuf **target_buf)
 {
+	StrBuf *ReplyBuf;
 	CURL *curl;
 	CURLcode res;
 	char errmsg[1024] = "";
-	struct fh_data fh = {
-		target_buf,
-		0,
-		maxbytes
-	};
 	char *effective_url = NULL;
 
-	if (!url) return(-1);
-	if (!target_buf) return(-1);
-	memset(target_buf, 0, maxbytes);
+	if (StrLength(url) <=0 ) return(-1);
+	ReplyBuf = *target_buf = NewStrBuf ();
+	if (ReplyBuf == 0) return(-1);
 
 	curl = curl_easy_init();
 	if (!curl) {
-		CtdlLogPrintf(CTDL_ALERT, "Unable to initialize libcurl.\n");
+		syslog(LOG_ALERT, "Unable to initialize libcurl.\n");
 		return(-1);
 	}
 
-	curl_easy_setopt(curl, CURLOPT_URL, url);
+	curl_easy_setopt(curl, CURLOPT_URL, ChrPtr(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_WRITEDATA, ReplyBuf);
+	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, CurlFillStrBuf_callback);
+
 	curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errmsg);
 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
 #ifdef CURLOPT_HTTP_CONTENT_DECODING
@@ -581,19 +586,23 @@ int fetch_http(char *url, char *target_buf, int maxbytes, int normalize_len)
 #endif
 	curl_easy_setopt(curl, CURLOPT_USERAGENT, CITADEL);
 	curl_easy_setopt(curl, CURLOPT_TIMEOUT, 180);		/* die after 180 seconds */
-	if (!IsEmptyStr(config.c_ip_addr)) {
+	if (
+		(!IsEmptyStr(config.c_ip_addr))
+		&& (strcmp(config.c_ip_addr, "*"))
+		&& (strcmp(config.c_ip_addr, "::"))
+		&& (strcmp(config.c_ip_addr, "0.0.0.0"))
+	) {
 		curl_easy_setopt(curl, CURLOPT_INTERFACE, config.c_ip_addr);
 	}
 	res = curl_easy_perform(curl);
 	if (res) {
-		CtdlLogPrintf(CTDL_DEBUG, "fetch_http() libcurl error %d: %s\n", res, errmsg);
-	}
-	if (normalize_len > 0) {
-		curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &effective_url);
-		safestrncpy(url, effective_url, normalize_len);
+		syslog(LOG_DEBUG, "fetch_http() libcurl error %d: %s\n", res, errmsg);
 	}
+	curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &effective_url);
+	StrBufPlain(url, effective_url, -1);
+	
 	curl_easy_cleanup(curl);
-	return fh.total_bytes_received;
+	return StrLength(ReplyBuf);
 }
 
 
@@ -601,84 +610,99 @@ 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];
+	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;
 	int i;
-	char buf[SIZ];
 	struct CitContext *CCC = CC;	/* CachedCitContext - performance boost */
-	struct ctdl_openid *oiddata;
+	ctdl_openid *oiddata;
 
-	oiddata = (struct ctdl_openid *) CCC->openid_data;
+	Free_ctdl_openid ((ctdl_openid**)&CCC->openid_data);
 
-	if (oiddata != NULL) {
-		if (oiddata->sreg_keys != NULL) {
-			DeleteHash(&oiddata->sreg_keys);
-			oiddata->sreg_keys = NULL;
-		}
-		free(CCC->openid_data);
-	}
-	oiddata = malloc(sizeof(struct ctdl_openid));
+	CCC->openid_data = oiddata = malloc(sizeof(ctdl_openid));
 	if (oiddata == NULL) {
 		cprintf("%d malloc failed\n", ERROR + INTERNAL_ERROR);
 		return;
 	}
-	memset(oiddata, 0, sizeof(struct ctdl_openid));
+	memset(oiddata, 0, sizeof(ctdl_openid));
 	CCC->openid_data = (void *) oiddata;
 
-	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);
+	ArgBuf = NewStrBufPlain(argbuf, -1);
+
+	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, '|');
+	
 	oiddata->verified = 0;
 
-	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];
+	i = fetch_http(oiddata->claimed_id, &ReplyBuf);
+	syslog(LOG_DEBUG, "Normalized URL and Claimed ID is: %s\n", 
+		      ChrPtr(oiddata->claimed_id));
+	if ((StrLength(ReplyBuf) > 0) && (i > 0)) {
 
-		extract_link(oiddata->server, sizeof oiddata->server, "openid.server", buf);
-		extract_link(openid_delegate, sizeof openid_delegate, "openid.delegate", buf);
+		openid_delegate = NewStrBuf();
+		oiddata->server = NewStrBuf();
+		extract_link(oiddata->server, HKEY("openid.server"), ReplyBuf);
+		extract_link(openid_delegate, HKEY("openid.delegate"), ReplyBuf);
 
-		if (IsEmptyStr(oiddata->server)) {
+		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;
 		}
 
 		/* Empty delegate is legal; we just use the openid_url instead */
-		if (IsEmptyStr(openid_delegate)) {
-			safestrncpy(openid_delegate, oiddata->claimed_id, sizeof openid_delegate);
+		if (StrLength(openid_delegate) == 0) {
+			StrBufPlain(openid_delegate, SKEY(oiddata->claimed_id));
 		}
 
 		/* 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,dob,gender");
-
-		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);
+
+		RedirectUrl = NewStrBufDup(oiddata->server);
+
+		StrBufAppendBufPlain(RedirectUrl, HKEY("?openid.mode=checkid_setup"
+						       "&openid.identity="), 0);
+		StrBufUrlescAppend(RedirectUrl, openid_delegate, 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);
+
+		StrBufAppendBufPlain(RedirectUrl, HKEY("&openid.sreg.optional="), 0);
+		StrBufUrlescAppend(RedirectUrl, NULL, "nickname,email,fullname,postcode,country,dob,gender");
+
+		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);
 }
@@ -691,30 +715,40 @@ void cmd_oids(char *argbuf) {
  * 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;
+	ctdl_openid *oiddata = (ctdl_openid *) CC->openid_data;
 
+	if (oiddata == NULL) {
+		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);
+		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);
+		syslog(LOG_DEBUG, "%s: ["SIZE_T_FMT"] %s\n", thiskey, strlen(thisdata), thisdata);
+		Put(keys, thiskey, len, strdup(thisdata), NULL);
 	}
 
 
 	/* 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");
+	syslog(LOG_DEBUG, "About to validate the signature...\n");
 
 	CURL *curl;
 	CURLcode res;
@@ -729,26 +763,20 @@ void cmd_oidf(char *argbuf) {
 	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;
 
 	curl_formadd(&formpost, &lastptr,
 		CURLFORM_COPYNAME,	"openid.mode",
 		CURLFORM_COPYCONTENTS,	"check_authentication",
 		CURLFORM_END);
-	CtdlLogPrintf(CTDL_DEBUG, "%25s : %s\n", "openid.mode", "check_authentication");
+	syslog(LOG_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);
+		syslog(LOG_DEBUG, "%25s : %s\n", "openid.assoc_handle", o_assoc_handle);
 	}
 
 	if (GetHash(keys, "sig", 3, (void *) &o_sig)) {
@@ -756,7 +784,7 @@ void cmd_oidf(char *argbuf) {
 			CURLFORM_COPYNAME,	"openid.sig",
 			CURLFORM_COPYCONTENTS,	o_sig,
 			CURLFORM_END);
-			CtdlLogPrintf(CTDL_DEBUG, "%25s : %s\n", "openid.sig", o_sig);
+			syslog(LOG_DEBUG, "%25s : %s\n", "openid.sig", o_sig);
 	}
 
 	if (GetHash(keys, "signed", 6, (void *) &o_signed)) {
@@ -764,7 +792,7 @@ void cmd_oidf(char *argbuf) {
 			CURLFORM_COPYNAME,	"openid.signed",
 			CURLFORM_COPYCONTENTS,	o_signed,
 			CURLFORM_END);
-		CtdlLogPrintf(CTDL_DEBUG, "%25s : %s\n", "openid.signed", o_signed);
+		syslog(LOG_DEBUG, "%25s : %s\n", "openid.signed", o_signed);
 
 		num_signed_values = num_tokens(o_signed, ',');
 		for (i=0; i<num_signed_values; ++i) {
@@ -776,22 +804,25 @@ void cmd_oidf(char *argbuf) {
 						CURLFORM_COPYNAME,	k_o_keyname,
 						CURLFORM_COPYCONTENTS,	k_value,
 						CURLFORM_END);
-					CtdlLogPrintf(CTDL_DEBUG, "%25s : %s\n", k_o_keyname, k_value);
+					syslog(LOG_DEBUG, "%25s : %s\n", k_o_keyname, k_value);
 				}
 				else {
-					CtdlLogPrintf(CTDL_INFO, "OpenID: signed field '%s' is missing\n",
+					syslog(LOG_INFO, "OpenID: signed field '%s' is missing\n",
 						k_keyname);
 				}
 			}
 		}
 	}
+	
+	ReplyBuf = NewStrBuf();
 
 	curl = curl_easy_init();
-	curl_easy_setopt(curl, CURLOPT_URL, oiddata->server);
+	curl_easy_setopt(curl, CURLOPT_URL, ChrPtr(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_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);
@@ -801,24 +832,28 @@ void cmd_oidf(char *argbuf) {
 #endif
 	curl_easy_setopt(curl, CURLOPT_USERAGENT, CITADEL);
 	curl_easy_setopt(curl, CURLOPT_TIMEOUT, 180);		/* die after 180 seconds */
-	if (!IsEmptyStr(config.c_ip_addr)) {
+	if (
+		(!IsEmptyStr(config.c_ip_addr))
+		&& (strcmp(config.c_ip_addr, "*"))
+		&& (strcmp(config.c_ip_addr, "::"))
+		&& (strcmp(config.c_ip_addr, "0.0.0.0"))
+	) {
 		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, "cmd_oidf() libcurl error %d: %s\n", res, errmsg);
 	}
 	curl_easy_cleanup(curl);
 	curl_formfree(formpost);
 
-	valbuf[fh.total_bytes_received] = 0;
-
-	if (bmstrcasestr(valbuf, "is_valid:true")) {
+	if (cbmstrcasestr(ChrPtr(ReplyBuf), "is_valid:true")) {
 		oiddata->verified = 1;
 	}
+	FreeStrBuf(&ReplyBuf);
 
-	CtdlLogPrintf(CTDL_DEBUG, "Authentication %s.\n", (oiddata->verified ? "succeeded" : "failed") );
+	syslog(LOG_DEBUG, "Authentication %s.\n", (oiddata->verified ? "succeeded" : "failed") );
 
 	/* Respond to the client */
 
@@ -828,11 +863,11 @@ void cmd_oidf(char *argbuf) {
 		if (CC->logged_in) {
 			if (attach_openid(&CC->user, oiddata->claimed_id) == 0) {
 				cprintf("attach\n");
-				CtdlLogPrintf(CTDL_DEBUG, "OpenID attach succeeded\n");
+				syslog(LOG_DEBUG, "OpenID attach succeeded\n");
 			}
 			else {
 				cprintf("fail\n");
-				CtdlLogPrintf(CTDL_DEBUG, "OpenID attach failed\n");
+				syslog(LOG_DEBUG, "OpenID attach failed\n");
 			}
 		}
 
@@ -849,7 +884,7 @@ void cmd_oidf(char *argbuf) {
 			if (login_via_openid(oiddata->claimed_id) == 0) {
 				cprintf("authenticate\n%s\n%s\n", CC->user.fullname, CC->user.password);
 				logged_in_response();
-				CtdlLogPrintf(CTDL_DEBUG, "Logged in using previously claimed OpenID\n");
+				syslog(LOG_DEBUG, "Logged in using previously claimed OpenID\n");
 			}
 
 			/*
@@ -858,7 +893,7 @@ void cmd_oidf(char *argbuf) {
 			 */
 			else if (config.c_disable_newu) {
 				cprintf("fail\n");
-				CtdlLogPrintf(CTDL_DEBUG, "Creating user failed due to local policy\n");
+				syslog(LOG_DEBUG, "Creating user failed due to local policy\n");
 			}
 
 			/*
@@ -867,7 +902,7 @@ void cmd_oidf(char *argbuf) {
 			else if (openid_create_user_via_sreg(oiddata->claimed_id, keys) == 0) {
 				cprintf("authenticate\n%s\n%s\n", CC->user.fullname, CC->user.password);
 				logged_in_response();
-				CtdlLogPrintf(CTDL_DEBUG, "Successfully auto-created new user\n");
+				syslog(LOG_DEBUG, "Successfully auto-created new user\n");
 			}
 
 			/*
@@ -877,14 +912,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");
 				}
-				CtdlLogPrintf(CTDL_DEBUG, "The desired Simple Registration name is already taken.\n");
+				syslog(LOG_DEBUG, "The desired Simple Registration name is already taken.\n");
 			}
 		}
 	}
@@ -909,21 +944,6 @@ void cmd_oidf(char *argbuf) {
 /**************************************************************************/
 
 
-/*
- * This cleanup function blows away the temporary memory used by this module.
- */
-void openid_cleanup_function(void) {
-	struct ctdl_openid *oiddata = (struct ctdl_openid *) CC->openid_data;
-
-	if (oiddata != NULL) {
-		CtdlLogPrintf(CTDL_DEBUG, "Clearing OpenID session state\n");
-		if (oiddata->sreg_keys != NULL) {
-			DeleteHash(&oiddata->sreg_keys);
-			oiddata->sreg_keys = NULL;
-		}
-		free(oiddata);
-	}
-}
 
 
 CTDL_MODULE_INIT(openid_rp)
@@ -942,8 +962,9 @@ CTDL_MODULE_INIT(openid_rp)
 		}
 		CtdlRegisterSessionHook(openid_cleanup_function, EVT_LOGOUT);
 		CtdlRegisterUserHook(openid_purge, EVT_PURGEUSER);
+		openid_level_supported = 1;	/* This module supports OpenID 1.0 only */
 	}
 
-	/* return our Subversion id for the Log */
-	return "$Id$";
+	/* return our module name for the log */
+	return "openid_rp";
 }