1 files changed, 28 insertions, 22 deletions

diff --git a/lib/consumer.cc b/lib/consumer.cc
index c155157..62bec71 100644
--- a/lib/consumer.cc
+++ b/lib/consumer.cc
@@ -15,12 +15,31 @@
 #include <pcre.h>
 
 namespace opkele {
     using namespace std;
     using util::curl_t;
 
+    template<int lim>
+        class curl_fetch_string_t : public curl_t {
+            public:
+                curl_fetch_string_t(CURL *c)
+                    : curl_t(c) { }
+                ~curl_fetch_string_t() throw() { }
+
+                string response;
+
+                size_t write(void *p,size_t size,size_t nmemb) {
+                    size_t bytes = size*nmemb;
+                    size_t get = min(lim-response.length(),bytes);
+                    response.append((const char *)p,get);
+                    return get;
+                }
+        };
+
+    typedef curl_fetch_string_t<16384> curl_pick_t;
+
     class pcre_matches_t {
         public:
             int *_ov;
             int _s;
 
             pcre_matches_t() : _ov(0), _s(0) { }
@@ -59,20 +78,12 @@ namespace opkele {
                 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 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;
-    }
-
     assoc_t consumer_t::associate(const string& server) {
         util::dh_t dh = DH_new();
         if(!dh)
             throw exception_openssl(OPKELE_CP_ "failed to DH_new()");
         dh->p = util::dec_to_bignum(data::_default_p);
         dh->g = util::dec_to_bignum(data::_default_g);
@@ -81,30 +92,28 @@ namespace opkele {
         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));
-        curl_t curl = curl_t::easy_init();
+        curl_pick_t curl = curl_pick_t::easy_init();
         if(!curl)
             throw exception_curl(OPKELE_CP_ "failed to initialize curl");
-        string response;
         CURLcode r;
         (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))
+        || (r=curl.set_write())
         ;
         if(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);
+        params_t p; p.parse_keyvalues(curl.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");
@@ -241,30 +250,28 @@ namespace opkele {
                 request += '&';
                 request += i->first;
                 request += '=';
                 request += util::url_encode(i->second);
             }
         }
-        curl_t curl = curl_t::easy_init();
+        curl_pick_t curl = curl_pick_t::easy_init();
         if(!curl)
             throw exception_curl(OPKELE_CP_ "failed to initialize curl");
-        string response;
         CURLcode r;
         (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))
+        || (r=curl.set_write())
         ;
         if(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);
+        params_t pp; pp.parse_keyvalues(curl.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")) {
@@ -274,21 +281,20 @@ namespace opkele {
         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();
-        curl_t curl = curl_t::easy_init();
+        curl_pick_t curl = curl_pick_t::easy_init();
         if(!curl)
             throw exception_curl(OPKELE_CP_ "failed to initialize curl");
-        string html;
+        string& html = curl.response;
         CURLcode r;
         (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))
+        || (r=curl.set_write());
         ;
         if(r)
             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 perform curly request",r);