From: Wilfried Goesgens <dothebart@citadel.org>
Date: Mon, 28 Nov 2011 21:25:29 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
X-Git-Tag: v8.03~18
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=6afa3d124174856ef257e2d666dea8fd9b62dc7c;hp=5caf251b54c8ccd56f56441e256e13e88d2645f1;p=citadel.git

Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
---

diff --git a/citadel/modules/openid/serv_openid_rp.c b/citadel/modules/openid/serv_openid_rp.c
index 14717d047..7feb11336 100644
--- a/citadel/modules/openid/serv_openid_rp.c
+++ b/citadel/modules/openid/serv_openid_rp.c
@@ -681,6 +681,8 @@ void xrds_xml_chardata(void *data, const XML_Char *s, int len) {
 int parse_xrds_document(StrBuf *ReplyBuf) {
 	struct xrds xrds;
 
+	syslog(LOG_DEBUG, "\033[32m --- XRDS DOCUMENT --- \n%s\033[0m", ChrPtr(ReplyBuf));
+
 	memset(&xrds, 0, sizeof (struct xrds));
 	XML_Parser xp = XML_ParserCreate(NULL);
 	if (xp) {
@@ -701,7 +703,7 @@ int parse_xrds_document(StrBuf *ReplyBuf) {
 
 
 /*
- * Callback function for perform_yadis_discovery()
+ * 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) {
@@ -722,10 +724,13 @@ size_t yadis_headerfunction(void *ptr, size_t size, size_t nmemb, void *userdata
 
 
 /* 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 Yadis fails, returns 0 and does nothing else.
+ * If fails, returns 0 and does nothing else.
  */
-int perform_yadis_discovery(StrBuf *YadisURL) {
+int perform_openid2_discovery(StrBuf *YadisURL) {
 	int docbytes = (-1);
 	StrBuf *ReplyBuf = NULL;
 	int return_value = 0;
@@ -734,9 +739,10 @@ int perform_yadis_discovery(StrBuf *YadisURL) {
 	char errmsg[1024] = "";
 	struct curl_slist *my_headers = NULL;
 	StrBuf *x_xrds_location = NULL;
+	ctdl_openid *oiddata = (ctdl_openid *) CC->openid_data;
 
 	if (YadisURL == NULL) return(0);
-	syslog(LOG_DEBUG, "perform_yadis_discovery(%s)", ChrPtr(YadisURL));
+	syslog(LOG_DEBUG, "perform_openid2_discovery(%s)", ChrPtr(YadisURL));
 	if (StrLength(YadisURL) == 0) return(0);
 
 	ReplyBuf = NewStrBuf ();
@@ -785,7 +791,7 @@ int perform_yadis_discovery(StrBuf *YadisURL) {
 		&& (strcmp(ChrPtr(x_xrds_location), ChrPtr(YadisURL)))
 	) {
 		syslog(LOG_DEBUG, "X-XRDS-Location: %s ... recursing!", ChrPtr(x_xrds_location));
-		return_value = perform_yadis_discovery(x_xrds_location);
+		return_value = perform_openid2_discovery(x_xrds_location);
 		FreeStrBuf(&x_xrds_location);
 	}
 
@@ -796,6 +802,17 @@ int perform_yadis_discovery(StrBuf *YadisURL) {
 		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");
+		extract_link(oiddata->server, HKEY("openid2.provider"), ReplyBuf);
+		if (StrLength(oiddata->server) > 0) {
+			syslog(LOG_DEBUG, "\033[31mHTML DISCO PROVIDER: %s\033[0m", ChrPtr(oiddata->server));
+		}
+	}
+
 	if (ReplyBuf != NULL) {
 		FreeStrBuf(&ReplyBuf);
 	}
@@ -841,21 +858,24 @@ void cmd_oids(char *argbuf) {
 	syslog(LOG_DEBUG, "User-Supplied Identifier is: %s", ChrPtr(oiddata->claimed_id));
 
 
+#if 0
 	/********** OpenID 2.0 section 7.3 - Discovery **********/
 
-	/* First we're supposed to attempt XRI based resolution.
+	/* 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.
 	 */
 
-	/* Second we attempt Yadis.
-	 * Google uses this so we'd better do our best to implement it.
+	/* Attempt section 7.3.2 (Yadis discovery) and section 7.3.3 (HTML discovery);
 	 */
-	int yadis_succeeded = perform_yadis_discovery(oiddata->claimed_id);
+	int yadis_succeeded = perform_openid2_discovery(oiddata->claimed_id);
+#endif
+
+
+
+	/************ OPENID 1.1 **********/
 
-	/* Third we attempt HTML-based discovery.  Here we go! */
-	if (	(yadis_succeeded == 0)
-		&& (fetch_http(oiddata->claimed_id, &ReplyBuf) > 0)
+	if (	(fetch_http(oiddata->claimed_id, &ReplyBuf) > 0)
 		&& (StrLength(ReplyBuf) > 0)
 	) {
 		openid_delegate = NewStrBuf();