2 files changed, 7 insertions, 3 deletions
diff --git a/include/opkele/types.h b/include/opkele/types.h
index af7fb1a..ffb9afb 100644
--- a/include/opkele/types.h
+++ b/include/opkele/types.h
@@ -68,128 +68,129 @@ namespace opkele {
            void from_base64(const string& b64);
    };
    /**
     * Interface to the association.
     */
    class association_t {
        public:
            virtual ~association_t() { }
            /**
             * retrieve the server with which association was established.
             * @return server name
             */
            virtual string server() const = 0;
            /**
             * retrieve the association handle.
             * @return handle
             */
            virtual string handle() const = 0;
            /**
             * retrieve the association type.
             * @return association type
             */
            virtual string assoc_type() const = 0;
            /**
             * retrieve the association secret.
             * @return association secret
             */
            virtual secret_t secret() const = 0; 
            /**
             * retrieve the number of seconds the association expires in.
             * @return seconds till expiration
             */
            virtual int expires_in() const = 0;
            /**
             * check whether the association is stateless.
             * @return true if stateless
             */
            virtual bool stateless() const = 0;
            /**
             * 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 {
        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;
            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 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);
    };
    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
     */
    class params_t : public openid_message_t {
        public:
            /**
             * check whether the parameter is present.
             * @param n the parameter name
             * @return true if yes
             */
            bool has_param(const string& n) const {
                return has_field(n); }
            /**
             * retrieve the parameter (const version)
             * @param n the parameter name
             * @return the parameter value
             * @throw failed_lookup if there is no such parameter
diff --git a/lib/openid_message.cc b/lib/openid_message.cc
index 4b9179b..e244f43 100644
--- a/lib/openid_message.cc
+++ b/lib/openid_message.cc
@@ -1,94 +1,97 @@
 #include <cassert>
 #include <opkele/types.h>
 #include <opkele/exception.h>
 #include <opkele/util.h>
 #include <opkele/debug.h>
 #include "config.h"
 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) {
+                : from(f), to(t) { }
-                    to.reset_fields();
-                }
            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;
            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(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));