author | Michael Krelin <hacker@klever.net> | 2007-11-24 13:33:53 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-11-24 13:34:30 (UTC) |
commit | d788db9c490575e63506ce502a2f089eaaa624ee (patch) (unidiff) | |
tree | b102c7469fe3b20fc37cf0b27977049a1d55b75f /lib/consumer.cc | |
parent | 986274e9f9a8e2ef0f92b08d2d2c9485bd19adec (diff) | |
download | libopkele-d788db9c490575e63506ce502a2f089eaaa624ee.zip libopkele-d788db9c490575e63506ce502a2f089eaaa624ee.tar.gz libopkele-d788db9c490575e63506ce502a2f089eaaa624ee.tar.bz2 |
more curl wrapper cosmetics
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | lib/consumer.cc | 105 |
1 files changed, 44 insertions, 61 deletions
diff --git a/lib/consumer.cc b/lib/consumer.cc index 20f4174..c155157 100644 --- a/lib/consumer.cc +++ b/lib/consumer.cc | |||
@@ -15,8 +15,9 @@ | |||
15 | #include <pcre.h> | 15 | #include <pcre.h> |
16 | 16 | ||
17 | namespace opkele { | 17 | namespace opkele { |
18 | using namespace std; | 18 | using namespace std; |
19 | using util::curl_t; | ||
19 | 20 | ||
20 | class pcre_matches_t { | 21 | class pcre_matches_t { |
21 | public: | 22 | public: |
22 | int *_ov; | 23 | int *_ov; |
@@ -60,26 +61,8 @@ namespace opkele { | |||
60 | return pcre_exec(_p,NULL,s.c_str(),s.length(),0,0,m._ov,m._s); | 61 | return pcre_exec(_p,NULL,s.c_str(),s.length(),0,0,m._ov,m._s); |
61 | } | 62 | } |
62 | }; | 63 | }; |
63 | 64 | ||
64 | static CURLcode curl_misc_sets(CURL* c) { | ||
65 | CURLcode r; | ||
66 | (r=curl_easy_setopt(c,CURLOPT_FOLLOWLOCATION,1)) | ||
67 | || (r=curl_easy_setopt(c,CURLOPT_MAXREDIRS,5)) | ||
68 | || (r=curl_easy_setopt(c,CURLOPT_DNS_CACHE_TIMEOUT,120)) | ||
69 | || (r=curl_easy_setopt(c,CURLOPT_DNS_USE_GLOBAL_CACHE,1)) | ||
70 | || (r=curl_easy_setopt(c,CURLOPT_USERAGENT,PACKAGE_NAME"/"PACKAGE_SRC_VERSION)) | ||
71 | || (r=curl_easy_setopt(c,CURLOPT_TIMEOUT,20)) | ||
72 | #ifdefDISABLE_CURL_SSL_VERIFYHOST | ||
73 | || (r=curl_easy_setopt(c,CURLOPT_SSL_VERIFYHOST,0)) | ||
74 | #endif | ||
75 | #ifdefDISABLE_CURL_SSL_VERIFYPEER | ||
76 | || (r=curl_easy_setopt(c,CURLOPT_SSL_VERIFYPEER,0)) | ||
77 | #endif | ||
78 | ; | ||
79 | return r; | ||
80 | } | ||
81 | |||
82 | static size_t _curl_tostring(void *ptr,size_t size,size_t nmemb,void *stream) { | 65 | static size_t _curl_tostring(void *ptr,size_t size,size_t nmemb,void *stream) { |
83 | string *str = (string*)stream; | 66 | string *str = (string*)stream; |
84 | size_t bytes = size*nmemb; | 67 | size_t bytes = size*nmemb; |
85 | size_t get = min(16384-str->length(),bytes); | 68 | size_t get = min(16384-str->length(),bytes); |
@@ -100,25 +83,25 @@ namespace opkele { | |||
100 | "&openid.assoc_type=HMAC-SHA1" | 83 | "&openid.assoc_type=HMAC-SHA1" |
101 | "&openid.session_type=DH-SHA1" | 84 | "&openid.session_type=DH-SHA1" |
102 | "&openid.dh_consumer_public="; | 85 | "&openid.dh_consumer_public="; |
103 | request += util::url_encode(util::bignum_to_base64(dh->pub_key)); | 86 | request += util::url_encode(util::bignum_to_base64(dh->pub_key)); |
104 | util::curl_t curl = curl_easy_init(); | 87 | curl_t curl = curl_t::easy_init(); |
105 | if(!curl) | 88 | if(!curl) |
106 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()"); | 89 | throw exception_curl(OPKELE_CP_ "failed to initialize curl"); |
107 | string response; | 90 | string response; |
108 | CURLcode r; | 91 | CURLcode r; |
109 | (r=curl_misc_sets(curl)) | 92 | (r=curl.misc_sets()) |
110 | || (r=curl_easy_setopt(curl,CURLOPT_URL,server.c_str())) | 93 | || (r=curl.easy_setopt(CURLOPT_URL,server.c_str())) |
111 | || (r=curl_easy_setopt(curl,CURLOPT_POST,1)) | 94 | || (r=curl.easy_setopt(CURLOPT_POST,1)) |
112 | || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDS,request.data())) | 95 | || (r=curl.easy_setopt(CURLOPT_POSTFIELDS,request.data())) |
113 | || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDSIZE,request.length())) | 96 | || (r=curl.easy_setopt(CURLOPT_POSTFIELDSIZE,request.length())) |
114 | || (r=curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,_curl_tostring)) | 97 | || (r=curl.easy_setopt(CURLOPT_WRITEFUNCTION,_curl_tostring)) |
115 | || (r=curl_easy_setopt(curl,CURLOPT_WRITEDATA,&response)) | 98 | || (r=curl.easy_setopt(CURLOPT_WRITEDATA,&response)) |
116 | ; | 99 | ; |
117 | if(r) | 100 | if(r) |
118 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r); | 101 | throw exception_curl(OPKELE_CP_ "failed to set curly options",r); |
119 | if( (r=curl_easy_perform(curl)) ) | 102 | if( (r=curl.easy_perform()) ) |
120 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r); | 103 | throw exception_curl(OPKELE_CP_ "failed to perform curly request",r); |
121 | params_t p; p.parse_keyvalues(response); | 104 | params_t p; p.parse_keyvalues(response); |
122 | if(p.has_param("assoc_type") && p.get_param("assoc_type")!="HMAC-SHA1") | 105 | if(p.has_param("assoc_type") && p.get_param("assoc_type")!="HMAC-SHA1") |
123 | throw bad_input(OPKELE_CP_ "unsupported assoc_type"); | 106 | throw bad_input(OPKELE_CP_ "unsupported assoc_type"); |
124 | string st; | 107 | string st; |
@@ -260,25 +243,25 @@ namespace opkele { | |||
260 | request += '='; | 243 | request += '='; |
261 | request += util::url_encode(i->second); | 244 | request += util::url_encode(i->second); |
262 | } | 245 | } |
263 | } | 246 | } |
264 | util::curl_t curl = curl_easy_init(); | 247 | curl_t curl = curl_t::easy_init(); |
265 | if(!curl) | 248 | if(!curl) |
266 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()"); | 249 | throw exception_curl(OPKELE_CP_ "failed to initialize curl"); |
267 | string response; | 250 | string response; |
268 | CURLcode r; | 251 | CURLcode r; |
269 | (r=curl_misc_sets(curl)) | 252 | (r=curl.misc_sets()) |
270 | || (r=curl_easy_setopt(curl,CURLOPT_URL,server.c_str())) | 253 | || (r=curl.easy_setopt(CURLOPT_URL,server.c_str())) |
271 | || (r=curl_easy_setopt(curl,CURLOPT_POST,1)) | 254 | || (r=curl.easy_setopt(CURLOPT_POST,1)) |
272 | || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDS,request.data())) | 255 | || (r=curl.easy_setopt(CURLOPT_POSTFIELDS,request.data())) |
273 | || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDSIZE,request.length())) | 256 | || (r=curl.easy_setopt(CURLOPT_POSTFIELDSIZE,request.length())) |
274 | || (r=curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,_curl_tostring)) | 257 | || (r=curl.easy_setopt(CURLOPT_WRITEFUNCTION,_curl_tostring)) |
275 | || (r=curl_easy_setopt(curl,CURLOPT_WRITEDATA,&response)) | 258 | || (r=curl.easy_setopt(CURLOPT_WRITEDATA,&response)) |
276 | ; | 259 | ; |
277 | if(r) | 260 | if(r) |
278 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r); | 261 | throw exception_curl(OPKELE_CP_ "failed to set curly options",r); |
279 | if( (r=curl_easy_perform(curl)) ) | 262 | if( (r=curl.easy_perform()) ) |
280 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r); | 263 | throw exception_curl(OPKELE_CP_ "failed to perform curly request",r); |
281 | params_t pp; pp.parse_keyvalues(response); | 264 | params_t pp; pp.parse_keyvalues(response); |
282 | if(pp.has_param("invalidate_handle")) | 265 | if(pp.has_param("invalidate_handle")) |
283 | invalidate_assoc(server,pp.get_param("invalidate_handle")); | 266 | invalidate_assoc(server,pp.get_param("invalidate_handle")); |
284 | if(pp.has_param("is_valid")) { | 267 | if(pp.has_param("is_valid")) { |
@@ -293,23 +276,23 @@ namespace opkele { | |||
293 | 276 | ||
294 | void consumer_t::retrieve_links(const string& url,string& server,string& delegate) { | 277 | void consumer_t::retrieve_links(const string& url,string& server,string& delegate) { |
295 | server.erase(); | 278 | server.erase(); |
296 | delegate.erase(); | 279 | delegate.erase(); |
297 | util::curl_t curl = curl_easy_init(); | 280 | curl_t curl = curl_t::easy_init(); |
298 | if(!curl) | 281 | if(!curl) |
299 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()"); | 282 | throw exception_curl(OPKELE_CP_ "failed to initialize curl"); |
300 | string html; | 283 | string html; |
301 | CURLcode r; | 284 | CURLcode r; |
302 | (r=curl_misc_sets(curl)) | 285 | (r=curl.misc_sets()) |
303 | || (r=curl_easy_setopt(curl,CURLOPT_URL,url.c_str())) | 286 | || (r=curl.easy_setopt(CURLOPT_URL,url.c_str())) |
304 | || (r=curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,_curl_tostring)) | 287 | || (r=curl.easy_setopt(CURLOPT_WRITEFUNCTION,_curl_tostring)) |
305 | || (r=curl_easy_setopt(curl,CURLOPT_WRITEDATA,&html)) | 288 | || (r=curl.easy_setopt(CURLOPT_WRITEDATA,&html)) |
306 | ; | 289 | ; |
307 | if(r) | 290 | if(r) |
308 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r); | 291 | throw exception_curl(OPKELE_CP_ "failed to set curly options",r); |
309 | r = curl_easy_perform(curl); | 292 | r = curl.easy_perform(); |
310 | if(r && r!=CURLE_WRITE_ERROR) | 293 | if(r && r!=CURLE_WRITE_ERROR) |
311 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r); | 294 | throw exception_curl(OPKELE_CP_ "failed to perform curly request",r); |
312 | static const char *re_bre = "<\\s*body\\b", *re_hdre = "<\\s*head[^>]*>", | 295 | static const char *re_bre = "<\\s*body\\b", *re_hdre = "<\\s*head[^>]*>", |
313 | *re_lre = "<\\s*link\\b([^>]+)>", | 296 | *re_lre = "<\\s*link\\b([^>]+)>", |
314 | *re_rre = "\\brel\\s*=\\s*['\"]([^'\"]+)['\"]", | 297 | *re_rre = "\\brel\\s*=\\s*['\"]([^'\"]+)['\"]", |
315 | *re_hre = "\\bhref\\s*=\\s*['\"]\\s*([^'\"\\s]+)\\s*['\"]"; | 298 | *re_hre = "\\bhref\\s*=\\s*['\"]\\s*([^'\"\\s]+)\\s*['\"]"; |
@@ -399,26 +382,26 @@ namespace opkele { | |||
399 | } | 382 | } |
400 | 383 | ||
401 | string consumer_t::canonicalize(const string& url) { | 384 | string consumer_t::canonicalize(const string& url) { |
402 | string rv = normalize(url); | 385 | string rv = normalize(url); |
403 | util::curl_t curl = curl_easy_init(); | 386 | curl_t curl = curl_t::easy_init(); |
404 | if(!curl) | 387 | if(!curl) |
405 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()"); | 388 | throw exception_curl(OPKELE_CP_ "failed to initialize curl()"); |
406 | string html; | 389 | string html; |
407 | CURLcode r; | 390 | CURLcode r; |
408 | (r=curl_misc_sets(curl)) | 391 | (r=curl.misc_sets()) |
409 | || (r=curl_easy_setopt(curl,CURLOPT_URL,rv.c_str())) | 392 | || (r=curl.easy_setopt(CURLOPT_URL,rv.c_str())) |
410 | || (r=curl_easy_setopt(curl,CURLOPT_NOBODY,1)) | 393 | || (r=curl.easy_setopt(CURLOPT_NOBODY,1)) |
411 | ; | 394 | ; |
412 | if(r) | 395 | if(r) |
413 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r); | 396 | throw exception_curl(OPKELE_CP_ "failed to set curly options",r); |
414 | r = curl_easy_perform(curl); | 397 | r = curl.easy_perform(); |
415 | if(r) | 398 | if(r) |
416 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r); | 399 | throw exception_curl(OPKELE_CP_ "failed to perform curly request",r); |
417 | const char *eu = 0; | 400 | const char *eu = 0; |
418 | r = curl_easy_getinfo(curl,CURLINFO_EFFECTIVE_URL,&eu); | 401 | r = curl.easy_getinfo(CURLINFO_EFFECTIVE_URL,&eu); |
419 | if(r) | 402 | if(r) |
420 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_getinfo(..CURLINFO_EFFECTIVE_URL..)",r); | 403 | throw exception_curl(OPKELE_CP_ "failed to get CURLINFO_EFFECTIVE_URL",r); |
421 | rv = eu; | 404 | rv = eu; |
422 | return normalize(rv); | 405 | return normalize(rv); |
423 | } | 406 | } |
424 | 407 | ||