allow whitespace separated list in @rel when doing links discovery.

Thanks to Joseph Smarr and Chris Messina for bringing it to my attention! Signed-off-by: Michael Krelin <hacker@klever.net>
author: Michael Krelin <hacker@klever.net> 2007-10-31 13:34:27 (UTC)
committer: Michael Krelin <hacker@klever.net> 2007-10-31 16:50:17 (UTC)
commit: 6a228d2b1cb39007c6a7b91dae578a30e26b37fd (patch) (side-by-side diff)
tree: 9cca336ffc422a2dcf81eaf43367453c767a465a
parent: e1af6ae7242a280c486c84c9d8015911613cd159 (diff)
download: libopkele-6a228d2b1cb39007c6a7b91dae578a30e26b37fd.zip
libopkele-6a228d2b1cb39007c6a7b91dae578a30e26b37fd.tar.gz
libopkele-6a228d2b1cb39007c6a7b91dae578a30e26b37fd.tar.bz2
1 files changed, 31 insertions, 9 deletions
diff --git a/lib/consumer.cc b/lib/consumer.cc
index 7f31d52..f72ae08 100644
--- a/lib/consumer.cc
+++ b/lib/consumer.cc
@@ -264,151 +264,173 @@ namespace opkele {
 	}
 	if(ext) ext->id_res_hook(pin,ps,identity);
     }
 
     void consumer_t::check_authentication(const string& server,const params_t& p) {
 	string request = "openid.mode=check_authentication";
 	for(params_t::const_iterator i=p.begin();i!=p.end();++i) {
 	    if(i->first!="openid.mode") {
 		request += '&';
 		request += i->first;
 		request += '=';
 		request += util::url_encode(i->second);
 	    }
 	}
 	curl_t curl = curl_easy_init();
 	if(!curl)
 	    throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()");
 	string response;
 	CURLcode r;
 	(r=curl_misc_sets(curl))
 	|| (r=curl_easy_setopt(curl,CURLOPT_URL,server.c_str()))
 	|| (r=curl_easy_setopt(curl,CURLOPT_POST,1))
 	|| (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDS,request.data()))
 	|| (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDSIZE,request.length()))
 	|| (r=curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,_curl_tostring))
 	|| (r=curl_easy_setopt(curl,CURLOPT_WRITEDATA,&response))
 	;
 	if(r)
 	    throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r);
 	if(r=curl_easy_perform(curl))
 	    throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r);
 	params_t pp; pp.parse_keyvalues(response);
 	if(pp.has_param("invalidate_handle"))
 	    invalidate_assoc(server,pp.get_param("invalidate_handle"));
 	if(pp.has_param("is_valid")) {
 	    if(pp.get_param("is_valid")=="true")
 		return;
 	}else if(pp.has_param("lifetime")) {
 	    if(util::string_to_long(pp.get_param("lifetime")))
 		return;
 	}
 	throw failed_check_authentication(OPKELE_CP_ "failed to verify response");
     }
 
     void consumer_t::retrieve_links(const string& url,string& server,string& delegate) {
 	server.erase();
 	delegate.erase();
 	curl_t curl = curl_easy_init();
 	if(!curl)
 	    throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()");
 	string html;
 	CURLcode r;
 	(r=curl_misc_sets(curl))
 	|| (r=curl_easy_setopt(curl,CURLOPT_URL,url.c_str()))
 	|| (r=curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,_curl_tostring))
 	|| (r=curl_easy_setopt(curl,CURLOPT_WRITEDATA,&html))
 	;
 	if(r)
 	    throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r);
 	r = curl_easy_perform(curl);
 	if(r && r!=CURLE_WRITE_ERROR)
 	    throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r);
 	static const char *re_bre = "<\\s*body\\b", *re_hdre = "<\\s*head[^>]*>",
 		     *re_lre = "<\\s*link\\b([^>]+)>",
-		     *re_rre = "\\brel\\s*=\\s*['\"]\\s*([^'\"\\s]+)\\s*['\"]",
+		     *re_rre = "\\brel\\s*=\\s*['\"]([^'\"]+)['\"]",
 		     *re_hre = "\\bhref\\s*=\\s*['\"]\\s*([^'\"\\s]+)\\s*['\"]";
 	pcre_matches_t m1(3), m2(3);
 	pcre_t bre(re_bre,PCRE_CASELESS);
 	if(bre.exec(html,m1)>0)
 	    html.erase(m1.begin(0));
 	pcre_t hdre(re_hdre,PCRE_CASELESS);
 	if(hdre.exec(html,m1)<=0)
 	    throw bad_input(OPKELE_CP_ "failed to find <head>");
 	html.erase(0,m1.end(0)+1);
 	pcre_t lre(re_lre,PCRE_CASELESS), rre(re_rre,PCRE_CASELESS), hre(re_hre,PCRE_CASELESS);
-	while(lre.exec(html,m1)>=2) {
+	bool gotit = false;
+	while( (!gotit) && lre.exec(html,m1)>=2 ) {
+	    static const char *whitespace = " \t";
 	    string attrs(html,m1.begin(1),m1.length(1));
 	    html.erase(0,m1.end(0)+1);
 	    if(!( rre.exec(attrs,m1)>=2 && hre.exec(attrs,m2)>=2 ))
 		continue;
-	    string rel(attrs,m1.begin(1),m1.length(1));
-	    if(rel=="openid.server") {
-		server.assign(attrs,m2.begin(1),m2.length(1));
-		if(!delegate.empty()) break;
-	    }else if(rel=="openid.delegate") {
-		delegate.assign(attrs,m2.begin(1),m2.length(1));
-		if(!server.empty()) break;
+	    string rels(attrs,m1.begin(1),m1.length(1));
+	    for(string::size_type ns = rels.find_first_not_of(whitespace);
+		    ns!=string::npos;
+		    ns=rels.find_first_not_of(whitespace,ns)) {
+		string::size_type s = rels.find_first_of(whitespace,ns);
+		string rel;
+		if(s==string::npos) {
+		    rel.assign(rels,ns,string::npos);
+		    ns=string::npos;
+		}else{
+		    rel.assign(rels,ns,s-ns);
+		    ns=s;
+		}
+		if(rel=="openid.server") {
+		    server.assign(attrs,m2.begin(1),m2.length(1));
+		    if(!delegate.empty()) {
+			gotit = true;
+			break;
+		    }
+		}else if(rel=="openid.delegate") {
+		    delegate.assign(attrs,m2.begin(1),m2.length(1));
+		    if(!server.empty()) {
+			gotit = true;
+			break;
+		    }
+		}
+		if(ns==string::npos) break;
 	    }
 	}
 	if(server.empty())
 	    throw failed_assertion(OPKELE_CP_ "The location has no openid.server declaration");
     }
 
     assoc_t consumer_t::find_assoc(const string& server) {
 	throw failed_lookup(OPKELE_CP_ "no find_assoc() provided");
     }
 
     string consumer_t::normalize(const string& url) {
 	string rv = url;
 	// strip leading and trailing spaces
 	string::size_type i = rv.find_first_not_of(" \t\r\n");
 	if(i==string::npos)
 	    throw bad_input(OPKELE_CP_ "empty URL");
 	if(i)
 	    rv.erase(0,i);
 	i = rv.find_last_not_of(" \t\r\n");
 	assert(i!=string::npos);
 	if(i<(rv.length()-1))
 	    rv.erase(i+1);
 	// add missing http://
 	i = rv.find("://");
 	if(i==string::npos) { // primitive. but do we need more?
 	    rv.insert(0,"http://");
 	    i = sizeof("http://")-1;
 	}else{
 	    i += sizeof("://")-1;
 	}
 	string::size_type qm = rv.find('?',i);
 	string::size_type sl = rv.find('/',i);
 	if(qm!=string::npos) {
 	    if(sl==string::npos || sl>qm)
 		rv.insert(qm,1,'/');
 	}else{
 	    if(sl==string::npos)
 		rv += '/';
 	}
 	return rv;
     }
 
     string consumer_t::canonicalize(const string& url) {
 	string rv = normalize(url);
 	curl_t curl = curl_easy_init();
 	if(!curl)
 	    throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()");
 	string html;
 	CURLcode r;
 	(r=curl_misc_sets(curl))
 	|| (r=curl_easy_setopt(curl,CURLOPT_URL,rv.c_str()))
 	|| (r=curl_easy_setopt(curl,CURLOPT_NOBODY,1))
 	;
 	if(r)
 	    throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r);
 	r = curl_easy_perform(curl);
 	if(r)
 	    throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r);
 	const char *eu = 0;
 	r = curl_easy_getinfo(curl,CURLINFO_EFFECTIVE_URL,&eu);
 	if(r)
 	    throw exception_curl(OPKELE_CP_ "failed to curl_easy_getinfo(..CURLINFO_EFFECTIVE_URL..)",r);
 	rv = eu;
 	return normalize(rv);
author	Michael Krelin <hacker@klever.net>	2007-10-31 13:34:27 (UTC)
committer	Michael Krelin <hacker@klever.net>	2007-10-31 16:50:17 (UTC)
commit	6a228d2b1cb39007c6a7b91dae578a30e26b37fd (patch) (side-by-side diff)
tree	9cca336ffc422a2dcf81eaf43367453c767a465a
parent	e1af6ae7242a280c486c84c9d8015911613cd159 (diff)
download	libopkele-6a228d2b1cb39007c6a7b91dae578a30e26b37fd.zip libopkele-6a228d2b1cb39007c6a7b91dae578a30e26b37fd.tar.gz libopkele-6a228d2b1cb39007c6a7b91dae578a30e26b37fd.tar.bz2