author | Michael Krelin <hacker@klever.net> | 2008-02-03 15:29:07 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2008-02-03 15:29:07 (UTC) |
commit | 23a6d48436e24d3d145b742984ef68ec3bae2bfd (patch) (unidiff) | |
tree | 9cd085f583f4235e4f21e640cfc1b1ab1fb04b06 /lib/discovery.cc | |
parent | d1c45af16b3bd31f65d03eec0fcd1c61b4d69fb0 (diff) | |
download | libopkele-23a6d48436e24d3d145b742984ef68ec3bae2bfd.zip libopkele-23a6d48436e24d3d145b742984ef68ec3bae2bfd.tar.gz libopkele-23a6d48436e24d3d145b742984ef68ec3bae2bfd.tar.bz2 |
added provisions for discovery on RP
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | lib/discovery.cc | 45 |
1 files changed, 35 insertions, 10 deletions
diff --git a/lib/discovery.cc b/lib/discovery.cc index 6e20654..6f58339 100644 --- a/lib/discovery.cc +++ b/lib/discovery.cc | |||
@@ -28,7 +28,7 @@ namespace opkele { | |||
28 | static const struct service_type_t { | 28 | static const struct service_type_t { |
29 | const char *uri; | 29 | const char *uri; |
30 | const char *forceid; | 30 | const char *forceid; |
31 | } service_types[] = { | 31 | } op_service_types[] = { |
32 | { STURI_OPENID20_OP, IDURI_SELECT20 }, | 32 | { STURI_OPENID20_OP, IDURI_SELECT20 }, |
33 | { STURI_OPENID20, 0 }, | 33 | { STURI_OPENID20, 0 }, |
34 | { STURI_OPENID11, 0 }, | 34 | { STURI_OPENID11, 0 }, |
@@ -74,7 +74,8 @@ namespace opkele { | |||
74 | string xri_proxy; | 74 | string xri_proxy; |
75 | 75 | ||
76 | enum { | 76 | enum { |
77 | xmode_html = 1, xmode_xrd = 2, xmode_cid = 4 | 77 | xmode_html = 1, xmode_xrd = 2, xmode_cid = 4, |
78 | xmode_noredirs = 8 | ||
78 | }; | 79 | }; |
79 | int xmode; | 80 | int xmode; |
80 | 81 | ||
@@ -110,6 +111,20 @@ namespace opkele { | |||
110 | } | 111 | } |
111 | ~idigger_t() throw() { } | 112 | ~idigger_t() throw() { } |
112 | 113 | ||
114 | void yadiscover(endpoint_discovery_iterator oi,const string& yurl,const char **types,bool redirs) { | ||
115 | idiscovery_t idis; | ||
116 | idis.xri_identity = false; | ||
117 | discover_at(idis,yurl,xmode_html|xmode_xrd|(redirs?0:xmode_noredirs)); | ||
118 | if(!xrds_location.empty()) { | ||
119 | idis.clear(); | ||
120 | discover_at(idis,xrds_location,xmode_xrd); | ||
121 | } | ||
122 | idis.normalized_id = idis.canonicalized_id = yurl; | ||
123 | service_type_t st; | ||
124 | for(st.uri=*types;*types;st.uri=*(++types)) | ||
125 | queue_endpoints(oi,idis,&st); | ||
126 | } | ||
127 | |||
113 | string discover(endpoint_discovery_iterator& oi,const string& identity) { | 128 | string discover(endpoint_discovery_iterator& oi,const string& identity) { |
114 | string rv; | 129 | string rv; |
115 | idiscovery_t idis; | 130 | idiscovery_t idis; |
@@ -129,8 +144,8 @@ namespace opkele { | |||
129 | * or whatever... */ | 144 | * or whatever... */ |
130 | rv = id; | 145 | rv = id; |
131 | set<string> cids; | 146 | set<string> cids; |
132 | for(const struct service_type_t *st=service_types; | 147 | for(const struct service_type_t *st=op_service_types; |
133 | st<&service_types[sizeof(service_types)/sizeof(*service_types)];++st) { | 148 | st<&op_service_types[sizeof(op_service_types)/sizeof(*op_service_types)];++st) { |
134 | idis.clear(); | 149 | idis.clear(); |
135 | discover_at( idis, | 150 | discover_at( idis, |
136 | xri_proxy + util::url_encode(id)+ | 151 | xri_proxy + util::url_encode(id)+ |
@@ -194,8 +209,8 @@ namespace opkele { | |||
194 | if(idis.xrd.empty()) | 209 | if(idis.xrd.empty()) |
195 | html2xrd(oi,idis); | 210 | html2xrd(oi,idis); |
196 | else{ | 211 | else{ |
197 | for(const service_type_t *st=service_types; | 212 | for(const service_type_t *st=op_service_types; |
198 | st<&service_types[sizeof(service_types)/sizeof(*service_types)];++st) | 213 | st<&op_service_types[sizeof(op_service_types)/sizeof(*op_service_types)];++st) |
199 | queue_endpoints(oi,idis,st); | 214 | queue_endpoints(oi,idis,st); |
200 | } | 215 | } |
201 | } | 216 | } |
@@ -204,9 +219,11 @@ namespace opkele { | |||
204 | } | 219 | } |
205 | 220 | ||
206 | void discover_at(idiscovery_t& idis,const string& url,int xm) { | 221 | void discover_at(idiscovery_t& idis,const string& url,int xm) { |
207 | CURLcode r = easy_setopt(CURLOPT_URL,url.c_str()); | 222 | CURLcode r = easy_setopt(CURLOPT_MAXREDIRS, (xm&xmode_noredirs)?0:5); |
208 | if(r) | 223 | if(r) |
209 | throw exception_curl(OPKELE_CP_ "failed to set culry urlie",r); | 224 | throw exception_curl(OPKELE_CP_ "failed to set curly maxredirs option"); |
225 | if( (r=easy_setopt(CURLOPT_URL,url.c_str())) ) | ||
226 | throw exception_curl(OPKELE_CP_ "failed to set curly urlie",r); | ||
210 | 227 | ||
211 | http_content_type.clear(); | 228 | http_content_type.clear(); |
212 | xmode = xm; | 229 | xmode = xm; |
@@ -272,12 +289,12 @@ namespace opkele { | |||
272 | if(!html_openid2.uris.empty()) { | 289 | if(!html_openid2.uris.empty()) { |
273 | html_openid2.types.insert(STURI_OPENID20); | 290 | html_openid2.types.insert(STURI_OPENID20); |
274 | x.services.add(-1,html_openid2); | 291 | x.services.add(-1,html_openid2); |
275 | queue_endpoints(oi,id,&service_types[st_index_2]); | 292 | queue_endpoints(oi,id,&op_service_types[st_index_2]); |
276 | } | 293 | } |
277 | if(!html_openid1.uris.empty()) { | 294 | if(!html_openid1.uris.empty()) { |
278 | html_openid1.types.insert(STURI_OPENID11); | 295 | html_openid1.types.insert(STURI_OPENID11); |
279 | x.services.add(-1,html_openid1); | 296 | x.services.add(-1,html_openid1); |
280 | queue_endpoints(oi,id,&service_types[st_index_1]); | 297 | queue_endpoints(oi,id,&op_service_types[st_index_1]); |
281 | } | 298 | } |
282 | } | 299 | } |
283 | 300 | ||
@@ -549,4 +566,12 @@ namespace opkele { | |||
549 | return idigger.discover(oi,identity); | 566 | return idigger.discover(oi,identity); |
550 | } | 567 | } |
551 | 568 | ||
569 | void yadiscover(endpoint_discovery_iterator oi,const string& yurl,const char **types,bool redirs) try { | ||
570 | idigger_t idigger; | ||
571 | idigger.yadiscover(oi,yurl,types,redirs); | ||
572 | }catch(exception_curl& ec) { | ||
573 | if(redirs || ec._error!=CURLE_TOO_MANY_REDIRECTS) | ||
574 | throw; | ||
575 | } | ||
576 | |||
552 | } | 577 | } |