X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fopenid%2Fserv_openid_rp.c;h=7feb11336c4e9c242a371d9dac0177dd316d8c70;hp=65567de5832e8195d5b2840c61bc9f1096d78eab;hb=39deac2549defa7b5523c49abf91c38a39cfac40;hpb=03541514a460e533ef6f3c1b7d5ba4ebe7532d7b diff --git a/citadel/modules/openid/serv_openid_rp.c b/citadel/modules/openid/serv_openid_rp.c index 65567de58..7feb11336 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)) @@ -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,23 +703,19 @@ int parse_xrds_document(StrBuf *ReplyBuf) { /* - * Callback function for perform_yadis_discovery() - * We're interested in HTTP headers returned from the server. + * 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) { char hdr[1024]; + StrBuf **x_xrds_location = (StrBuf **) 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(hdr, &hdr[16], sizeof(hdr)); - striplt(hdr); - syslog(LOG_DEBUG, "\033[32m%s\033[0m", hdr); - /* FIXME now do something with it */ + *x_xrds_location = NewStrBufPlain(&hdr[16], ((size*nmemb)-16)); + StrBufTrim(*x_xrds_location); } return(size * nmemb); @@ -726,19 +724,25 @@ 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 r; + int return_value = 0; CURL *curl; CURLcode result; 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_openid2_discovery(%s)", ChrPtr(YadisURL)); if (StrLength(YadisURL) == 0) return(0); ReplyBuf = NewStrBuf (); @@ -755,7 +759,7 @@ 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, NULL); + curl_easy_setopt(curl, CURLOPT_WRITEHEADER, &x_xrds_location); curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, yadis_headerfunction); result = curl_easy_perform(curl); @@ -764,34 +768,55 @@ int perform_yadis_discovery(StrBuf *YadisURL) { } curl_slist_free_all(my_headers); curl_easy_cleanup(curl); - docbytes = StrLength(ReplyBuf); - /* FIXME here we need to handle Yadis 1.0 section 6.2.5. - * + /* * The response from the server will be one of: * * Option 1: An HTML document with a element that includes a 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) - * - * 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. - * */ + /* 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. + * + * 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_openid2_discovery(x_xrds_location); + FreeStrBuf(&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); + else if (docbytes >= 0) { + 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)); + } } - return(r); + if (ReplyBuf != NULL) { + FreeStrBuf(&ReplyBuf); + } + return(return_value); } @@ -833,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();