X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fopenid%2Fserv_openid_rp.c;h=576bc22b612c2ef0af0e1754eff3c57d051a881a;hb=5658254acebeff9d46cc8a74908c5203c3f7c369;hp=bc9c3784e0f1b1ff0c338575575c7784e807da0c;hpb=a1a763e6d8a0f20001212467535ba0579e3d01c0;p=citadel.git

diff --git a/citadel/modules/openid/serv_openid_rp.c b/citadel/modules/openid/serv_openid_rp.c
index bc9c3784e..576bc22b6 100644
--- a/citadel/modules/openid/serv_openid_rp.c
+++ b/citadel/modules/openid/serv_openid_rp.c
@@ -544,34 +544,23 @@ void extract_link(StrBuf *target_buf, const char *rel, long repllen, StrBuf *sou
 
 
 /*
- * Begin an HTTP fetch (returns number of bytes actually fetched, or -1 for error) using libcurl.
+ * Wrapper for curl_easy_init() that includes the options common to all calls
+ * used in this module. 
  */
-int fetch_http(StrBuf *url, StrBuf **target_buf)
-{
-	StrBuf *ReplyBuf;
+CURL *ctdl_openid_curl_easy_init(char *errmsg) {
 	CURL *curl;
-	CURLcode res;
-	char errmsg[1024] = "";
-	char *effective_url = NULL;
-
-	if (StrLength(url) <=0 ) return(-1);
-	ReplyBuf = *target_buf = NewStrBuf ();
-	if (ReplyBuf == 0) return(-1);
 
 	curl = curl_easy_init();
 	if (!curl) {
-		syslog(LOG_ALERT, "Unable to initialize libcurl.");
-		return(-1);
+		return(curl);
 	}
 
-	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, ReplyBuf);
-	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, CurlFillStrBuf_callback);
-
-	curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errmsg);
+	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);
@@ -579,6 +568,7 @@ int fetch_http(StrBuf *url, StrBuf **target_buf)
 #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))
 		&& (strcmp(config.c_ip_addr, "*"))
@@ -587,9 +577,36 @@ int fetch_http(StrBuf *url, StrBuf **target_buf)
 	) {
 		curl_easy_setopt(curl, CURLOPT_INTERFACE, config.c_ip_addr);
 	}
-	res = curl_easy_perform(curl);
-	if (res) {
-		syslog(LOG_DEBUG, "libcurl error %d: %s", res, errmsg);
+
+	return(curl);
+}
+
+
+/*
+ * Begin an HTTP fetch (returns number of bytes actually fetched, or -1 for error) using libcurl.
+ */
+int fetch_http(StrBuf *url, StrBuf **target_buf)
+{
+	StrBuf *ReplyBuf;
+	CURL *curl;
+	CURLcode result;
+	char *effective_url = NULL;
+	char errmsg[1024] = "";
+
+	if (StrLength(url) <=0 ) return(-1);
+	ReplyBuf = *target_buf = NewStrBuf ();
+	if (ReplyBuf == 0) return(-1);
+
+	curl = ctdl_openid_curl_easy_init(errmsg);
+	if (!curl) return(-1);
+
+	curl_easy_setopt(curl, CURLOPT_URL, ChrPtr(url));
+	curl_easy_setopt(curl, CURLOPT_WRITEDATA, ReplyBuf);
+	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, CurlFillStrBuf_callback);
+
+	result = curl_easy_perform(curl);
+	if (result) {
+		syslog(LOG_DEBUG, "libcurl error %d: %s", result, errmsg);
 	}
 	curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &effective_url);
 	StrBufPlain(url, effective_url, -1);
@@ -599,16 +616,129 @@ int fetch_http(StrBuf *url, StrBuf **target_buf)
 }
 
 
+
+struct xrds {
+	int nesting_level;
+	int in_xrd;
+	int current_service_priority;
+	int selected_service_priority;	/* more here later */
+};
+
+
+void xrds_xml_start(void *data, const char *supplied_el, const char **attr) {
+	struct xrds *xrds = (struct xrds *) data;
+	int i;
+
+	++xrds->nesting_level;
+
+	if (!strcasecmp(supplied_el, "XRD")) {
+		++xrds->in_xrd;
+		syslog(LOG_DEBUG, "*** XRD CONTAINER BEGIN ***");
+	}
+
+	else if (!strcasecmp(supplied_el, "service")) {
+		xrds->current_service_priority = 0;
+		for (i=0; attr[i] != NULL; i+=2) {
+			if (!strcasecmp(attr[i], "priority")) {
+				xrds->current_service_priority = atoi(attr[i+1]);
+			}
+		}
+	}
+}
+
+
+void xrds_xml_end(void *data, const char *supplied_el) {
+	struct xrds *xrds = (struct xrds *) data;
+
+	--xrds->nesting_level;
+
+	if (!strcasecmp(supplied_el, "XRD")) {
+		--xrds->in_xrd;
+		syslog(LOG_DEBUG, "*** XRD CONTAINER END ***");
+	}
+
+	else if (!strcasecmp(supplied_el, "service")) {
+		/* this is where we should evaluate the service and do stuff */
+		xrds->current_service_priority = 0;
+	}
+}
+
+
+void xrds_xml_chardata(void *data, const XML_Char *s, int len) {
+	struct xrds *xrds = (struct xrds *) data;
+	
+	/* StrBufAppendBufPlain (xrds->CData, s, len, 0); */
+}
+
+
 /*
- * Attempt to perform YADIS discovery.
+ * Parse an XRDS document.
+ * If OpenID stuff is discovered, populate FIXME something and return nonzero
+ * If nothing useful happened, return 0.
+ */
+int parse_xrds_document(StrBuf *ReplyBuf) {
+	struct xrds xrds;
+
+	memset(&xrds, 0, sizeof (struct xrds));
+	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_ALERT, "Cannot create XML parser");
+	}
+
+	return(0);
+}
+
+
+/*
+ * Attempt to perform Yadis discovery.
  * If successful, returns nonzero and fills the session's claimed ID blah FIXME this comment
- * If YADIS fails, returns 0 and does nothing else.
+ * If Yadis fails, returns 0 and does nothing else.
  */
 int perform_yadis_discovery(StrBuf *YadisURL) {
 	int docbytes = (-1);
 	StrBuf *ReplyBuf = NULL;
+	int r;
+	CURL *curl;
+	CURLcode result;
+	char errmsg[1024] = "";
+	struct curl_slist *my_headers = NULL;
+	/*char *effective_url = NULL;*/
+
+	if (YadisURL == NULL) return(0);
+	if (StrLength(YadisURL) == 0) return(0);
+
+	ReplyBuf = NewStrBuf ();
+	if (ReplyBuf == 0) return(0);
+
+	curl = ctdl_openid_curl_easy_init(errmsg);
+	if (!curl) return(0);
+
+	curl_easy_setopt(curl, CURLOPT_URL, ChrPtr(YadisURL));
+	curl_easy_setopt(curl, CURLOPT_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);
 
-	docbytes = fetch_http(YadisURL, &ReplyBuf);
+	result = curl_easy_perform(curl);
+	if (result) {
+		syslog(LOG_DEBUG, "libcurl error %d: %s", result, errmsg);
+	}
+	/*curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &effective_url);
+	StrBufPlain(YadisURL, effective_url, -1);*/
+	curl_slist_free_all(my_headers);
+	curl_easy_cleanup(curl);
+
+	docbytes = StrLength(ReplyBuf);
 	if (docbytes < 0) {
 		return(0);
 	}
@@ -617,21 +747,28 @@ int perform_yadis_discovery(StrBuf *YadisURL) {
 		return(0);
 	}
 
-	/* If we get to this point, something was retrieved.
-	 * Feed it to the XML parser to see if it's an XRDS document.
+	/* FIXME here we need to handle Yadis 1.0 section 6.2.5.
+	 *
+	 * The response from the server will be one of:
+	 * 
+	 * 1. An HTML document with a <head> element that includes a <meta> element with http-equiv
+	 * attribute, X-XRDS-Location,
+	 * 
+	 * 2. HTTP response-headers that include an X-XRDS-Location response-header, together with a
+	 * document
+	 * 
+	 * 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.
+	 * 
+	 * 4. A document of MIME media type, application/xrds+xml
+	 *
+	 * We are only handling case #4 here and assuming that the server returned an XRDS document.
 	 */
-	XML_Parser xp = XML_ParserCreateNS(NULL, ':');
-	if (xp) {
-		XML_Parse(xp, ChrPtr(ReplyBuf), docbytes, 0);
-		XML_Parse(xp, "", 0, 1);
-		XML_ParserFree(xp);
-	}
-	else {
-		syslog(LOG_ALERT, "Cannot create XML parser");
-	}
 
+	/* Parse the XRDS document. */ 
+	r = parse_xrds_document(ReplyBuf);
 	FreeStrBuf(&ReplyBuf);
-	return(0);
+	return(r);
 }
 
 
@@ -680,7 +817,7 @@ void cmd_oids(char *argbuf) {
 	 * So we're not even going to bother attempting this mode.
 	 */
 
-	/* Second we attempt YADIS.
+	/* Second we attempt Yadis.
 	 * Google uses this so we'd better do our best to implement it.
 	 */
 	int yadis_succeeded = perform_yadis_discovery(oiddata->claimed_id);
@@ -859,30 +996,11 @@ void cmd_oidf(char *argbuf) {
 	
 	ReplyBuf = NewStrBuf();
 
-	curl = curl_easy_init();
+	curl = ctdl_openid_curl_easy_init(errmsg);
 	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, 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);
-#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, 180);		/* die after 180 seconds */
-	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) {