| -rw-r--r-- | include/opkele/curl.h | 15 | ||||
| -rw-r--r-- | lib/Makefile.am | 3 | ||||
| -rw-r--r-- | lib/consumer.cc | 105 | ||||
| -rw-r--r-- | lib/curl.cc | 42 |
4 files changed, 101 insertions, 64 deletions
diff --git a/include/opkele/curl.h b/include/opkele/curl.h index 8794ece..6a7d084 100644 --- a/include/opkele/curl.h +++ b/include/opkele/curl.h @@ -1,28 +1,39 @@ #ifndef __OPKELE_CURL_H #define __OPKELE_CURL_H +#include <cassert> #include <curl/curl.h> namespace opkele { namespace util { 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); } + virtual ~curl_t() throw(); - curl_t& operator=(CURL *c) { if(_c) curl_easy_cleanup(_c); _c=c; return *this; } + curl_t& operator=(CURL *c); operator const CURL*(void) const { return _c; } operator CURL*(void) { return _c; } + + CURLcode misc_sets(); + + template<typename PT> + inline CURLcode easy_setopt(CURLoption o,PT p) { assert(_c); return curl_easy_setopt(_c,o,p); } + CURLcode easy_perform() { assert(_c); return curl_easy_perform(_c); } + template<typename IT> + inline CURLcode easy_getinfo(CURLINFO i,IT p) { assert(_c); return curl_easy_getinfo(_c,i,p); } + + static inline CURL *easy_init() { return curl_easy_init(); } }; } } #endif /* __OPKELE_CURL_H */ diff --git a/lib/Makefile.am b/lib/Makefile.am index b008a52..0fe705a 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -9,19 +9,20 @@ INCLUDES = \ libopkele_la_LIBADD = \ ${LIBCURL} \ ${PCRE_LIBS} \ ${OPENSSL_LIBS} \ ${KONFORKA_LIBS} libopkele_la_SOURCES = \ params.cc \ 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 @@ -3,32 +3,33 @@ #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 <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) { 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]; } @@ -48,89 +49,71 @@ namespace opkele { 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); } }; - 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)); - 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; if(st.empty()) { secret.from_base64(p.get_param("mac_key")); }else{ util::bignum_t s_pub = util::base64_to_bignum(p.get_param("dh_server_public")); vector<unsigned char> ck(DH_size(dh)+1); unsigned char *ckptr = &(ck.front())+1; int cklen = DH_compute_key(ckptr,s_pub,dh); if(cklen<0) @@ -248,80 +231,80 @@ namespace opkele { 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); } } - 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)); pcre_t hdre(re_hdre,PCRE_CASELESS); if(hdre.exec(html,m1)<=0) throw bad_input(OPKELE_CP_ "failed to find <head>"); html.erase(0,m1.end(0)+1); pcre_t lre(re_lre,PCRE_CASELESS), rre(re_rre,PCRE_CASELESS), hre(re_hre,PCRE_CASELESS); bool gotit = false; while( (!gotit) && lre.exec(html,m1)>=2 ) { static const char *whitespace = " \t"; @@ -387,39 +370,39 @@ namespace opkele { 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); - 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)) +#ifdef DISABLE_CURL_SSL_VERIFYHOST + || (r=easy_setopt(CURLOPT_SSL_VERIFYHOST,0)) +#endif +#ifdef DISABLE_CURL_SSL_VERIFYPEER + || (r=easy_setopt(CURLOPT_SSL_VERIFYPEER,0)) +#endif + ; + return r; + } + + } + +} |