X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fopenid%2Fserv_openid_rp.c;h=14717d04741f9e323840bbb5f5945964054409ec;hb=1d3e487e00d0238ffb4ba295acd82c5932c5a1b2;hp=576bc22b612c2ef0af0e1754eff3c57d051a881a;hpb=4450b2d29f7f18906e87b7abf3c707a995ebf681;p=citadel.git
diff --git a/citadel/modules/openid/serv_openid_rp.c b/citadel/modules/openid/serv_openid_rp.c
index 576bc22b6..14717d047 100644
--- a/citadel/modules/openid/serv_openid_rp.c
+++ b/citadel/modules/openid/serv_openid_rp.c
@@ -567,7 +567,7 @@ CURL *ctdl_openid_curl_easy_init(char *errmsg) {
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 */
+ curl_easy_setopt(curl, CURLOPT_TIMEOUT, 30); /* die after 30 seconds */
if (
(!IsEmptyStr(config.c_ip_addr))
@@ -666,6 +666,8 @@ void xrds_xml_end(void *data, const char *supplied_el) {
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); */
}
@@ -693,26 +695,48 @@ int parse_xrds_document(StrBuf *ReplyBuf) {
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 the X-XRDS-Location: header.
+ */
+size_t yadis_headerfunction(void *ptr, size_t size, size_t nmemb, void *userdata) {
+ char hdr[1024];
+ StrBuf **x_xrds_location = (StrBuf **) userdata;
+
+ memcpy(hdr, ptr, (size*nmemb));
+ hdr[size*nmemb] = 0;
+
+ if (!strncasecmp(hdr, "X-XRDS-Location:", 16)) {
+ *x_xrds_location = NewStrBufPlain(&hdr[16], ((size*nmemb)-16));
+ StrBufTrim(*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) {
int docbytes = (-1);
StrBuf *ReplyBuf = NULL;
- int r;
+ int return_value = 0;
CURL *curl;
CURLcode result;
char errmsg[1024] = "";
struct curl_slist *my_headers = NULL;
- /*char *effective_url = NULL;*/
+ StrBuf *x_xrds_location = NULL;
if (YadisURL == NULL) return(0);
+ syslog(LOG_DEBUG, "perform_yadis_discovery(%s)", ChrPtr(YadisURL));
if (StrLength(YadisURL) == 0) return(0);
ReplyBuf = NewStrBuf ();
@@ -729,46 +753,53 @@ int perform_yadis_discovery(StrBuf *YadisURL) {
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 element that includes a element with http-equiv
+ * Option 1: An HTML document with a element that includes a 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
+ */
+ /* FIXME handle this somehow */
+
+ /*
+ * Option 2: HTTP response-headers that include an X-XRDS-Location response-header,
+ * together with a document.
+ * 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.
*
- * We are only handling case #4 here and assuming that the server returned an XRDS document.
+ * If the X-XRDS-Location header was delivered, we know about it at this point...
*/
+ if ( (x_xrds_location)
+ && (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);
+ FreeStrBuf(&x_xrds_location);
+ }
- /* Parse the XRDS document. */
- r = parse_xrds_document(ReplyBuf);
- FreeStrBuf(&ReplyBuf);
- return(r);
+ /*
+ * Option 4: the returned web page may *be* an XRDS document. Try to parse it.
+ */
+ else if (docbytes >= 0) {
+ return_value = parse_xrds_document(ReplyBuf);
+ }
+
+ if (ReplyBuf != NULL) {
+ FreeStrBuf(&ReplyBuf);
+ }
+ return(return_value);
}