| -rw-r--r-- | include/opkele/curl.h | 20 | ||||
| -rw-r--r-- | include/opkele/types.h | 39 |
2 files changed, 44 insertions, 15 deletions
diff --git a/include/opkele/curl.h b/include/opkele/curl.h index 5cf8e48..bcaf11d 100644 --- a/include/opkele/curl.h +++ b/include/opkele/curl.h @@ -3,41 +3,61 @@ #include <cassert> #include <string> #include <algorithm> #include <curl/curl.h> namespace opkele { using std::min; using std::string; namespace util { + class curl_slist_t { + public: + curl_slist *_s; + + curl_slist_t() : _s(0) { } + curl_slist_t(curl_slist *s) : _s(s) { } + virtual ~curl_slist_t() throw(); + + curl_slist_t& operator=(curl_slist *s); + + operator const curl_slist*(void) const { return _s; } + operator curl_slist*(void) { return _s; } + + void append(const char *str); + void append(const string& str) { + append(str.c_str()); } + }; + class curl_t { public: CURL *_c; curl_t() : _c(0) { } curl_t(CURL *c) : _c(c) { } virtual ~curl_t() throw(); 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); } + inline CURLcode easy_setopt(CURLoption o,const curl_slist_t& p) { + assert(_c); return curl_easy_setopt(_c,o,(const curl_slist*)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(); } virtual size_t write(void* /* p */,size_t /* s */,size_t /* nm */) { return 0; } CURLcode set_write(); virtual int progress(double /* dlt */,double /* dln*/ ,double /* ult */,double /* uln */) { return 0; } CURLcode set_progress(); diff --git a/include/opkele/types.h b/include/opkele/types.h index ffb9afb..f63bf5d 100644 --- a/include/opkele/types.h +++ b/include/opkele/types.h @@ -109,72 +109,81 @@ namespace opkele { /** * check whether the association is expired. * @return true if expired */ virtual bool is_expired() const = 0; }; /** * the shared_ptr<> for association_t object type */ typedef tr1mem::shared_ptr<association_t> assoc_t; - class basic_openid_message { + class basic_fields { public: - typedef list<string> fields_t; typedef util::forward_iterator_proxy< string,const string&,const string* > fields_iterator; - basic_openid_message() { } - virtual ~basic_openid_message() { } - basic_openid_message(const basic_openid_message& x); - void copy_to(basic_openid_message& x) const; - void append_to(basic_openid_message& x) const; + basic_fields() { } + virtual ~basic_fields() { } + basic_fields(const basic_fields& x); + void copy_to(basic_fields& x) const; + void append_to(basic_fields& x) const; virtual bool has_field(const string& n) const = 0; virtual const string& get_field(const string& n) const = 0; - virtual bool has_ns(const string& uri) const; - virtual string get_ns(const string& uri) const; - virtual fields_iterator fields_begin() const = 0; virtual fields_iterator fields_end() const = 0; - virtual string append_query(const string& url,const char *pfx="openid.") const; - virtual string query_string(const char *pfx="openid.") const; - + virtual string append_query(const string& url,const char *pfx=0) const; + virtual string query_string(const char *pfx=0) const; virtual void reset_fields(); virtual void set_field(const string& n,const string& v); virtual void reset_field(const string& n); + }; + + class basic_openid_message : public basic_fields { + public: + + basic_openid_message() { } + basic_openid_message(const basic_openid_message& x); + + virtual bool has_ns(const string& uri) const; + virtual string get_ns(const string& uri) const; + + virtual string append_query(const string& url,const char *pfx="openid.") const { + return basic_fields::append_query(url,pfx); } + virtual string query_string(const char *pfx="openid.") const { + return basic_fields::query_string(pfx); } + virtual void from_keyvalues(const string& kv); virtual void to_keyvalues(ostream& o) const; virtual void to_htmlhiddens(ostream& o,const char* pfx=0) const; void add_to_signed(const string& fields); string find_ns(const string& uri,const char *pfx) const; string allocate_ns(const string& uri,const char *pfx); }; class openid_message_t : public basic_openid_message, public map<string,string> { public: openid_message_t() { } openid_message_t(const basic_openid_message& x) : basic_openid_message(x) { } - void copy_to(basic_openid_message& x) const; - bool has_field(const string& n) const; const string& get_field(const string& n) const; virtual fields_iterator fields_begin() const; virtual fields_iterator fields_end() const; void reset_fields(); void set_field(const string& n,const string& v); void reset_field(const string& n); }; /** * request/response parameters map |