author | Michael Krelin <hacker@klever.net> | 2008-01-21 19:51:23 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2008-01-21 19:51:23 (UTC) |
commit | 2a116bce75236e46946bb9564790c26c6a59b9a4 (patch) (unidiff) | |
tree | 27b047f773ea2f37d080c8c9c8f583d345649856 /lib | |
parent | eee78b62ac9c4aed629fc47eb2af6615ca17d2e2 (diff) | |
download | libopkele-2a116bce75236e46946bb9564790c26c6a59b9a4.zip libopkele-2a116bce75236e46946bb9564790c26c6a59b9a4.tar.gz libopkele-2a116bce75236e46946bb9564790c26c6a59b9a4.tar.bz2 |
Implement URI construction handling append='qxri' xrd:URI attribute.
This is the right thing to do and may come in handy assisting OPs in improving
UI.
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | lib/discovery.cc | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/lib/discovery.cc b/lib/discovery.cc index 93409f4..6e20654 100644 --- a/lib/discovery.cc +++ b/lib/discovery.cc | |||
@@ -50,24 +50,33 @@ namespace opkele { | |||
50 | return true; | 50 | return true; |
51 | return false; | 51 | return false; |
52 | } | 52 | } |
53 | 53 | ||
54 | static long element_priority(const XML_Char **a) { | 54 | static long element_priority(const XML_Char **a) { |
55 | for(;*a;++a) | 55 | for(;*a;++a) |
56 | if(!strcasecmp(*(a++),"priority")) { | 56 | if(!strcasecmp(*(a++),"priority")) { |
57 | long rv; | 57 | long rv; |
58 | return (sscanf(*a,"%ld",&rv)==1)?rv:-1; | 58 | return (sscanf(*a,"%ld",&rv)==1)?rv:-1; |
59 | } | 59 | } |
60 | return -1; | 60 | return -1; |
61 | } | 61 | } |
62 | /* TODO: ideally all attributes should be | ||
63 | * retrieved in one run */ | ||
64 | static const char *element_attr(const XML_Char **a, const char *at) { | ||
65 | for(;*a;++a) | ||
66 | if(!strcasecmp(*(a++),at)) { | ||
67 | return *a; | ||
68 | } | ||
69 | return 0; | ||
70 | } | ||
62 | 71 | ||
63 | class idigger_t : public util::curl_t, public util::expat_t { | 72 | class idigger_t : public util::curl_t, public util::expat_t { |
64 | public: | 73 | public: |
65 | string xri_proxy; | 74 | string xri_proxy; |
66 | 75 | ||
67 | enum { | 76 | enum { |
68 | xmode_html = 1, xmode_xrd = 2, xmode_cid = 4 | 77 | xmode_html = 1, xmode_xrd = 2, xmode_cid = 4 |
69 | }; | 78 | }; |
70 | int xmode; | 79 | int xmode; |
71 | 80 | ||
72 | string xrds_location; | 81 | string xrds_location; |
73 | string http_content_type; | 82 | string http_content_type; |
@@ -109,26 +118,25 @@ namespace opkele { | |||
109 | throw bad_input(OPKELE_CP_ "whitespace-only identity"); | 118 | throw bad_input(OPKELE_CP_ "whitespace-only identity"); |
110 | string::size_type lsc = identity.find_last_not_of(whitespace); | 119 | string::size_type lsc = identity.find_last_not_of(whitespace); |
111 | assert(lsc!=string::npos); | 120 | assert(lsc!=string::npos); |
112 | if(!strncasecmp(identity.c_str()+fsc,"xri://",sizeof("xri://")-1)) | 121 | if(!strncasecmp(identity.c_str()+fsc,"xri://",sizeof("xri://")-1)) |
113 | fsc += sizeof("xri://")-1; | 122 | fsc += sizeof("xri://")-1; |
114 | if((fsc+1)>=lsc) | 123 | if((fsc+1)>=lsc) |
115 | throw bad_input(OPKELE_CP_ "not a character of importance in identity"); | 124 | throw bad_input(OPKELE_CP_ "not a character of importance in identity"); |
116 | string id(identity,fsc,lsc-fsc+1); | 125 | string id(identity,fsc,lsc-fsc+1); |
117 | idis.clear(); | 126 | idis.clear(); |
118 | if(strchr(i_leaders,id[0])) { | 127 | if(strchr(i_leaders,id[0])) { |
119 | /* TODO: further normalize xri identity? Like folding case | 128 | /* TODO: further normalize xri identity? Like folding case |
120 | * or whatever... */ | 129 | * or whatever... */ |
121 | rv = idis.normalized_id = id; | 130 | rv = id; |
122 | idis.xri_identity = true; | ||
123 | set<string> cids; | 131 | set<string> cids; |
124 | for(const struct service_type_t *st=service_types; | 132 | for(const struct service_type_t *st=service_types; |
125 | st<&service_types[sizeof(service_types)/sizeof(*service_types)];++st) { | 133 | st<&service_types[sizeof(service_types)/sizeof(*service_types)];++st) { |
126 | idis.clear(); | 134 | idis.clear(); |
127 | discover_at( idis, | 135 | discover_at( idis, |
128 | xri_proxy + util::url_encode(id)+ | 136 | xri_proxy + util::url_encode(id)+ |
129 | "?_xrd_t="+util::url_encode(st->uri)+ | 137 | "?_xrd_t="+util::url_encode(st->uri)+ |
130 | "&_xrd_r=application/xrd%2Bxml" | 138 | "&_xrd_r=application/xrd%2Bxml" |
131 | ";sep=true;refs=true", | 139 | ";sep=true;refs=true", |
132 | xmode_xrd ); | 140 | xmode_xrd ); |
133 | if(status_code==241) continue; | 141 | if(status_code==241) continue; |
134 | if(status_code!=100) | 142 | if(status_code!=100) |
@@ -146,24 +154,25 @@ namespace opkele { | |||
146 | "?_xrd_t="+util::url_encode(st->uri)+ | 154 | "?_xrd_t="+util::url_encode(st->uri)+ |
147 | "&_xrd_r=application/xrd%2Bxml" | 155 | "&_xrd_r=application/xrd%2Bxml" |
148 | ";sep=true;refs=true", | 156 | ";sep=true;refs=true", |
149 | xmode_xrd ); | 157 | xmode_xrd ); |
150 | if(status_code==241) continue; | 158 | if(status_code==241) continue; |
151 | if(status_code!=100) | 159 | if(status_code!=100) |
152 | throw failed_xri_resolution(OPKELE_CP_ | 160 | throw failed_xri_resolution(OPKELE_CP_ |
153 | "XRI resolution failed with '"+status_string+"' message" | 161 | "XRI resolution failed with '"+status_string+"' message" |
154 | ", while looking for SEP with type '"+st->uri+"'" | 162 | ", while looking for SEP with type '"+st->uri+"'" |
155 | " on canonical id", status_code); | 163 | " on canonical id", status_code); |
156 | } | 164 | } |
157 | idis.canonicalized_id = cid; | 165 | idis.canonicalized_id = cid; |
166 | idis.normalized_id = rv; idis.xri_identity = true; | ||
158 | queue_endpoints(oi,idis,st); | 167 | queue_endpoints(oi,idis,st); |
159 | } | 168 | } |
160 | }else{ | 169 | }else{ |
161 | idis.xri_identity = false; | 170 | idis.xri_identity = false; |
162 | if(id.find("://")==string::npos) | 171 | if(id.find("://")==string::npos) |
163 | id.insert(0,"http://"); | 172 | id.insert(0,"http://"); |
164 | string::size_type fp = id.find('#'); | 173 | string::size_type fp = id.find('#'); |
165 | if(fp!=string::npos) { | 174 | if(fp!=string::npos) { |
166 | string::size_type qp = id.find('?'); | 175 | string::size_type qp = id.find('?'); |
167 | if(qp==string::npos || qp<fp) | 176 | if(qp==string::npos || qp<fp) |
168 | id.erase(fp); | 177 | id.erase(fp); |
169 | else if(qp>fp) | 178 | else if(qp>fp) |
@@ -186,25 +195,24 @@ namespace opkele { | |||
186 | html2xrd(oi,idis); | 195 | html2xrd(oi,idis); |
187 | else{ | 196 | else{ |
188 | for(const service_type_t *st=service_types; | 197 | for(const service_type_t *st=service_types; |
189 | st<&service_types[sizeof(service_types)/sizeof(*service_types)];++st) | 198 | st<&service_types[sizeof(service_types)/sizeof(*service_types)];++st) |
190 | queue_endpoints(oi,idis,st); | 199 | queue_endpoints(oi,idis,st); |
191 | } | 200 | } |
192 | } | 201 | } |
193 | } | 202 | } |
194 | return rv; | 203 | return rv; |
195 | } | 204 | } |
196 | 205 | ||
197 | void discover_at(idiscovery_t& idis,const string& url,int xm) { | 206 | void discover_at(idiscovery_t& idis,const string& url,int xm) { |
198 | DOUT_("Doing discovery at " << url); | ||
199 | CURLcode r = easy_setopt(CURLOPT_URL,url.c_str()); | 207 | CURLcode r = easy_setopt(CURLOPT_URL,url.c_str()); |
200 | if(r) | 208 | if(r) |
201 | throw exception_curl(OPKELE_CP_ "failed to set culry urlie",r); | 209 | throw exception_curl(OPKELE_CP_ "failed to set culry urlie",r); |
202 | 210 | ||
203 | http_content_type.clear(); | 211 | http_content_type.clear(); |
204 | xmode = xm; | 212 | xmode = xm; |
205 | prepare_to_parse(); | 213 | prepare_to_parse(); |
206 | if(xmode&xmode_html) { | 214 | if(xmode&xmode_html) { |
207 | xrds_location.clear(); | 215 | xrds_location.clear(); |
208 | save_html.clear(); | 216 | save_html.clear(); |
209 | save_html.reserve(max_html); | 217 | save_html.reserve(max_html); |
210 | } | 218 | } |
@@ -381,25 +389,27 @@ namespace opkele { | |||
381 | html_start_element(n,a); | 389 | html_start_element(n,a); |
382 | }else{ | 390 | }else{ |
383 | skipping = 1; | 391 | skipping = 1; |
384 | } | 392 | } |
385 | }else if(pt_s==2) { | 393 | }else if(pt_s==2) { |
386 | if(is_qelement(pt_stack.back().c_str(), NSURI_XRD "\tService")) { | 394 | if(is_qelement(pt_stack.back().c_str(), NSURI_XRD "\tService")) { |
387 | if(is_qelement(n,NSURI_XRD "\tType")) { | 395 | if(is_qelement(n,NSURI_XRD "\tType")) { |
388 | assert(xrd); assert(xrd_service); | 396 | assert(xrd); assert(xrd_service); |
389 | cdata_buf.clear(); | 397 | cdata_buf.clear(); |
390 | cdata = &cdata_buf; | 398 | cdata = &cdata_buf; |
391 | }else if(is_qelement(n,NSURI_XRD "\tURI")) { | 399 | }else if(is_qelement(n,NSURI_XRD "\tURI")) { |
392 | assert(xrd); assert(xrd_service); | 400 | assert(xrd); assert(xrd_service); |
393 | cdata = &(xrd_service->uris.add(element_priority(a),string())); | 401 | const char *append = element_attr(a,"append"); |
402 | xrd::uri_t& uri = xrd_service->uris.add(element_priority(a),xrd::uri_t("",append?append:"")); | ||
403 | cdata = &uri.uri; | ||
394 | }else if(is_qelement(n,NSURI_XRD "\tLocalID") | 404 | }else if(is_qelement(n,NSURI_XRD "\tLocalID") |
395 | || is_qelement(n,NSURI_OPENID10 "\tDelegate") ) { | 405 | || is_qelement(n,NSURI_OPENID10 "\tDelegate") ) { |
396 | assert(xrd); assert(xrd_service); | 406 | assert(xrd); assert(xrd_service); |
397 | cdata = &(xrd_service->local_ids.add(element_priority(a),string())); | 407 | cdata = &(xrd_service->local_ids.add(element_priority(a),string())); |
398 | }else if(is_qelement(n,NSURI_XRD "\tProviderID")) { | 408 | }else if(is_qelement(n,NSURI_XRD "\tProviderID")) { |
399 | assert(xrd); assert(xrd_service); | 409 | assert(xrd); assert(xrd_service); |
400 | cdata = &(xrd_service->provider_id); | 410 | cdata = &(xrd_service->provider_id); |
401 | }else{ | 411 | }else{ |
402 | skipping = 1; | 412 | skipping = 1; |
403 | } | 413 | } |
404 | }else | 414 | }else |
405 | skipping = 1; | 415 | skipping = 1; |
@@ -475,48 +485,53 @@ namespace opkele { | |||
475 | for(string::size_type ns=rels.find_first_not_of(whitespace); | 485 | for(string::size_type ns=rels.find_first_not_of(whitespace); |
476 | ns!=string::npos; ns=rels.find_first_not_of(whitespace,ns)) { | 486 | ns!=string::npos; ns=rels.find_first_not_of(whitespace,ns)) { |
477 | string::size_type s = rels.find_first_of(whitespace,ns); | 487 | string::size_type s = rels.find_first_of(whitespace,ns); |
478 | string rel; | 488 | string rel; |
479 | if(s==string::npos) { | 489 | if(s==string::npos) { |
480 | rel.assign(rels,ns,string::npos); | 490 | rel.assign(rels,ns,string::npos); |
481 | ns = string::npos; | 491 | ns = string::npos; |
482 | }else{ | 492 | }else{ |
483 | rel.assign(rels,ns,s-ns); | 493 | rel.assign(rels,ns,s-ns); |
484 | ns = s; | 494 | ns = s; |
485 | } | 495 | } |
486 | if(rel=="openid.server") | 496 | if(rel=="openid.server") |
487 | html_openid1.uris.add(-1,href); | 497 | html_openid1.uris.add(-1,xrd::uri_t(href)); |
488 | else if(rel=="openid.delegate") | 498 | else if(rel=="openid.delegate") |
489 | html_openid1.local_ids.add(-1,href); | 499 | html_openid1.local_ids.add(-1,href); |
490 | else if(rel=="openid2.provider") | 500 | else if(rel=="openid2.provider") |
491 | html_openid2.uris.add(-1,href); | 501 | html_openid2.uris.add(-1,xrd::uri_t(href)); |
492 | else if(rel=="openid2.local_id") | 502 | else if(rel=="openid2.local_id") |
493 | html_openid2.local_ids.add(-1,href); | 503 | html_openid2.local_ids.add(-1,href); |
494 | } | 504 | } |
495 | }else if(is_element(n,"body")) { | 505 | }else if(is_element(n,"body")) { |
496 | skipping = -1; | 506 | skipping = -1; |
497 | } | 507 | } |
498 | } | 508 | } |
499 | 509 | ||
500 | void queue_endpoints(endpoint_discovery_iterator& oi, | 510 | void queue_endpoints(endpoint_discovery_iterator& oi, |
501 | const idiscovery_t &id, | 511 | const idiscovery_t &id, |
502 | const service_type_t *st) { | 512 | const service_type_t *st) { |
503 | openid_endpoint_t ep; | 513 | openid_endpoint_t ep; |
504 | ep.claimed_id = id.canonicalized_id; | 514 | ep.claimed_id = id.canonicalized_id; |
505 | for(xrd::services_t::const_iterator isvc=id.xrd.services.begin(); | 515 | for(xrd::services_t::const_iterator isvc=id.xrd.services.begin(); |
506 | isvc!=id.xrd.services.end(); ++isvc) { | 516 | isvc!=id.xrd.services.end(); ++isvc) { |
507 | const xrd::service_t svc = isvc->second; | 517 | const xrd::service_t svc = isvc->second; |
508 | if(svc.types.find(st->uri)==svc.types.end()) continue; | 518 | if(svc.types.find(st->uri)==svc.types.end()) continue; |
509 | for(xrd::uris_t::const_iterator iu=svc.uris.begin();iu!=svc.uris.end();++iu) { | 519 | for(xrd::uris_t::const_iterator iu=svc.uris.begin();iu!=svc.uris.end();++iu) { |
510 | ep.uri = iu->second; | 520 | ep.uri = iu->second.uri; |
521 | if(id.xri_identity) { | ||
522 | if(iu->second.append=="qxri") { | ||
523 | ep.uri += id.normalized_id; | ||
524 | } /* TODO: else handle other append attribute values */ | ||
525 | } | ||
511 | if(st->forceid) { | 526 | if(st->forceid) { |
512 | ep.local_id = ep.claimed_id = st->forceid; | 527 | ep.local_id = ep.claimed_id = st->forceid; |
513 | *(oi++) = ep; | 528 | *(oi++) = ep; |
514 | }else{ | 529 | }else{ |
515 | if(svc.local_ids.empty()) { | 530 | if(svc.local_ids.empty()) { |
516 | ep.local_id = ep.claimed_id; | 531 | ep.local_id = ep.claimed_id; |
517 | *(oi++) = ep; | 532 | *(oi++) = ep; |
518 | }else{ | 533 | }else{ |
519 | for(xrd::local_ids_t::const_iterator ilid=svc.local_ids.begin(); | 534 | for(xrd::local_ids_t::const_iterator ilid=svc.local_ids.begin(); |
520 | ilid!=svc.local_ids.end(); ++ilid) { | 535 | ilid!=svc.local_ids.end(); ++ilid) { |
521 | ep.local_id = ilid->second; | 536 | ep.local_id = ilid->second; |
522 | *(oi++) = ep; | 537 | *(oi++) = ep; |