more curl wrapper cosmetics

Signed-off-by: Michael Krelin <hacker@klever.net>

3 files changed, 88 insertions, 62 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index b008a52..0fe705a 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -17,11 +17,12 @@ libopkele_la_SOURCES = \
                        util.cc \
                        server.cc \
                        secret.cc \
                        data.cc \
                        consumer.cc \
                        exception.cc \
                        extension.cc \
                        sreg.cc \
-                       extension_chain.cc
+                       extension_chain.cc \
+                       curl.cc
 libopkele_la_LDFLAGS = \
         -version-info 2:0:0
diff --git a/lib/consumer.cc b/lib/consumer.cc
index 20f4174..c155157 100644
--- a/lib/consumer.cc
+++ b/lib/consumer.cc
@@ -11,16 +11,17 @@
 #include <iostream>
 
 #include "config.h"
 
 #include <pcre.h>
 
 namespace opkele {
     using namespace std;
+    using util::curl_t;
 
     class pcre_matches_t {
         public:
             int *_ov;
             int _s;
 
             pcre_matches_t() : _ov(0), _s(0) { }
             pcre_matches_t(int s) : _ov(0), _s(s) {
@@ -56,34 +57,16 @@ namespace opkele {
 
             int exec(const string& s,pcre_matches_t& m) {
                 if(!_p)
                     throw internal_error(OPKELE_CP_ "Trying to execute absent regexp");
                 return pcre_exec(_p,NULL,s.c_str(),s.length(),0,0,m._ov,m._s);
             }
     };
 
-    static CURLcode curl_misc_sets(CURL* c) {
-        CURLcode r;
-        (r=curl_easy_setopt(c,CURLOPT_FOLLOWLOCATION,1))
-        || (r=curl_easy_setopt(c,CURLOPT_MAXREDIRS,5))
-        || (r=curl_easy_setopt(c,CURLOPT_DNS_CACHE_TIMEOUT,120))
-        || (r=curl_easy_setopt(c,CURLOPT_DNS_USE_GLOBAL_CACHE,1))
-        || (r=curl_easy_setopt(c,CURLOPT_USERAGENT,PACKAGE_NAME"/"PACKAGE_SRC_VERSION))
-        || (r=curl_easy_setopt(c,CURLOPT_TIMEOUT,20))
-        #ifdefDISABLE_CURL_SSL_VERIFYHOST
-        || (r=curl_easy_setopt(c,CURLOPT_SSL_VERIFYHOST,0))
-#endif
-        #ifdefDISABLE_CURL_SSL_VERIFYPEER
-        || (r=curl_easy_setopt(c,CURLOPT_SSL_VERIFYPEER,0))
-#endif
-        ;
-        return r;
-    }
-
     static size_t _curl_tostring(void *ptr,size_t size,size_t nmemb,void *stream) {
         string *str = (string*)stream;
         size_t bytes = size*nmemb;
         size_t get = min(16384-str->length(),bytes);
         str->append((const char*)ptr,get);
         return get;
     }
 
@@ -96,33 +79,33 @@ namespace opkele {
         if(!DH_generate_key(dh))
             throw exception_openssl(OPKELE_CP_ "failed to DH_generate_key()");
         string request = 
             "openid.mode=associate"
             "&openid.assoc_type=HMAC-SHA1"
             "&openid.session_type=DH-SHA1"
             "&openid.dh_consumer_public=";
         request += util::url_encode(util::bignum_to_base64(dh->pub_key));
-        util::curl_t curl = curl_easy_init();
+        curl_t curl = curl_t::easy_init();
         if(!curl)
-            throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()");
+            throw exception_curl(OPKELE_CP_ "failed to initialize curl");
         string response;
         CURLcode r;
-        (r=curl_misc_sets(curl))
-        || (r=curl_easy_setopt(curl,CURLOPT_URL,server.c_str()))
-        || (r=curl_easy_setopt(curl,CURLOPT_POST,1))
-        || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDS,request.data()))
-        || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDSIZE,request.length()))
-        || (r=curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,_curl_tostring))
-        || (r=curl_easy_setopt(curl,CURLOPT_WRITEDATA,&response))
+        (r=curl.misc_sets())
+        || (r=curl.easy_setopt(CURLOPT_URL,server.c_str()))
+        || (r=curl.easy_setopt(CURLOPT_POST,1))
+        || (r=curl.easy_setopt(CURLOPT_POSTFIELDS,request.data()))
+        || (r=curl.easy_setopt(CURLOPT_POSTFIELDSIZE,request.length()))
+        || (r=curl.easy_setopt(CURLOPT_WRITEFUNCTION,_curl_tostring))
+        || (r=curl.easy_setopt(CURLOPT_WRITEDATA,&response))
         ;
         if(r)
-            throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r);
-        if( (r=curl_easy_perform(curl)) )
-            throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r);
+            throw exception_curl(OPKELE_CP_ "failed to set curly options",r);
+        if( (r=curl.easy_perform()) )
+            throw exception_curl(OPKELE_CP_ "failed to perform curly request",r);
         params_t p; p.parse_keyvalues(response);
         if(p.has_param("assoc_type") && p.get_param("assoc_type")!="HMAC-SHA1")
             throw bad_input(OPKELE_CP_ "unsupported assoc_type");
         string st;
         if(p.has_param("session_type")) st = p.get_param("session_type");
         if((!st.empty()) && st!="DH-SHA1")
             throw bad_input(OPKELE_CP_ "unsupported session_type");
         secret_t secret;
@@ -256,64 +239,64 @@ namespace opkele {
         for(params_t::const_iterator i=p.begin();i!=p.end();++i) {
             if(i->first!="openid.mode") {
                 request += '&';
                 request += i->first;
                 request += '=';
                 request += util::url_encode(i->second);
             }
         }
-        util::curl_t curl = curl_easy_init();
+        curl_t curl = curl_t::easy_init();
         if(!curl)
-            throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()");
+            throw exception_curl(OPKELE_CP_ "failed to initialize curl");
         string response;
         CURLcode r;
-        (r=curl_misc_sets(curl))
-        || (r=curl_easy_setopt(curl,CURLOPT_URL,server.c_str()))
-        || (r=curl_easy_setopt(curl,CURLOPT_POST,1))
-        || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDS,request.data()))
-        || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDSIZE,request.length()))
-        || (r=curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,_curl_tostring))
-        || (r=curl_easy_setopt(curl,CURLOPT_WRITEDATA,&response))
+        (r=curl.misc_sets())
+        || (r=curl.easy_setopt(CURLOPT_URL,server.c_str()))
+        || (r=curl.easy_setopt(CURLOPT_POST,1))
+        || (r=curl.easy_setopt(CURLOPT_POSTFIELDS,request.data()))
+        || (r=curl.easy_setopt(CURLOPT_POSTFIELDSIZE,request.length()))
+        || (r=curl.easy_setopt(CURLOPT_WRITEFUNCTION,_curl_tostring))
+        || (r=curl.easy_setopt(CURLOPT_WRITEDATA,&response))
         ;
         if(r)
-            throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r);
-        if( (r=curl_easy_perform(curl)) )
-            throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r);
+            throw exception_curl(OPKELE_CP_ "failed to set curly options",r);
+        if( (r=curl.easy_perform()) )
+            throw exception_curl(OPKELE_CP_ "failed to perform curly request",r);
         params_t pp; pp.parse_keyvalues(response);
         if(pp.has_param("invalidate_handle"))
             invalidate_assoc(server,pp.get_param("invalidate_handle"));
         if(pp.has_param("is_valid")) {
             if(pp.get_param("is_valid")=="true")
                 return;
         }else if(pp.has_param("lifetime")) {
             if(util::string_to_long(pp.get_param("lifetime")))
                 return;
         }
         throw failed_check_authentication(OPKELE_CP_ "failed to verify response");
     }
 
     void consumer_t::retrieve_links(const string& url,string& server,string& delegate) {
         server.erase();
         delegate.erase();
-        util::curl_t curl = curl_easy_init();
+        curl_t curl = curl_t::easy_init();
         if(!curl)
-            throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()");
+            throw exception_curl(OPKELE_CP_ "failed to initialize curl");
         string html;
         CURLcode r;
-        (r=curl_misc_sets(curl))
-        || (r=curl_easy_setopt(curl,CURLOPT_URL,url.c_str()))
-        || (r=curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,_curl_tostring))
-        || (r=curl_easy_setopt(curl,CURLOPT_WRITEDATA,&html))
+        (r=curl.misc_sets())
+        || (r=curl.easy_setopt(CURLOPT_URL,url.c_str()))
+        || (r=curl.easy_setopt(CURLOPT_WRITEFUNCTION,_curl_tostring))
+        || (r=curl.easy_setopt(CURLOPT_WRITEDATA,&html))
         ;
         if(r)
-            throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r);
-        r = curl_easy_perform(curl);
+            throw exception_curl(OPKELE_CP_ "failed to set curly options",r);
+        r = curl.easy_perform();
         if(r && r!=CURLE_WRITE_ERROR)
-            throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r);
+            throw exception_curl(OPKELE_CP_ "failed to perform curly request",r);
         static const char *re_bre = "<\\s*body\\b", *re_hdre = "<\\s*head[^>]*>",
                      *re_lre = "<\\s*link\\b([^>]+)>",
                      *re_rre = "\\brel\\s*=\\s*['\"]([^'\"]+)['\"]",
                      *re_hre = "\\bhref\\s*=\\s*['\"]\\s*([^'\"\\s]+)\\s*['\"]";
         pcre_matches_t m1(3), m2(3);
         pcre_t bre(re_bre,PCRE_CASELESS);
         if(bre.exec(html,m1)>0)
             html.erase(m1.begin(0));
@@ -395,31 +378,31 @@ namespace opkele {
             if(sl==string::npos)
                 rv += '/';
         }
         return rv;
     }
 
     string consumer_t::canonicalize(const string& url) {
         string rv = normalize(url);
-        util::curl_t curl = curl_easy_init();
+        curl_t curl = curl_t::easy_init();
         if(!curl)
-            throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()");
+            throw exception_curl(OPKELE_CP_ "failed to initialize curl()");
         string html;
         CURLcode r;
-        (r=curl_misc_sets(curl))
-        || (r=curl_easy_setopt(curl,CURLOPT_URL,rv.c_str()))
-        || (r=curl_easy_setopt(curl,CURLOPT_NOBODY,1))
+        (r=curl.misc_sets())
+        || (r=curl.easy_setopt(CURLOPT_URL,rv.c_str()))
+        || (r=curl.easy_setopt(CURLOPT_NOBODY,1))
         ;
         if(r)
-            throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r);
-        r = curl_easy_perform(curl);
+            throw exception_curl(OPKELE_CP_ "failed to set curly options",r);
+        r = curl.easy_perform();
         if(r)
-            throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r);
+            throw exception_curl(OPKELE_CP_ "failed to perform curly request",r);
         const char *eu = 0;
-        r = curl_easy_getinfo(curl,CURLINFO_EFFECTIVE_URL,&eu);
+        r = curl.easy_getinfo(CURLINFO_EFFECTIVE_URL,&eu);
         if(r)
-            throw exception_curl(OPKELE_CP_ "failed to curl_easy_getinfo(..CURLINFO_EFFECTIVE_URL..)",r);
+            throw exception_curl(OPKELE_CP_ "failed to get CURLINFO_EFFECTIVE_URL",r);
         rv = eu;
         return normalize(rv);
     }
 
 }
diff --git a/lib/curl.cc b/lib/curl.cc
new file mode 100644
index 0000000..418aa79
--- a/dev/null
+++ b/lib/curl.cc
@@ -0,0 +1,42 @@
+#include <opkele/curl.h>
+
+#include "config.h"
+
+namespace opkele {
+
+    namespace util {
+
+        curl_t::~curl_t() throw() {
+            if(_c)
+                curl_easy_cleanup(_c);
+        }
+
+        curl_t& curl_t::operator=(CURL *c) {
+            if(_c)
+                curl_easy_cleanup(_c);
+            _c = c;
+            return *this;
+        }
+
+        CURLcode curl_t::misc_sets() {
+            assert(_c);
+            CURLcode r;
+            (r=easy_setopt(CURLOPT_FOLLOWLOCATION,1))
+            || (r=easy_setopt(CURLOPT_MAXREDIRS,5))
+            || (r=easy_setopt(CURLOPT_DNS_CACHE_TIMEOUT,120))
+            || (r=easy_setopt(CURLOPT_DNS_USE_GLOBAL_CACHE,1))
+            || (r=easy_setopt(CURLOPT_USERAGENT,PACKAGE_NAME"/"PACKAGE_SRC_VERSION))
+            || (r=easy_setopt(CURLOPT_TIMEOUT,20))
+        #ifdefDISABLE_CURL_SSL_VERIFYHOST
+            || (r=easy_setopt(CURLOPT_SSL_VERIFYHOST,0))
+#endif
+        #ifdefDISABLE_CURL_SSL_VERIFYPEER
+            || (r=easy_setopt(CURLOPT_SSL_VERIFYPEER,0))
+#endif
+            ;
+            return r;
+        }
+
+    }
+
+}