-rw-r--r-- | lib/Makefile.am | 2 | ||||
-rw-r--r-- | lib/curl.cc | 20 | ||||
-rw-r--r-- | lib/fields.cc | 86 | ||||
-rw-r--r-- | lib/message.cc (renamed from lib/openid_message.cc) | 84 |
4 files changed, 108 insertions, 84 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index e8bfbf5..20d15b8 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -27,8 +27,8 @@ libopkele_la_SOURCES = \ extension_chain.cc \ curl.cc expat.cc \ discovery.cc \ basic_rp.cc prequeue_rp.cc \ - openid_message.cc \ + fields.cc message.cc \ basic_op.cc verify_op.cc libopkele_la_LDFLAGS = \ -version-info 2:0:0 diff --git a/lib/curl.cc b/lib/curl.cc index 6172828..734e2ca 100644 --- a/lib/curl.cc +++ b/lib/curl.cc @@ -1,12 +1,32 @@ +#include <opkele/exception.h> #include <opkele/curl.h> #include "config.h" namespace opkele { namespace util { + curl_slist_t::~curl_slist_t() throw() { + if(_s) + curl_slist_free_all(_s); + } + + curl_slist_t& curl_slist_t::operator=(curl_slist *s) { + if(_s) + curl_slist_free_all(_s); + _s = s; + return *this; + } + + void curl_slist_t::append(const char *str) { + curl_slist *s = curl_slist_append(_s,str); + if(!s) + throw opkele::exception(OPKELE_CP_ "failed to curl_slist_append()"); + _s=s; + } + curl_t::~curl_t() throw() { if(_c) curl_easy_cleanup(_c); } diff --git a/lib/fields.cc b/lib/fields.cc new file mode 100644 index 0000000..d494098 --- a/dev/null +++ b/lib/fields.cc @@ -0,0 +1,86 @@ +#include <opkele/types.h> +#include <opkele/exception.h> +#include <opkele/util.h> + +namespace opkele { + using std::unary_function; + + struct __om_copier : public unary_function<const string&,void> { + public: + const basic_fields& from; + basic_fields& to; + + __om_copier(basic_fields& t,const basic_fields& f) + : from(f), to(t) { } + + result_type operator()(argument_type f) { + to.set_field(f,from.get_field(f)); } + }; + + basic_fields::basic_fields(const basic_fields& x) { + x.copy_to(*this); + } + void basic_fields::copy_to(basic_fields& x) const { + x.reset_fields(); + for_each(fields_begin(),fields_end(), + __om_copier(x,*this) ); + } + void basic_fields::append_to(basic_fields& x) const { + for_each(fields_begin(),fields_end(), + __om_copier(x,*this) ); + } + + struct __om_query_builder : public unary_function<const string&,void> { + public: + const basic_fields& om; + bool first; + string& rv; + const char *pfx; + + __om_query_builder(const char *p,string& r,const basic_fields& m) + : om(m), first(true), rv(r), pfx(p) { + for_each(om.fields_begin(),om.fields_end(),*this); + } + __om_query_builder(const char *p,string& r,const basic_fields& m,const string& u) + : om(m), first(true), rv(r), pfx(p) { + rv = u; + if(rv.find('?')==string::npos) + rv += '?'; + else + first = false; + for_each(om.fields_begin(),om.fields_end(),*this); + } + + result_type operator()(argument_type f) { + if(first) + first = false; + else + rv += '&'; + if(pfx) rv += pfx; + rv+= f; + rv += '='; + rv += util::url_encode(om.get_field(f)); + } + }; + + string basic_fields::append_query(const string& url,const char *pfx) const { + string rv; + return __om_query_builder(pfx,rv,*this,url).rv; + } + string basic_fields::query_string(const char *pfx) const { + string rv; + return __om_query_builder(pfx,rv,*this).rv; + } + + void basic_fields::reset_fields() { + throw not_implemented(OPKELE_CP_ "reset_fields() not implemented"); + } + void basic_fields::set_field(const string&,const string&) { + throw not_implemented(OPKELE_CP_ "set_field() not implemented"); + } + void basic_fields::reset_field(const string&) { + throw not_implemented(OPKELE_CP_ "reset_field() not implemented"); + } + + +} diff --git a/lib/openid_message.cc b/lib/message.cc index e244f43..b2324b7 100644 --- a/lib/openid_message.cc +++ b/lib/message.cc @@ -9,32 +9,8 @@ namespace opkele { using std::input_iterator_tag; using std::unary_function; - struct __om_copier : public unary_function<const string&,void> { - public: - const basic_openid_message& from; - basic_openid_message& to; - - __om_copier(basic_openid_message& t,const basic_openid_message& f) - : from(f), to(t) { } - - result_type operator()(argument_type f) { - to.set_field(f,from.get_field(f)); } - }; - - basic_openid_message::basic_openid_message(const basic_openid_message& x) { - x.copy_to(*this); - } - void basic_openid_message::copy_to(basic_openid_message& x) const { - x.reset_fields(); - for_each(fields_begin(),fields_end(), - __om_copier(x,*this) ); - } - void basic_openid_message::append_to(basic_openid_message& x) const { - for_each(fields_begin(),fields_end(), - __om_copier(x,*this) ); - } struct __om_ns_finder : public unary_function<const string&,bool> { public: const basic_openid_message& om; @@ -64,60 +40,8 @@ namespace opkele { throw failed_lookup(OPKELE_CP_ string("failed to find namespace ")+uri); return i->substr(3); } - struct __om_query_builder : public unary_function<const string&,void> { - public: - const basic_openid_message& om; - bool first; - string& rv; - const char *pfx; - - __om_query_builder(const char *p,string& r,const basic_openid_message& m) - : om(m), first(true), rv(r), pfx(p) { - for_each(om.fields_begin(),om.fields_end(),*this); - } - __om_query_builder(const char *p,string& r,const basic_openid_message& m,const string& u) - : om(m), first(true), rv(r), pfx(p) { - rv = u; - if(rv.find('?')==string::npos) - rv += '?'; - else - first = false; - for_each(om.fields_begin(),om.fields_end(),*this); - } - - result_type operator()(argument_type f) { - if(first) - first = false; - else - rv += '&'; - if(pfx) rv += pfx; - rv+= f; - rv += '='; - rv += util::url_encode(om.get_field(f)); - } - }; - - string basic_openid_message::append_query(const string& url,const char *pfx) const { - string rv; - return __om_query_builder(pfx,rv,*this,url).rv; - } - string basic_openid_message::query_string(const char *pfx) const { - string rv; - return __om_query_builder(pfx,rv,*this).rv; - } - - void basic_openid_message::reset_fields() { - throw not_implemented(OPKELE_CP_ "reset_fields() not implemented"); - } - void basic_openid_message::set_field(const string&,const string&) { - throw not_implemented(OPKELE_CP_ "set_field() not implemented"); - } - void basic_openid_message::reset_field(const string&) { - throw not_implemented(OPKELE_CP_ "reset_field() not implemented"); - } - void basic_openid_message::from_keyvalues(const string& kv) { reset_fields(); string::size_type p = 0; while(true) { @@ -128,9 +52,9 @@ namespace opkele { string::size_type nl = kv.find('\n',co+1); if(nl==string::npos) throw bad_input(OPKELE_CP_ "malformed input"); if(nl>co) - insert(value_type(kv.substr(p,co-p),kv.substr(co+1,nl-co-1))); + set_field(kv.substr(p,co-p),kv.substr(co+1,nl-co-1)); p = nl+1; #else /* POSTELS_LAW */ string::size_type lb = kv.find_first_of("\r\n",co+1); if(lb==string::npos) { @@ -239,14 +163,8 @@ namespace opkele { set_field("ns."+rv,uri); return rv; } - void openid_message_t::copy_to(basic_openid_message& x) const { - x.reset_fields(); - for(const_iterator i=begin();i!=end();++i) - x.set_field(i->first,i->second); - } - bool openid_message_t::has_field(const string& n) const { return find(n)!=end(); } const string& openid_message_t::get_field(const string& n) const { |