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

diff --git a/citadel/modules/openid/serv_openid_rp.c b/citadel/modules/openid/serv_openid_rp.c
index a802a6c58..c82a6c286 100644
--- a/citadel/modules/openid/serv_openid_rp.c
+++ b/citadel/modules/openid/serv_openid_rp.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * This is an implementation of OpenID 1.1 Relying Party support, in stateless mode.
  *
  * Copyright (c) 2007-2010 by the citadel.org team
@@ -76,7 +74,7 @@ void openid_cleanup_function(void) {
 	struct CitContext *CCC = CC;	/* CachedCitContext - performance boost */
 
 	if (CCC->openid_data != NULL) {
-		CtdlLogPrintf(CTDL_DEBUG, "Clearing OpenID session state\n");
+		syslog(LOG_DEBUG, "Clearing OpenID session state\n");
 		Free_ctdl_openid((ctdl_openid **) &CCC->openid_data);
 	}
 }
@@ -127,11 +125,11 @@ int attach_openid(struct ctdluser *who, StrBuf *claimed_id)
 		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);
 		}
 	}
@@ -150,7 +148,7 @@ int attach_openid(struct ctdluser *who, StrBuf *claimed_id)
 	snprintf(buf, sizeof buf, "User <%s> (#%ld) has claimed the OpenID URL %s\n",
 		 who->fullname, who->usernum, ChrPtr(claimed_id));
 	CtdlAideMessage(buf, "OpenID claim");
-	CtdlLogPrintf(CTDL_INFO, "%s", buf);
+	syslog(LOG_INFO, "%s", buf);
 	return(0);
 }
 
@@ -190,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 */
 	}
@@ -423,11 +421,11 @@ int openid_create_user_via_sreg(StrBuf *claimed_id, HashList *sreg_keys)
 	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);
 
 	len = cutuserkey(desired_name);
 	if (!CtdlGetUser(&CC->user, desired_name)) {
-		CtdlLogPrintf(CTDL_DEBUG, "<%s> is already taken by another user.\n", desired_name);
+		syslog(LOG_DEBUG, "<%s> is already taken by another user.\n", desired_name);
 		memset(&CC->user, 0, sizeof(struct ctdluser));
 		return(5);
 	}
@@ -487,7 +485,7 @@ int login_via_openid(StrBuf *claimed_id)
  */
 void extract_link(StrBuf *target_buf, const char *rel, long repllen, StrBuf *source_buf)
 {
-	int len, i;
+	int i;
 	const char *ptr;
 	const char *href_start = NULL;
 	const char *href_end = NULL;
@@ -510,8 +508,6 @@ void extract_link(StrBuf *target_buf, const char *rel, long repllen, StrBuf *sou
 		if (link_tag_end == NULL)
 			break;
 		for (i=0; i < 1; i++ ){
-			len = link_tag_end - link_tag_start;
-
 			rel_start = cbmstrcasestr(link_tag_start, "rel=");
 			if ((rel_start == NULL) ||
 			    (rel_start > link_tag_end)) 
@@ -571,7 +567,7 @@ int fetch_http(StrBuf *url, StrBuf **target_buf)
 
 	curl = curl_easy_init();
 	if (!curl) {
-		CtdlLogPrintf(CTDL_ALERT, "Unable to initialize libcurl.\n");
+		syslog(LOG_ALERT, "Unable to initialize libcurl.\n");
 		return(-1);
 	}
 
@@ -600,7 +596,7 @@ int fetch_http(StrBuf *url, StrBuf **target_buf)
 	}
 	res = curl_easy_perform(curl);
 	if (res) {
-		CtdlLogPrintf(CTDL_DEBUG, "fetch_http() libcurl error %d: %s\n", res, errmsg);
+		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);
@@ -648,7 +644,7 @@ void cmd_oids(char *argbuf) {
 	oiddata->verified = 0;
 
 	i = fetch_http(oiddata->claimed_id, &ReplyBuf);
-	CtdlLogPrintf(CTDL_DEBUG, "Normalized URL and Claimed ID is: %s\n", 
+	syslog(LOG_DEBUG, "Normalized URL and Claimed ID is: %s\n", 
 		      ChrPtr(oiddata->claimed_id));
 	if ((StrLength(ReplyBuf) > 0) && (i > 0)) {
 
@@ -746,13 +742,13 @@ void cmd_oidf(char *argbuf) {
 		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);
+		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;
@@ -773,14 +769,14 @@ void cmd_oidf(char *argbuf) {
 		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)) {
@@ -788,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)) {
@@ -796,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) {
@@ -808,10 +804,10 @@ 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);
 				}
 			}
@@ -847,7 +843,7 @@ void cmd_oidf(char *argbuf) {
 
 	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);
@@ -857,7 +853,7 @@ void cmd_oidf(char *argbuf) {
 	}
 	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 */
 
@@ -867,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");
 			}
 		}
 
@@ -888,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");
 			}
 
 			/*
@@ -897,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");
 			}
 
 			/*
@@ -906,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");
 			}
 
 			/*
@@ -923,7 +919,7 @@ void cmd_oidf(char *argbuf) {
 				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");
 			}
 		}
 	}
@@ -966,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";
 }