-rw-r--r-- | lib/discovery.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/discovery.cc b/lib/discovery.cc index 6f58339..6f9926c 100644 --- a/lib/discovery.cc +++ b/lib/discovery.cc | |||
@@ -237,193 +237,193 @@ namespace opkele { | |||
237 | 237 | ||
238 | r = easy_perform(); | 238 | r = easy_perform(); |
239 | if(r && r!=CURLE_WRITE_ERROR) | 239 | if(r && r!=CURLE_WRITE_ERROR) |
240 | throw exception_curl(OPKELE_CP_ "failed to perform curly request",r); | 240 | throw exception_curl(OPKELE_CP_ "failed to perform curly request",r); |
241 | 241 | ||
242 | if(!parser_choked) { | 242 | if(!parser_choked) { |
243 | parse(0,0,true); | 243 | parse(0,0,true); |
244 | }else{ | 244 | }else{ |
245 | /* TODO: do not bother if we've seen xml */ | 245 | /* TODO: do not bother if we've seen xml */ |
246 | try { | 246 | try { |
247 | util::tidy_doc_t td = util::tidy_doc_t::create(); | 247 | util::tidy_doc_t td = util::tidy_doc_t::create(); |
248 | if(!td) | 248 | if(!td) |
249 | throw exception_tidy(OPKELE_CP_ "failed to create htmltidy document"); | 249 | throw exception_tidy(OPKELE_CP_ "failed to create htmltidy document"); |
250 | #ifndef NDEBUG | 250 | #ifndef NDEBUG |
251 | td.opt_set(TidyQuiet,false); | 251 | td.opt_set(TidyQuiet,false); |
252 | td.opt_set(TidyShowWarnings,false); | 252 | td.opt_set(TidyShowWarnings,false); |
253 | #endif /* NDEBUG */ | 253 | #endif /* NDEBUG */ |
254 | td.opt_set(TidyForceOutput,true); | 254 | td.opt_set(TidyForceOutput,true); |
255 | td.opt_set(TidyXhtmlOut,true); | 255 | td.opt_set(TidyXhtmlOut,true); |
256 | td.opt_set(TidyDoctypeMode,TidyDoctypeOmit); | 256 | td.opt_set(TidyDoctypeMode,TidyDoctypeOmit); |
257 | td.opt_set(TidyMark,false); | 257 | td.opt_set(TidyMark,false); |
258 | if(td.parse_string(save_html)<=0) | 258 | if(td.parse_string(save_html)<=0) |
259 | throw exception_tidy(OPKELE_CP_ "tidy failed to parse document"); | 259 | throw exception_tidy(OPKELE_CP_ "tidy failed to parse document"); |
260 | if(td.clean_and_repair()<=0) | 260 | if(td.clean_and_repair()<=0) |
261 | throw exception_tidy(OPKELE_CP_ "tidy failed to clean and repair"); | 261 | throw exception_tidy(OPKELE_CP_ "tidy failed to clean and repair"); |
262 | util::tidy_buf_t tide; | 262 | util::tidy_buf_t tide; |
263 | if(td.save_buffer(tide)<=0) | 263 | if(td.save_buffer(tide)<=0) |
264 | throw exception_tidy(OPKELE_CP_ "tidy failed to save buffer"); | 264 | throw exception_tidy(OPKELE_CP_ "tidy failed to save buffer"); |
265 | prepare_to_parse(); | 265 | prepare_to_parse(); |
266 | parse(tide.c_str(),tide.size(),true); | 266 | parse(tide.c_str(),tide.size(),true); |
267 | }catch(exception_tidy& et) { } | 267 | }catch(exception_tidy& et) { } |
268 | } | 268 | } |
269 | save_html.clear(); | 269 | save_html.clear(); |
270 | } | 270 | } |
271 | 271 | ||
272 | void prepare_to_parse() { | 272 | void prepare_to_parse() { |
273 | (*(expat_t*)this) = parser_create_ns(); | 273 | (*(expat_t*)this) = parser_create_ns(); |
274 | set_user_data(); set_element_handler(); | 274 | set_user_data(); set_element_handler(); |
275 | set_character_data_handler(); | 275 | set_character_data_handler(); |
276 | 276 | ||
277 | if(xmode&xmode_html) { | 277 | if(xmode&xmode_html) { |
278 | html_openid1.clear(); html_openid2.clear(); | 278 | html_openid1.clear(); html_openid2.clear(); |
279 | parser_choked = false; | 279 | parser_choked = false; |
280 | } | 280 | } |
281 | 281 | ||
282 | cdata = 0; xrd_service = 0; skipping = 0; | 282 | cdata = 0; xrd_service = 0; skipping = 0; |
283 | pt_stack.clear(); | 283 | pt_stack.clear(); |
284 | status_code = 100; status_string.clear(); | 284 | status_code = 100; status_string.clear(); |
285 | } | 285 | } |
286 | 286 | ||
287 | void html2xrd(endpoint_discovery_iterator& oi,idiscovery_t& id) { | 287 | void html2xrd(endpoint_discovery_iterator& oi,idiscovery_t& id) { |
288 | XRD_t& x = id.xrd; | 288 | XRD_t& x = id.xrd; |
289 | if(!html_openid2.uris.empty()) { | 289 | if(!html_openid2.uris.empty()) { |
290 | html_openid2.types.insert(STURI_OPENID20); | 290 | html_openid2.types.insert(STURI_OPENID20); |
291 | x.services.add(-1,html_openid2); | 291 | x.services.add(-1,html_openid2); |
292 | queue_endpoints(oi,id,&op_service_types[st_index_2]); | 292 | queue_endpoints(oi,id,&op_service_types[st_index_2]); |
293 | } | 293 | } |
294 | if(!html_openid1.uris.empty()) { | 294 | if(!html_openid1.uris.empty()) { |
295 | html_openid1.types.insert(STURI_OPENID11); | 295 | html_openid1.types.insert(STURI_OPENID11); |
296 | x.services.add(-1,html_openid1); | 296 | x.services.add(-1,html_openid1); |
297 | queue_endpoints(oi,id,&op_service_types[st_index_1]); | 297 | queue_endpoints(oi,id,&op_service_types[st_index_1]); |
298 | } | 298 | } |
299 | } | 299 | } |
300 | 300 | ||
301 | size_t write(void *p,size_t s,size_t nm) { | 301 | size_t write(void *p,size_t s,size_t nm) { |
302 | /* TODO: limit total size */ | 302 | /* TODO: limit total size */ |
303 | size_t bytes = s*nm; | 303 | size_t bytes = s*nm; |
304 | const char *inbuf = (const char*)p; | 304 | const char *inbuf = (const char*)p; |
305 | if(xmode&xmode_html) { | 305 | if(xmode&xmode_html) { |
306 | size_t mbts = save_html.capacity()-save_html.size(); | 306 | size_t mbts = save_html.capacity()-save_html.size(); |
307 | size_t bts = 0; | 307 | size_t bts = 0; |
308 | if(mbts>0) { | 308 | if(mbts>0) { |
309 | bts = (bytes>mbts)?mbts:bytes; | 309 | bts = (bytes>mbts)?mbts:bytes; |
310 | save_html.append(inbuf,bts); | 310 | save_html.append(inbuf,bts); |
311 | } | 311 | } |
312 | if(skipping<0) return bts; | 312 | if(skipping<0) return bts; |
313 | } | 313 | } |
314 | if(skipping<0) return 0; | 314 | if(skipping<0) return 0; |
315 | bool rp = parse(inbuf,bytes,false); | 315 | bool rp = parse(inbuf,bytes,false); |
316 | if(!rp) { | 316 | if(!rp) { |
317 | parser_choked = true; | 317 | parser_choked = true; |
318 | skipping = -1; | 318 | skipping = -1; |
319 | if(!(xmode&xmode_html)) | 319 | if(!(xmode&xmode_html)) |
320 | bytes = 0; | 320 | bytes = 0; |
321 | } | 321 | } |
322 | return bytes; | 322 | return bytes; |
323 | } | 323 | } |
324 | size_t header(void *p,size_t s,size_t nm) { | 324 | size_t header(void *p,size_t s,size_t nm) { |
325 | size_t bytes = s*nm; | 325 | size_t bytes = s*nm; |
326 | const char *h = (const char*)p; | 326 | const char *h = (const char*)p; |
327 | const char *colon = (const char*)memchr(p,':',bytes); | 327 | const char *colon = (const char*)memchr(p,':',bytes); |
328 | const char *space = (const char*)memchr(p,' ',bytes); | 328 | const char *space = (const char*)memchr(p,' ',bytes); |
329 | if(space && ( (!colon) || space<colon ) ) { | 329 | if(space && ( (!colon) || space<colon ) ) { |
330 | xrds_location.clear(); http_content_type.clear(); | 330 | xrds_location.clear(); http_content_type.clear(); |
331 | }else if(colon) { | 331 | }else if(colon) { |
332 | const char *hv = ++colon; | 332 | const char *hv = ++colon; |
333 | int hnl = colon-h; | 333 | size_t hnl = colon-h; |
334 | int rb; | 334 | int rb; |
335 | for(rb = bytes-hnl-1;rb>0 && isspace(*hv);++hv,--rb); | 335 | for(rb = bytes-hnl-1;rb>0 && isspace(*hv);++hv,--rb); |
336 | while(rb>0 && isspace(hv[rb-1])) --rb; | 336 | while(rb>0 && isspace(hv[rb-1])) --rb; |
337 | if(rb) { | 337 | if(rb) { |
338 | if( (hnl>=sizeof(XRDS_HEADER)) | 338 | if( (hnl>=sizeof(XRDS_HEADER)) |
339 | && !strncasecmp(h,XRDS_HEADER":", | 339 | && !strncasecmp(h,XRDS_HEADER":", |
340 | sizeof(XRDS_HEADER)) ) { | 340 | sizeof(XRDS_HEADER)) ) { |
341 | xrds_location.assign(hv,rb); | 341 | xrds_location.assign(hv,rb); |
342 | }else if( (hnl>=sizeof(CT_HEADER)) | 342 | }else if( (hnl>=sizeof(CT_HEADER)) |
343 | && !strncasecmp(h,CT_HEADER":", | 343 | && !strncasecmp(h,CT_HEADER":", |
344 | sizeof(CT_HEADER)) ) { | 344 | sizeof(CT_HEADER)) ) { |
345 | const char *sc = (const char*)memchr( | 345 | const char *sc = (const char*)memchr( |
346 | hv,';',rb); | 346 | hv,';',rb); |
347 | http_content_type.assign(hv,sc?(sc-hv):rb); | 347 | http_content_type.assign(hv,sc?(sc-hv):rb); |
348 | } | 348 | } |
349 | } | 349 | } |
350 | } | 350 | } |
351 | return curl_t::header(p,s,nm); | 351 | return curl_t::header(p,s,nm); |
352 | } | 352 | } |
353 | 353 | ||
354 | void start_element(const XML_Char *n,const XML_Char **a) { | 354 | void start_element(const XML_Char *n,const XML_Char **a) { |
355 | if(skipping<0) return; | 355 | if(skipping<0) return; |
356 | if(skipping) { | 356 | if(skipping) { |
357 | if(xmode&xmode_html) | 357 | if(xmode&xmode_html) |
358 | html_start_element(n,a); | 358 | html_start_element(n,a); |
359 | ++skipping; return; | 359 | ++skipping; return; |
360 | } | 360 | } |
361 | if(pt_stack.empty()) { | 361 | if(pt_stack.empty()) { |
362 | if(is_qelement(n,NSURI_XRDS "\tXRDS")) | 362 | if(is_qelement(n,NSURI_XRDS "\tXRDS")) |
363 | return; | 363 | return; |
364 | if(is_qelement(n,NSURI_XRD "\tXRD")) { | 364 | if(is_qelement(n,NSURI_XRD "\tXRD")) { |
365 | assert(xrd); | 365 | assert(xrd); |
366 | xrd->clear(); | 366 | xrd->clear(); |
367 | pt_stack.push_back(n); | 367 | pt_stack.push_back(n); |
368 | }else if(xmode&xmode_html) { | 368 | }else if(xmode&xmode_html) { |
369 | html_start_element(n,a); | 369 | html_start_element(n,a); |
370 | }else{ | 370 | }else{ |
371 | skipping = -1; | 371 | skipping = -1; |
372 | } | 372 | } |
373 | }else{ | 373 | }else{ |
374 | int pt_s = pt_stack.size(); | 374 | int pt_s = pt_stack.size(); |
375 | if(pt_s==1) { | 375 | if(pt_s==1) { |
376 | if(is_qelement(n,NSURI_XRD "\tCanonicalID")) { | 376 | if(is_qelement(n,NSURI_XRD "\tCanonicalID")) { |
377 | assert(xrd); | 377 | assert(xrd); |
378 | cdata = &(xrd->canonical_ids.add(element_priority(a),string())); | 378 | cdata = &(xrd->canonical_ids.add(element_priority(a),string())); |
379 | }else if(is_qelement(n,NSURI_XRD "\tLocalID")) { | 379 | }else if(is_qelement(n,NSURI_XRD "\tLocalID")) { |
380 | assert(xrd); | 380 | assert(xrd); |
381 | cdata = &(xrd->local_ids.add(element_priority(a),string())); | 381 | cdata = &(xrd->local_ids.add(element_priority(a),string())); |
382 | }else if(is_qelement(n,NSURI_XRD "\tProviderID")) { | 382 | }else if(is_qelement(n,NSURI_XRD "\tProviderID")) { |
383 | assert(xrd); | 383 | assert(xrd); |
384 | cdata = &(xrd->provider_id); | 384 | cdata = &(xrd->provider_id); |
385 | }else if(is_qelement(n,NSURI_XRD "\tService")) { | 385 | }else if(is_qelement(n,NSURI_XRD "\tService")) { |
386 | assert(xrd); | 386 | assert(xrd); |
387 | xrd_service = &(xrd->services.add(element_priority(a), | 387 | xrd_service = &(xrd->services.add(element_priority(a), |
388 | service_t())); | 388 | service_t())); |
389 | pt_stack.push_back(n); | 389 | pt_stack.push_back(n); |
390 | }else if(is_qelement(n,NSURI_XRD "\tStatus")) { | 390 | }else if(is_qelement(n,NSURI_XRD "\tStatus")) { |
391 | for(;*a;) { | 391 | for(;*a;) { |
392 | if(!strcasecmp(*(a++),"code")) { | 392 | if(!strcasecmp(*(a++),"code")) { |
393 | if(sscanf(*(a++),"%ld",&status_code)==1 && status_code!=100) { | 393 | if(sscanf(*(a++),"%ld",&status_code)==1 && status_code!=100) { |
394 | cdata = &status_string; | 394 | cdata = &status_string; |
395 | pt_stack.push_back(n); | 395 | pt_stack.push_back(n); |
396 | break; | 396 | break; |
397 | } | 397 | } |
398 | }else | 398 | }else |
399 | ++a; | 399 | ++a; |
400 | } | 400 | } |
401 | }else if(is_qelement(n,NSURI_XRD "\tExpires")) { | 401 | }else if(is_qelement(n,NSURI_XRD "\tExpires")) { |
402 | assert(xrd); | 402 | assert(xrd); |
403 | cdata_buf.clear(); | 403 | cdata_buf.clear(); |
404 | cdata = &cdata_buf; | 404 | cdata = &cdata_buf; |
405 | }else if(xmode&xmode_html) { | 405 | }else if(xmode&xmode_html) { |
406 | html_start_element(n,a); | 406 | html_start_element(n,a); |
407 | }else{ | 407 | }else{ |
408 | skipping = 1; | 408 | skipping = 1; |
409 | } | 409 | } |
410 | }else if(pt_s==2) { | 410 | }else if(pt_s==2) { |
411 | if(is_qelement(pt_stack.back().c_str(), NSURI_XRD "\tService")) { | 411 | if(is_qelement(pt_stack.back().c_str(), NSURI_XRD "\tService")) { |
412 | if(is_qelement(n,NSURI_XRD "\tType")) { | 412 | if(is_qelement(n,NSURI_XRD "\tType")) { |
413 | assert(xrd); assert(xrd_service); | 413 | assert(xrd); assert(xrd_service); |
414 | cdata_buf.clear(); | 414 | cdata_buf.clear(); |
415 | cdata = &cdata_buf; | 415 | cdata = &cdata_buf; |
416 | }else if(is_qelement(n,NSURI_XRD "\tURI")) { | 416 | }else if(is_qelement(n,NSURI_XRD "\tURI")) { |
417 | assert(xrd); assert(xrd_service); | 417 | assert(xrd); assert(xrd_service); |
418 | const char *append = element_attr(a,"append"); | 418 | const char *append = element_attr(a,"append"); |
419 | xrd::uri_t& uri = xrd_service->uris.add(element_priority(a),xrd::uri_t("",append?append:"")); | 419 | xrd::uri_t& uri = xrd_service->uris.add(element_priority(a),xrd::uri_t("",append?append:"")); |
420 | cdata = &uri.uri; | 420 | cdata = &uri.uri; |
421 | }else if(is_qelement(n,NSURI_XRD "\tLocalID") | 421 | }else if(is_qelement(n,NSURI_XRD "\tLocalID") |
422 | || is_qelement(n,NSURI_OPENID10 "\tDelegate") ) { | 422 | || is_qelement(n,NSURI_OPENID10 "\tDelegate") ) { |
423 | assert(xrd); assert(xrd_service); | 423 | assert(xrd); assert(xrd_service); |
424 | cdata = &(xrd_service->local_ids.add(element_priority(a),string())); | 424 | cdata = &(xrd_service->local_ids.add(element_priority(a),string())); |
425 | }else if(is_qelement(n,NSURI_XRD "\tProviderID")) { | 425 | }else if(is_qelement(n,NSURI_XRD "\tProviderID")) { |
426 | assert(xrd); assert(xrd_service); | 426 | assert(xrd); assert(xrd_service); |
427 | cdata = &(xrd_service->provider_id); | 427 | cdata = &(xrd_service->provider_id); |
428 | }else{ | 428 | }else{ |
429 | skipping = 1; | 429 | skipping = 1; |