added provisions for discovery on RP

Signed-off-by: Michael Krelin <hacker@klever.net>

2 files changed, 39 insertions, 11 deletions

diff --git a/include/opkele/discovery.h b/include/opkele/discovery.h
index 677d7bb..4471597 100644
--- a/include/opkele/discovery.h
+++ b/include/opkele/discovery.h
@@ -1,12 +1,11 @@
 #ifndef __OPKELE_DISCOVERY_H
 #define __OPKELE_DISCOVERY_H
 
 #include <string>
 #include <opkele/types.h>
-#include <opkele/basic_rp.h>
 
 namespace opkele {
     using std::string;
 
     namespace xrd {
 
@@ -89,12 +88,16 @@ namespace opkele {
     typedef util::output_iterator_proxy<openid_endpoint_t>
 	endpoint_discovery_iterator;
 
     string idiscover(
 	    endpoint_discovery_iterator oi,
 	    const string& identity);
+    void yadiscover(
+	    endpoint_discovery_iterator oi,
+	    const string& yurl,
+	    const char **types, bool redirs=false);
 
     struct idiscovery_t {
 	bool xri_identity;
 	string normalized_id;
 	string canonicalized_id;
 	xrd::XRD_t xrd;
diff --git a/lib/discovery.cc b/lib/discovery.cc
index 6e20654..6f58339 100644
--- a/lib/discovery.cc
+++ b/lib/discovery.cc
@@ -25,13 +25,13 @@ namespace opkele {
     static const char *i_leaders = "=@+$!(";
     static const size_t max_html = 16384;
 
     static const struct service_type_t {
 	const char *uri;
 	const char *forceid;
-    } service_types[] = {
+    } op_service_types[] = {
 	{ STURI_OPENID20_OP, IDURI_SELECT20 },
 	{ STURI_OPENID20, 0 },
 	{ STURI_OPENID11, 0 },
 	{ STURI_OPENID10, 0 }
     };
     enum {
@@ -71,13 +71,14 @@ namespace opkele {
 
     class idigger_t : public util::curl_t, public util::expat_t {
 	public:
 	    string xri_proxy;
 
 	    enum {
-		xmode_html = 1, xmode_xrd = 2, xmode_cid = 4
+		xmode_html = 1, xmode_xrd = 2, xmode_cid = 4,
+		xmode_noredirs = 8
 	    };
 	    int xmode;
 
 	    string xrds_location;
 	    string http_content_type;
 	    service_t html_openid1;
@@ -107,12 +108,26 @@ namespace opkele {
 			;
 		    if(r)
 			throw exception_curl(OPKELE_CP_ "failed to set curly options",r);
 		}
 	    ~idigger_t() throw() { }
 
+	    void yadiscover(endpoint_discovery_iterator oi,const string& yurl,const char **types,bool redirs) {
+		idiscovery_t idis;
+		idis.xri_identity = false;
+		discover_at(idis,yurl,xmode_html|xmode_xrd|(redirs?0:xmode_noredirs));
+		if(!xrds_location.empty()) {
+		    idis.clear();
+		    discover_at(idis,xrds_location,xmode_xrd);
+		}
+		idis.normalized_id = idis.canonicalized_id = yurl;
+		service_type_t st;
+		for(st.uri=*types;*types;st.uri=*(++types))
+		    queue_endpoints(oi,idis,&st);
+	    }
+
 	    string discover(endpoint_discovery_iterator& oi,const string& identity) {
 		string rv;
 		idiscovery_t idis;
 		string::size_type fsc = identity.find_first_not_of(whitespace);
 		if(fsc==string::npos)
 		    throw bad_input(OPKELE_CP_ "whitespace-only identity");
@@ -126,14 +141,14 @@ namespace opkele {
 		idis.clear();
 		if(strchr(i_leaders,id[0])) {
 		    /* TODO: further normalize xri identity? Like folding case
 		     * or whatever... */
 		    rv = id;
 		    set<string> cids;
-		    for(const struct service_type_t *st=service_types;
-			    st<&service_types[sizeof(service_types)/sizeof(*service_types)];++st) {
+		    for(const struct service_type_t *st=op_service_types;
+			    st<&op_service_types[sizeof(op_service_types)/sizeof(*op_service_types)];++st) {
 			idis.clear();
 			discover_at( idis,
 				xri_proxy + util::url_encode(id)+
 				"?_xrd_t="+util::url_encode(st->uri)+
 				"&_xrd_r=application/xrd%2Bxml"
 				";sep=true;refs=true",
@@ -191,25 +206,27 @@ namespace opkele {
 			idis.clear();
 			idis.canonicalized_id = cid;
 			discover_at(idis,xrds_location,xmode_xrd);
 			if(idis.xrd.empty())
 			    html2xrd(oi,idis);
 			else{
-			    for(const service_type_t *st=service_types;
-				    st<&service_types[sizeof(service_types)/sizeof(*service_types)];++st)
+			    for(const service_type_t *st=op_service_types;
+				    st<&op_service_types[sizeof(op_service_types)/sizeof(*op_service_types)];++st)
 				queue_endpoints(oi,idis,st);
 			}
 		    }
 		}
 		return rv;
 	    }
 
 	    void discover_at(idiscovery_t& idis,const string& url,int xm) {
-		CURLcode r = easy_setopt(CURLOPT_URL,url.c_str());
+		CURLcode r = easy_setopt(CURLOPT_MAXREDIRS, (xm&xmode_noredirs)?0:5);
 		if(r)
-		    throw exception_curl(OPKELE_CP_ "failed to set culry urlie",r);
+		    throw exception_curl(OPKELE_CP_ "failed to set curly maxredirs option");
+		if( (r=easy_setopt(CURLOPT_URL,url.c_str())) )
+		    throw exception_curl(OPKELE_CP_ "failed to set curly urlie",r);
 
 		http_content_type.clear();
 		xmode = xm;
 		prepare_to_parse();
 		if(xmode&xmode_html) {
 		    xrds_location.clear();
@@ -269,18 +286,18 @@ namespace opkele {
 
 	    void html2xrd(endpoint_discovery_iterator& oi,idiscovery_t& id) {
 		XRD_t& x = id.xrd;
 		if(!html_openid2.uris.empty()) {
 		    html_openid2.types.insert(STURI_OPENID20);
 		    x.services.add(-1,html_openid2);
-		    queue_endpoints(oi,id,&service_types[st_index_2]);
+		    queue_endpoints(oi,id,&op_service_types[st_index_2]);
 		}
 		if(!html_openid1.uris.empty()) {
 		    html_openid1.types.insert(STURI_OPENID11);
 		    x.services.add(-1,html_openid1);
-		    queue_endpoints(oi,id,&service_types[st_index_1]);
+		    queue_endpoints(oi,id,&op_service_types[st_index_1]);
 		}
 	    }
 
 	    size_t write(void *p,size_t s,size_t nm) {
 		/* TODO: limit total size */
 		size_t bytes = s*nm;
@@ -546,7 +563,15 @@ namespace opkele {
 
     string idiscover(endpoint_discovery_iterator oi,const string& identity) {
 	idigger_t idigger;
 	return idigger.discover(oi,identity);
     }
 
+    void yadiscover(endpoint_discovery_iterator oi,const string& yurl,const char **types,bool redirs) try {
+	idigger_t idigger;
+	idigger.yadiscover(oi,yurl,types,redirs);
+    }catch(exception_curl& ec) {
+	if(redirs || ec._error!=CURLE_TOO_MANY_REDIRECTS)
+	    throw;
+    }
+
 }