summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--include/Makefile.am3
-rw-r--r--include/opkele/curl.h28
-rw-r--r--lib/consumer.cc25
3 files changed, 35 insertions, 21 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index f3551f5..b31786d 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -13,4 +13,5 @@ nobase_include_HEADERS = \
13 opkele/xserver.h 13 opkele/xserver.h
14EXTRA_DIST = \ 14EXTRA_DIST = \
15 opkele/data.h \ 15 opkele/data.h \
16 opkele/util.h 16 opkele/util.h \
17 opkele/curl.h
diff --git a/include/opkele/curl.h b/include/opkele/curl.h
new file mode 100644
index 0000000..8794ece
--- a/dev/null
+++ b/include/opkele/curl.h
@@ -0,0 +1,28 @@
1#ifndef __OPKELE_CURL_H
2#define __OPKELE_CURL_H
3
4#include <curl/curl.h>
5
6namespace opkele {
7
8 namespace util {
9
10 class curl_t {
11 public:
12 CURL *_c;
13
14 curl_t() : _c(0) { }
15 curl_t(CURL *c) : _c(c) { }
16 ~curl_t() throw() { if(_c) curl_easy_cleanup(_c); }
17
18 curl_t& operator=(CURL *c) { if(_c) curl_easy_cleanup(_c); _c=c; return *this; }
19
20 operator const CURL*(void) const { return _c; }
21 operator CURL*(void) { return _c; }
22 };
23
24 }
25
26}
27
28#endif /* __OPKELE_CURL_H */
diff --git a/lib/consumer.cc b/lib/consumer.cc
index 7881f5f..20f4174 100644
--- a/lib/consumer.cc
+++ b/lib/consumer.cc
@@ -2,13 +2,12 @@
2#include <cassert> 2#include <cassert>
3#include <cstring> 3#include <cstring>
4#include <opkele/util.h> 4#include <opkele/util.h>
5#include <opkele/curl.h>
5#include <opkele/exception.h> 6#include <opkele/exception.h>
6#include <opkele/data.h> 7#include <opkele/data.h>
7#include <opkele/consumer.h> 8#include <opkele/consumer.h>
8#include <openssl/sha.h> 9#include <openssl/sha.h>
9#include <openssl/hmac.h> 10#include <openssl/hmac.h>
10#include <curl/curl.h>
11
12#include <iostream> 11#include <iostream>
13 12
14#include "config.h" 13#include "config.h"
@@ -62,20 +61,6 @@ namespace opkele {
62 } 61 }
63 }; 62 };
64 63
65 class curl_t {
66 public:
67 CURL *_c;
68
69 curl_t() : _c(0) { }
70 curl_t(CURL *c) : _c(c) { }
71 ~curl_t() throw() { if(_c) curl_easy_cleanup(_c); }
72
73 curl_t& operator=(CURL *c) { if(_c) curl_easy_cleanup(_c); _c=c; return *this; }
74
75 operator const CURL*(void) const { return _c; }
76 operator CURL*(void) { return _c; }
77 };
78
79 static CURLcode curl_misc_sets(CURL* c) { 64 static CURLcode curl_misc_sets(CURL* c) {
80 CURLcode r; 65 CURLcode r;
81 (r=curl_easy_setopt(c,CURLOPT_FOLLOWLOCATION,1)) 66 (r=curl_easy_setopt(c,CURLOPT_FOLLOWLOCATION,1))
@@ -116,7 +101,7 @@ namespace opkele {
116 "&openid.session_type=DH-SHA1" 101 "&openid.session_type=DH-SHA1"
117 "&openid.dh_consumer_public="; 102 "&openid.dh_consumer_public=";
118 request += util::url_encode(util::bignum_to_base64(dh->pub_key)); 103 request += util::url_encode(util::bignum_to_base64(dh->pub_key));
119 curl_t curl = curl_easy_init(); 104 util::curl_t curl = curl_easy_init();
120 if(!curl) 105 if(!curl)
121 throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()"); 106 throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()");
122 string response; 107 string response;
@@ -276,7 +261,7 @@ namespace opkele {
276 request += util::url_encode(i->second); 261 request += util::url_encode(i->second);
277 } 262 }
278 } 263 }
279 curl_t curl = curl_easy_init(); 264 util::curl_t curl = curl_easy_init();
280 if(!curl) 265 if(!curl)
281 throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()"); 266 throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()");
282 string response; 267 string response;
@@ -309,7 +294,7 @@ namespace opkele {
309 void consumer_t::retrieve_links(const string& url,string& server,string& delegate) { 294 void consumer_t::retrieve_links(const string& url,string& server,string& delegate) {
310 server.erase(); 295 server.erase();
311 delegate.erase(); 296 delegate.erase();
312 curl_t curl = curl_easy_init(); 297 util::curl_t curl = curl_easy_init();
313 if(!curl) 298 if(!curl)
314 throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()"); 299 throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()");
315 string html; 300 string html;
@@ -415,7 +400,7 @@ namespace opkele {
415 400
416 string consumer_t::canonicalize(const string& url) { 401 string consumer_t::canonicalize(const string& url) {
417 string rv = normalize(url); 402 string rv = normalize(url);
418 curl_t curl = curl_easy_init(); 403 util::curl_t curl = curl_easy_init();
419 if(!curl) 404 if(!curl)
420 throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()"); 405 throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()");
421 string html; 406 string html;