void xrds_xml_chardata(void *data, const XML_Char *s, int len) {
struct xrds *xrds = (struct xrds *) data;
+
+ if (xrds) ; /* this is only here to silence the warning for now */
/* StrBufAppendBufPlain (xrds->CData, s, len, 0); */
}
syslog(LOG_ALERT, "Cannot create XML parser");
}
- return(0);
+ return(0); /* FIXME return nonzero if something wonderful happened */
}
+
/*
- * Attempt to perform Yadis discovery.
- * If successful, returns nonzero and fills the session's claimed ID blah FIXME this comment
+ * Callback function for perform_yadis_discovery()
+ * We're interested in HTTP headers returned from the server.
+ */
+size_t yadis_headerfunction(void *ptr, size_t size, size_t nmemb, void *userdata) {
+ char hdr[1024];
+ char *x_xrds_location = (char *) userdata;
+
+ memcpy(hdr, ptr, (size*nmemb));
+ hdr[size*nmemb] = 0;
+
+ /* We are looking for a header like this:
+ * X-XRDS-Location: https://api.screenname.aol.com/auth/openid/xrds
+ */
+ if (!strncasecmp(hdr, "X-XRDS-Location:", 16)) {
+ safestrncpy(x_xrds_location, &hdr[16], 1024);
+ striplt(x_xrds_location);
+ }
+
+ return(size * nmemb);
+}
+
+
+
+/* Attempt to perform Yadis discovery as specified in Yadis 1.0 section 6.2.5.
+ * If successful, returns nonzero and calls parse_xrds_document() to act upon the received data.
* If Yadis fails, returns 0 and does nothing else.
*/
int perform_yadis_discovery(StrBuf *YadisURL) {
CURLcode result;
char errmsg[1024] = "";
struct curl_slist *my_headers = NULL;
- /*char *effective_url = NULL;*/
+ char x_xrds_location[1024] = "";
if (YadisURL == NULL) return(0);
if (StrLength(YadisURL) == 0) return(0);
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, "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);
- }
- if (docbytes == 0) {
- FreeStrBuf(&ReplyBuf);
- return(0);
- }
+
/* 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
+ * Option 1: An HTML document with a <head> element that includes a <meta> element with http-equiv
* attribute, X-XRDS-Location,
+ */
+
+ /*
+ * Option 2: HTTP response-headers that include an X-XRDS-Location response-header, together with a
+ * document (NOTE: we can probably recurse for this)
*
- * 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,
+ * 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.
- *
- * 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.
+ * If the X-XRDS-Location was set, we know about it at this point...
*/
+ if (!IsEmptyStr(x_xrds_location)) {
+ syslog(LOG_DEBUG, "\033[31m FIXME \033[32m %s \033[0m", x_xrds_location);
+ }
+
+ /*
+ * Option 4: the returned web page may *be* an XRDS document. Try to parse it.
+ */
+ r = 0;
+ if (docbytes >= 0) {
+ r = parse_xrds_document(ReplyBuf);
+ FreeStrBuf(&ReplyBuf);
+ }
- /* Parse the XRDS document. */
- r = parse_xrds_document(ReplyBuf);
- FreeStrBuf(&ReplyBuf);
return(r);
}
projects / citadel.git / blobdiff