summaryrefslogtreecommitdiffabout
path: root/lib
Unidiff
Diffstat (limited to 'lib') (more/less context) (ignore whitespace changes)
-rw-r--r--lib/discovery.cc45
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
@@ -19,25 +19,25 @@ namespace opkele {
19 using xrd::service_t; 19 using xrd::service_t;
20 20
21 /* TODO: the whole discovery thing needs cleanup and optimization due to 21 /* TODO: the whole discovery thing needs cleanup and optimization due to
22 * many changes of concept. */ 22 * many changes of concept. */
23 23
24 static const char *whitespace = " \t\r\n"; 24 static const char *whitespace = " \t\r\n";
25 static const char *i_leaders = "=@+$!("; 25 static const char *i_leaders = "=@+$!(";
26 static const size_t max_html = 16384; 26 static const size_t max_html = 16384;
27 27
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 },
35 { STURI_OPENID10, 0 } 35 { STURI_OPENID10, 0 }
36 }; 36 };
37 enum { 37 enum {
38 st_index_1 = 2, st_index_2 = 1 38 st_index_1 = 2, st_index_2 = 1
39 }; 39 };
40 40
41 41
42 static inline bool is_qelement(const XML_Char *n,const char *qen) { 42 static inline bool is_qelement(const XML_Char *n,const char *qen) {
43 return !strcasecmp(n,qen); 43 return !strcasecmp(n,qen);
@@ -65,25 +65,26 @@ namespace opkele {
65 for(;*a;++a) 65 for(;*a;++a)
66 if(!strcasecmp(*(a++),at)) { 66 if(!strcasecmp(*(a++),at)) {
67 return *a; 67 return *a;
68 } 68 }
69 return 0; 69 return 0;
70 } 70 }
71 71
72 class idigger_t : public util::curl_t, public util::expat_t { 72 class idigger_t : public util::curl_t, public util::expat_t {
73 public: 73 public:
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
81 string xrds_location; 82 string xrds_location;
82 string http_content_type; 83 string http_content_type;
83 service_t html_openid1; 84 service_t html_openid1;
84 service_t html_openid2; 85 service_t html_openid2;
85 string cdata_buf; 86 string cdata_buf;
86 long status_code; 87 long status_code;
87 string status_string; 88 string status_string;
88 89
89 typedef list<string> pt_stack_t; 90 typedef list<string> pt_stack_t;
@@ -101,45 +102,59 @@ namespace opkele {
101 util::expat_t(0), 102 util::expat_t(0),
102 xri_proxy(XRI_PROXY_URL) { 103 xri_proxy(XRI_PROXY_URL) {
103 CURLcode r; 104 CURLcode r;
104 (r=misc_sets()) 105 (r=misc_sets())
105 || (r=set_write()) 106 || (r=set_write())
106 || (r=set_header()) 107 || (r=set_header())
107 ; 108 ;
108 if(r) 109 if(r)
109 throw exception_curl(OPKELE_CP_ "failed to set curly options",r); 110 throw exception_curl(OPKELE_CP_ "failed to set curly options",r);
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;
116 string::size_type fsc = identity.find_first_not_of(whitespace); 131 string::size_type fsc = identity.find_first_not_of(whitespace);
117 if(fsc==string::npos) 132 if(fsc==string::npos)
118 throw bad_input(OPKELE_CP_ "whitespace-only identity"); 133 throw bad_input(OPKELE_CP_ "whitespace-only identity");
119 string::size_type lsc = identity.find_last_not_of(whitespace); 134 string::size_type lsc = identity.find_last_not_of(whitespace);
120 assert(lsc!=string::npos); 135 assert(lsc!=string::npos);
121 if(!strncasecmp(identity.c_str()+fsc,"xri://",sizeof("xri://")-1)) 136 if(!strncasecmp(identity.c_str()+fsc,"xri://",sizeof("xri://")-1))
122 fsc += sizeof("xri://")-1; 137 fsc += sizeof("xri://")-1;
123 if((fsc+1)>=lsc) 138 if((fsc+1)>=lsc)
124 throw bad_input(OPKELE_CP_ "not a character of importance in identity"); 139 throw bad_input(OPKELE_CP_ "not a character of importance in identity");
125 string id(identity,fsc,lsc-fsc+1); 140 string id(identity,fsc,lsc-fsc+1);
126 idis.clear(); 141 idis.clear();
127 if(strchr(i_leaders,id[0])) { 142 if(strchr(i_leaders,id[0])) {
128 /* TODO: further normalize xri identity? Like folding case 143 /* TODO: further normalize xri identity? Like folding case
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)+
137 "?_xrd_t="+util::url_encode(st->uri)+ 152 "?_xrd_t="+util::url_encode(st->uri)+
138 "&_xrd_r=application/xrd%2Bxml" 153 "&_xrd_r=application/xrd%2Bxml"
139 ";sep=true;refs=true", 154 ";sep=true;refs=true",
140 xmode_xrd ); 155 xmode_xrd );
141 if(status_code==241) continue; 156 if(status_code==241) continue;
142 if(status_code!=100) 157 if(status_code!=100)
143 throw failed_xri_resolution(OPKELE_CP_ 158 throw failed_xri_resolution(OPKELE_CP_
144 "XRI resolution failed with '"+status_string+"' message" 159 "XRI resolution failed with '"+status_string+"' message"
145 ", while looking for SEP with type '"+st->uri+"'", status_code); 160 ", while looking for SEP with type '"+st->uri+"'", status_code);
@@ -185,37 +200,39 @@ namespace opkele {
185 if(r) 200 if(r)
186 throw exception_curl(OPKELE_CP_ "failed to get CURLINFO_EFFECTIVE_URL",r); 201 throw exception_curl(OPKELE_CP_ "failed to get CURLINFO_EFFECTIVE_URL",r);
187 string cid = util::strip_uri_fragment_part( idis.canonicalized_id = util::rfc_3986_normalize_uri(eu) ); 202 string cid = util::strip_uri_fragment_part( idis.canonicalized_id = util::rfc_3986_normalize_uri(eu) );
188 if(xrds_location.empty()) { 203 if(xrds_location.empty()) {
189 html2xrd(oi,idis); 204 html2xrd(oi,idis);
190 }else{ 205 }else{
191 idis.clear(); 206 idis.clear();
192 idis.canonicalized_id = cid; 207 idis.canonicalized_id = cid;
193 discover_at(idis,xrds_location,xmode_xrd); 208 discover_at(idis,xrds_location,xmode_xrd);
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 }
202 } 217 }
203 return rv; 218 return rv;
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;
213 prepare_to_parse(); 230 prepare_to_parse();
214 if(xmode&xmode_html) { 231 if(xmode&xmode_html) {
215 xrds_location.clear(); 232 xrds_location.clear();
216 save_html.clear(); 233 save_html.clear();
217 save_html.reserve(max_html); 234 save_html.reserve(max_html);
218 } 235 }
219 xrd = &idis.xrd; 236 xrd = &idis.xrd;
220 237
221 r = easy_perform(); 238 r = easy_perform();
@@ -263,30 +280,30 @@ namespace opkele {
263 } 280 }
264 281
265 cdata = 0; xrd_service = 0; skipping = 0; 282 cdata = 0; xrd_service = 0; skipping = 0;
266 pt_stack.clear(); 283 pt_stack.clear();
267 status_code = 100; status_string.clear(); 284 status_code = 100; status_string.clear();
268 } 285 }
269 286
270 void html2xrd(endpoint_discovery_iterator& oi,idiscovery_t& id) { 287 void html2xrd(endpoint_discovery_iterator& oi,idiscovery_t& id) {
271 XRD_t& x = id.xrd; 288 XRD_t& x = id.xrd;
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
284 size_t write(void *p,size_t s,size_t nm) { 301 size_t write(void *p,size_t s,size_t nm) {
285 /* TODO: limit total size */ 302 /* TODO: limit total size */
286 size_t bytes = s*nm; 303 size_t bytes = s*nm;
287 const char *inbuf = (const char*)p; 304 const char *inbuf = (const char*)p;
288 if(xmode&xmode_html) { 305 if(xmode&xmode_html) {
289 size_t mbts = save_html.capacity()-save_html.size(); 306 size_t mbts = save_html.capacity()-save_html.size();
290 size_t bts = 0; 307 size_t bts = 0;
291 if(mbts>0) { 308 if(mbts>0) {
292 bts = (bytes>mbts)?mbts:bytes; 309 bts = (bytes>mbts)?mbts:bytes;
@@ -540,13 +557,21 @@ namespace opkele {
540 } 557 }
541 } 558 }
542 } 559 }
543 } 560 }
544 561
545 }; 562 };
546 563
547 string idiscover(endpoint_discovery_iterator oi,const string& identity) { 564 string idiscover(endpoint_discovery_iterator oi,const string& identity) {
548 idigger_t idigger; 565 idigger_t idigger;
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}