reinstated prefix handling in query building

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

1 files changed, 11 insertions, 9 deletions

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
@@ -38,97 +38,99 @@ namespace opkele {
 	    const string& uri;
 
 	    __om_ns_finder(const basic_openid_message& m,
 		    const string& u) : om(m), uri(u) { }
 
 	    result_type operator()(argument_type f) {
 		return
 		    (!strncmp(f.c_str(),"ns.",sizeof("ns.")-1))
 			&& om.get_field(f)==uri ;
 	    }
     };
 
     bool basic_openid_message::has_ns(const string& uri) const {
 	fields_iterator ei = fields_end();
 	fields_iterator i = find_if(fields_begin(),fields_end(),
 		__om_ns_finder(*this,uri));
 	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) {
 	    string::size_type co = kv.find(':',p);
 	    if(co==string::npos)
 		break;
 #ifndef POSTELS_LAW
 	    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)));
 	    p = nl+1;
 #else /* POSTELS_LAW */
 	    string::size_type lb = kv.find_first_of("\r\n",co+1);
 	    if(lb==string::npos) {
 		set_field(kv.substr(p,co-p),kv.substr(co+1));
 		break;
 	    }