moved curl_t wrapper to util namespace

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

1 files changed, 5 insertions, 20 deletions

diff --git a/lib/consumer.cc b/lib/consumer.cc
index 7881f5f..20f4174 100644
--- a/lib/consumer.cc
+++ b/lib/consumer.cc
@@ -1,35 +1,34 @@
 #include <algorithm>
 #include <cassert>
 #include <cstring>
 #include <opkele/util.h>
+#include <opkele/curl.h>
 #include <opkele/exception.h>
 #include <opkele/data.h>
 #include <opkele/consumer.h>
 #include <openssl/sha.h>
 #include <openssl/hmac.h>
-#include <curl/curl.h>
-
 #include <iostream>
 
 #include "config.h"
 
 #include <pcre.h>
 
 namespace opkele {
     using namespace std;
 
     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) {
 		if(_s&1) ++_s;
 		_s += _s>>1;
 		_ov = new int[_s];
 	    }
 	    ~pcre_matches_t() throw() { if(_ov) delete[] _ov; }
 
 	    int begin(int i) const { return _ov[i<<1]; }
 	    int end(int i) const { return _ov[(i<<1)+1]; }
@@ -41,103 +40,89 @@ namespace opkele {
 	    pcre *_p;
 
 	    pcre_t() : _p(0) { }
 	    pcre_t(pcre *p) : _p(p) { }
 	    pcre_t(const char *re,int opts) : _p(0) {
 		static const char *errptr; static int erroffset;
 		_p = pcre_compile(re,opts,&errptr,&erroffset,NULL);
 		if(!_p)
 		    throw internal_error(OPKELE_CP_ string("Failed to compile regexp: ")+errptr);
 	    }
 	    ~pcre_t() throw() { if(_p) (*pcre_free)(_p); }
 
 	    pcre_t& operator=(pcre *p) { if(_p) (*pcre_free)(_p); _p=p; return *this; }
 
 	    operator const pcre*(void) const { return _p; }
 	    operator pcre*(void) { return _p; }
 
 	    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);
 	    }
     };
 
-    class curl_t {
-	public:
-	    CURL *_c;
-
-	    curl_t() : _c(0) { }
-	    curl_t(CURL *c) : _c(c) { }
-	    ~curl_t() throw() { if(_c) curl_easy_cleanup(_c); }
-
-	    curl_t& operator=(CURL *c) { if(_c) curl_easy_cleanup(_c); _c=c; return *this; }
-
-	    operator const CURL*(void) const { return _c; }
-	    operator CURL*(void) { return _c; }
-    };
-
     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))
 #ifdef	DISABLE_CURL_SSL_VERIFYHOST
 	|| (r=curl_easy_setopt(c,CURLOPT_SSL_VERIFYHOST,0))
 #endif
 #ifdef	DISABLE_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;
     }
 
     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);
 	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));
-	curl_t curl = curl_easy_init();
+	util::curl_t curl = curl_easy_init();
 	if(!curl)
 	    throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()");
 	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))
 	;
 	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);
 	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;
@@ -255,82 +240,82 @@ namespace opkele {
 	    p["openid.signed"] = pin.get_param("openid.signed");
 	    try {
 		string ih = pin.get_param("openid.invalidate_handle");
 		p["openid.invalidate_handle"] = ih;
 	    }catch(failed_lookup& fl) { }
 	    try {
 		check_authentication(server,p);
 	    }catch(failed_check_authentication& fca) {
 		throw id_res_failed(OPKELE_CP_ "failed to check_authentication()");
 	    }
 	}
 	if(ext) ext->id_res_hook(pin,ps,identity);
     }
 
     void consumer_t::check_authentication(const string& server,const params_t& p) {
 	string request = "openid.mode=check_authentication";
 	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);
 	    }
 	}
-	curl_t curl = curl_easy_init();
+	util::curl_t curl = curl_easy_init();
 	if(!curl)
 	    throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()");
 	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))
 	;
 	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);
 	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();
-	curl_t curl = curl_easy_init();
+	util::curl_t curl = curl_easy_init();
 	if(!curl)
 	    throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()");
 	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))
 	;
 	if(r)
 	    throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r);
 	r = curl_easy_perform(curl);
 	if(r && r!=CURLE_WRITE_ERROR)
 	    throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",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));
 	pcre_t hdre(re_hdre,PCRE_CASELESS);
 	if(hdre.exec(html,m1)<=0)
@@ -394,47 +379,47 @@ namespace opkele {
 	if(i<(rv.length()-1))
 	    rv.erase(i+1);
 	// add missing http://
 	i = rv.find("://");
 	if(i==string::npos) { // primitive. but do we need more?
 	    rv.insert(0,"http://");
 	    i = sizeof("http://")-1;
 	}else{
 	    i += sizeof("://")-1;
 	}
 	string::size_type qm = rv.find('?',i);
 	string::size_type sl = rv.find('/',i);
 	if(qm!=string::npos) {
 	    if(sl==string::npos || sl>qm)
 		rv.insert(qm,1,'/');
 	}else{
 	    if(sl==string::npos)
 		rv += '/';
 	}
 	return rv;
     }
 
     string consumer_t::canonicalize(const string& url) {
 	string rv = normalize(url);
-	curl_t curl = curl_easy_init();
+	util::curl_t curl = curl_easy_init();
 	if(!curl)
 	    throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()");
 	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))
 	;
 	if(r)
 	    throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r);
 	r = curl_easy_perform(curl);
 	if(r)
 	    throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r);
 	const char *eu = 0;
 	r = curl_easy_getinfo(curl,CURLINFO_EFFECTIVE_URL,&eu);
 	if(r)
 	    throw exception_curl(OPKELE_CP_ "failed to curl_easy_getinfo(..CURLINFO_EFFECTIVE_URL..)",r);
 	rv = eu;
 	return normalize(rv);
     }
 
 }