summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--include/opkele/discovery.h10
-rw-r--r--lib/discovery.cc29
2 files changed, 31 insertions, 8 deletions
diff --git a/include/opkele/discovery.h b/include/opkele/discovery.h
index ab4b9d9..677d7bb 100644
--- a/include/opkele/discovery.h
+++ b/include/opkele/discovery.h
@@ -35,7 +35,15 @@ namespace opkele {
35 typedef priority_map<string> canonical_ids_t; 35 typedef priority_map<string> canonical_ids_t;
36 typedef priority_map<string> local_ids_t; 36 typedef priority_map<string> local_ids_t;
37 typedef set<string> types_t; 37 typedef set<string> types_t;
38 typedef priority_map<string> uris_t; 38 struct uri_t {
39 string uri;
40 string append;
41
42 uri_t() { }
43 uri_t(const string& u) : uri(u) { }
44 uri_t(const string& u,const string& a) : uri(u), append(a) { }
45 };
46 typedef priority_map<uri_t> uris_t;
39 47
40 class service_t { 48 class service_t {
41 public: 49 public:
diff --git a/lib/discovery.cc b/lib/discovery.cc
index 93409f4..6e20654 100644
--- a/lib/discovery.cc
+++ b/lib/discovery.cc
@@ -59,6 +59,15 @@ namespace opkele {
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:
@@ -118,8 +127,7 @@ namespace opkele {
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) {
@@ -155,6 +163,7 @@ namespace opkele {
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{
@@ -195,7 +204,6 @@ namespace opkele {
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);
@@ -390,7 +398,9 @@ namespace opkele {
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);
@@ -484,11 +494,11 @@ namespace opkele {
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 }
@@ -507,7 +517,12 @@ namespace opkele {
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;