summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2007-08-09 00:01:12 (UTC)
committer Michael Krelin <hacker@klever.net>2007-08-09 00:01:12 (UTC)
commit94e566c912f97b4c9e47353e10e86649ee8060a4 (patch) (unidiff)
treea11910bf677723a7eabccad161ec0b85426293ff
parent4696aae9da3500f600cedd482501a89d41fd27ec (diff)
downloadlibopkele-94e566c912f97b4c9e47353e10e86649ee8060a4.zip
libopkele-94e566c912f97b4c9e47353e10e86649ee8060a4.tar.gz
libopkele-94e566c912f97b4c9e47353e10e86649ee8060a4.tar.bz2
make canonicalize follow redirects
- renamed old consumer_t::canonicalize to consumer_t::normalize - made the real canonicalize virtual to allow caching layer
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--include/opkele/consumer.h11
-rw-r--r--lib/consumer.cc26
2 files changed, 34 insertions, 3 deletions
diff --git a/include/opkele/consumer.h b/include/opkele/consumer.h
index fdb6119..042e2d1 100644
--- a/include/opkele/consumer.h
+++ b/include/opkele/consumer.h
@@ -108,35 +108,42 @@ namespace opkele {
108 * @throw exception in case of error 108 * @throw exception in case of error
109 */ 109 */
110 virtual string checkid_(mode_t mode,const string& identity,const string& return_to,const string& trust_root="",extension_t *ext=0); 110 virtual string checkid_(mode_t mode,const string& identity,const string& return_to,const string& trust_root="",extension_t *ext=0);
111 /** 111 /**
112 * verify the id_res response 112 * verify the id_res response
113 * @param pin the response parameters 113 * @param pin the response parameters
114 * @param identity the identity being checked (if not specified, 114 * @param identity the identity being checked (if not specified,
115 * @param ext pointer to an extension(s) hooks object 115 * @param ext pointer to an extension(s) hooks object
116 * extracted from the openid.identity parameter 116 * extracted from the openid.identity parameter
117 * @throw id_res_mismatch in case of signature mismatch 117 * @throw id_res_mismatch in case of signature mismatch
118 * @throw id_res_setup in case of openid.user_setup_url failure 118 * @throw id_res_setup in case of openid.user_setup_url failure
119 * (supposedly checkid_immediate only) 119 * (supposedly checkid_immediate only)
120 * @throw id_res_failed in case of failure 120 * @throw id_res_failed in case of failure
121 * @throw exception in case of other failures 121 * @throw exception in case of other failures
122 */ 122 */
123 virtual void id_res(const params_t& pin,const string& identity="",extension_t *ext=0); 123 virtual void id_res(const params_t& pin,const string& identity="",extension_t *ext=0);
124 /** 124 /**
125 * perform a check_authentication request. 125 * perform a check_authentication request.
126 * @param server the OpenID server 126 * @param server the OpenID server
127 * @param p request parameters 127 * @param p request parameters
128 */ 128 */
129 void check_authentication(const string& server,const params_t& p); 129 void check_authentication(const string& server,const params_t& p);
130 130
131 /** 131 /**
132 * make URL canonical, by adding http:// and trailing slash, if needed. 132 * normalize URL by adding http:// and trailing slash if needed.
133 * @param url
134 * @return normalized url
135 */
136 static string normalize(const string& url);
137
138 /**
139 * Canonicalize URL, by normalizing its appearance and following redirects.
133 * @param url 140 * @param url
134 * @return canonicalized url 141 * @return canonicalized url
135 */ 142 */
136 static string canonicalize(const string& url); 143 virtual string canonicalize(const string& url);
137 144
138 }; 145 };
139 146
140} 147}
141 148
142#endif /* __OPKELE_CONSUMER_H */ 149#endif /* __OPKELE_CONSUMER_H */
diff --git a/lib/consumer.cc b/lib/consumer.cc
index 282f0cc..dd8e150 100644
--- a/lib/consumer.cc
+++ b/lib/consumer.cc
@@ -289,57 +289,81 @@ namespace opkele {
289 hre("\\bhref=['\"]([^'\"]+)['\"]",PCRE_CASELESS); 289 hre("\\bhref=['\"]([^'\"]+)['\"]",PCRE_CASELESS);
290 while(lre.search(html)) { 290 while(lre.search(html)) {
291 string attrs = lre[0]; 291 string attrs = lre[0];
292 html.erase(0,lre.get_match_end()+1); 292 html.erase(0,lre.get_match_end()+1);
293 if(!(rre.search(attrs)&&hre.search(attrs))) 293 if(!(rre.search(attrs)&&hre.search(attrs)))
294 continue; 294 continue;
295 if(rre[0]=="openid.server") { 295 if(rre[0]=="openid.server") {
296 server = hre[0]; 296 server = hre[0];
297 if(!delegate.empty()) 297 if(!delegate.empty())
298 break; 298 break;
299 }else if(rre[0]=="openid.delegate") { 299 }else if(rre[0]=="openid.delegate") {
300 delegate = hre[0]; 300 delegate = hre[0];
301 if(!server.empty()) 301 if(!server.empty())
302 break; 302 break;
303 } 303 }
304 } 304 }
305 if(server.empty()) 305 if(server.empty())
306 throw failed_assertion(OPKELE_CP_ "The location has no openid.server declaration"); 306 throw failed_assertion(OPKELE_CP_ "The location has no openid.server declaration");
307 } 307 }
308 308
309 assoc_t consumer_t::find_assoc(const string& server) { 309 assoc_t consumer_t::find_assoc(const string& server) {
310 throw failed_lookup(OPKELE_CP_ "no find_assoc() provided"); 310 throw failed_lookup(OPKELE_CP_ "no find_assoc() provided");
311 } 311 }
312 312
313 string consumer_t::canonicalize(const string& url) { 313 string consumer_t::normalize(const string& url) {
314 string rv = url; 314 string rv = url;
315 // strip leading and trailing spaces 315 // strip leading and trailing spaces
316 string::size_type i = rv.find_first_not_of(" \t\r\n"); 316 string::size_type i = rv.find_first_not_of(" \t\r\n");
317 if(i==string::npos) 317 if(i==string::npos)
318 throw bad_input(OPKELE_CP_ "empty URL"); 318 throw bad_input(OPKELE_CP_ "empty URL");
319 if(i) 319 if(i)
320 rv.erase(0,i); 320 rv.erase(0,i);
321 i = rv.find_last_not_of(" \t\r\n"); 321 i = rv.find_last_not_of(" \t\r\n");
322 assert(i!=string::npos); 322 assert(i!=string::npos);
323 if(i<(rv.length()-1)) 323 if(i<(rv.length()-1))
324 rv.erase(i+1); 324 rv.erase(i+1);
325 // add missing http:// 325 // add missing http://
326 i = rv.find("://"); 326 i = rv.find("://");
327 if(i==string::npos) { // primitive. but do we need more? 327 if(i==string::npos) { // primitive. but do we need more?
328 rv.insert(0,"http://"); 328 rv.insert(0,"http://");
329 i = sizeof("http://")-1; 329 i = sizeof("http://")-1;
330 }else{ 330 }else{
331 i += sizeof("://")-1; 331 i += sizeof("://")-1;
332 } 332 }
333 string::size_type qm = rv.find('?',i); 333 string::size_type qm = rv.find('?',i);
334 string::size_type sl = rv.find('/',i); 334 string::size_type sl = rv.find('/',i);
335 if(qm!=string::npos) { 335 if(qm!=string::npos) {
336 if(sl==string::npos || sl>qm) 336 if(sl==string::npos || sl>qm)
337 rv.insert(qm,1,'/'); 337 rv.insert(qm,1,'/');
338 }else{ 338 }else{
339 if(sl==string::npos) 339 if(sl==string::npos)
340 rv += '/'; 340 rv += '/';
341 } 341 }
342 return rv; 342 return rv;
343 } 343 }
344 344
345 string consumer_t::canonicalize(const string& url) {
346 string rv = normalize(url);
347 curl_t curl = curl_easy_init();
348 if(!curl)
349 throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()");
350 string html;
351 CURLcode r;
352 (r=curl_misc_sets(curl))
353 || (r=curl_easy_setopt(curl,CURLOPT_URL,rv.c_str()))
354 || (r=curl_easy_setopt(curl,CURLOPT_NOBODY,1))
355 ;
356 if(r)
357 throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r);
358 r = curl_easy_perform(curl);
359 if(r)
360 throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r);
361 const char *eu = 0;
362 r = curl_easy_getinfo(curl,CURLINFO_EFFECTIVE_URL,&eu);
363 if(r)
364 throw exception_curl(OPKELE_CP_ "failed to curl_easy_getinfo(..CURLINFO_EFFECTIVE_URL..)",r);
365 rv = eu;
366 return normalize(rv);
367 }
368
345} 369}