author | Michael Krelin <hacker@klever.net> | 2008-03-02 20:57:57 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2008-03-02 20:57:57 (UTC) |
commit | f6482fb9003e4953f838ba4ef2c110190355622f (patch) (side-by-side diff) | |
tree | 978ff6a8647c008cb3726c604b0749edb622171c | |
parent | da3f84153be2a93da7ffc49af33b29b9725fac38 (diff) | |
download | libopkele-f6482fb9003e4953f838ba4ef2c110190355622f.zip libopkele-f6482fb9003e4953f838ba4ef2c110190355622f.tar.gz libopkele-f6482fb9003e4953f838ba4ef2c110190355622f.tar.bz2 |
reinstated prefix handling in query building
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | include/opkele/types.h | 4 | ||||
-rw-r--r-- | lib/openid_message.cc | 20 |
2 files changed, 13 insertions, 11 deletions
diff --git a/include/opkele/types.h b/include/opkele/types.h index 1fab869..af7fb1a 100644 --- a/include/opkele/types.h +++ b/include/opkele/types.h @@ -126,34 +126,34 @@ namespace opkele { > 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; 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; - virtual string query_string() const; + virtual string append_query(const string& url,const char *pfx="openid.") const; + virtual string query_string(const char *pfx="openid.") const; virtual void reset_fields(); virtual void set_field(const string& n,const string& v); virtual void reset_field(const string& n); 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); }; diff --git a/lib/openid_message.cc b/lib/openid_message.cc index 75e59b3..4b9179b 100644 --- a/lib/openid_message.cc +++ b/lib/openid_message.cc @@ -54,65 +54,67 @@ namespace opkele { return !(i==ei); } string basic_openid_message::get_ns(const string& uri) const { fields_iterator ei = fields_end(); fields_iterator i = find_if(fields_begin(),fields_end(), __om_ns_finder(*this,uri)); if(i==ei) 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(string& r,const basic_openid_message& m) - : om(m), first(true), rv(r) { + __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(string& r,const basic_openid_message& m,const string& u) - : om(m), first(true), rv(r) { + __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 += '&'; - rv += "openid."; rv+= f; + 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 { + string basic_openid_message::append_query(const string& url,const char *pfx) const { string rv; - return __om_query_builder(rv,*this,url).rv; + return __om_query_builder(pfx,rv,*this,url).rv; } - string basic_openid_message::query_string() const { + string basic_openid_message::query_string(const char *pfx) const { string rv; - return __om_query_builder(rv,*this).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) { |