-rw-r--r-- | include/opkele/types.h | 2 | ||||
-rw-r--r-- | lib/openid_message.cc | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/include/opkele/types.h b/include/opkele/types.h index a3b657d..1f48362 100644 --- a/include/opkele/types.h +++ b/include/opkele/types.h | |||
@@ -137,33 +137,33 @@ namespace opkele { | |||
137 | virtual string get_ns(const string& uri) const; | 137 | virtual string get_ns(const string& uri) const; |
138 | 138 | ||
139 | virtual fields_iterator fields_begin() const = 0; | 139 | virtual fields_iterator fields_begin() const = 0; |
140 | virtual fields_iterator fields_end() const = 0; | 140 | virtual fields_iterator fields_end() const = 0; |
141 | 141 | ||
142 | virtual string append_query(const string& url) const; | 142 | virtual string append_query(const string& url) const; |
143 | virtual string query_string() const; | 143 | virtual string query_string() const; |
144 | 144 | ||
145 | 145 | ||
146 | virtual void reset_fields(); | 146 | virtual void reset_fields(); |
147 | virtual void set_field(const string& n,const string& v); | 147 | virtual void set_field(const string& n,const string& v); |
148 | virtual void reset_field(const string& n); | 148 | virtual void reset_field(const string& n); |
149 | 149 | ||
150 | virtual void from_keyvalues(const string& kv); | 150 | virtual void from_keyvalues(const string& kv); |
151 | virtual void to_keyvalues(ostream& o) const; | 151 | virtual void to_keyvalues(ostream& o) const; |
152 | 152 | ||
153 | virtual void to_htmlhiddens(ostream& o) const; | 153 | virtual void to_htmlhiddens(ostream& o,const char* pfx=0) const; |
154 | 154 | ||
155 | void add_to_signed(const string& fields); | 155 | void add_to_signed(const string& fields); |
156 | string find_ns(const string& uri,const char *pfx) const; | 156 | string find_ns(const string& uri,const char *pfx) const; |
157 | string allocate_ns(const string& uri,const char *pfx); | 157 | string allocate_ns(const string& uri,const char *pfx); |
158 | }; | 158 | }; |
159 | 159 | ||
160 | class openid_message_t : public basic_openid_message, public map<string,string> { | 160 | class openid_message_t : public basic_openid_message, public map<string,string> { |
161 | public: | 161 | public: |
162 | openid_message_t() { } | 162 | openid_message_t() { } |
163 | openid_message_t(const basic_openid_message& x) | 163 | openid_message_t(const basic_openid_message& x) |
164 | : basic_openid_message(x) { } | 164 | : basic_openid_message(x) { } |
165 | 165 | ||
166 | void copy_to(basic_openid_message& x) const; | 166 | void copy_to(basic_openid_message& x) const; |
167 | 167 | ||
168 | bool has_field(const string& n) const; | 168 | bool has_field(const string& n) const; |
169 | const string& get_field(const string& n) const; | 169 | const string& get_field(const string& n) const; |
diff --git a/lib/openid_message.cc b/lib/openid_message.cc index 521ea85..588bd62 100644 --- a/lib/openid_message.cc +++ b/lib/openid_message.cc | |||
@@ -150,46 +150,50 @@ namespace opkele { | |||
150 | __om_kv_outputter(const basic_openid_message& m,ostream& s) | 150 | __om_kv_outputter(const basic_openid_message& m,ostream& s) |
151 | : om(m), os(s) { } | 151 | : om(m), os(s) { } |
152 | 152 | ||
153 | result_type operator()(argument_type f) { | 153 | result_type operator()(argument_type f) { |
154 | os << f << ':' << om.get_field(f) << '\n'; | 154 | os << f << ':' << om.get_field(f) << '\n'; |
155 | } | 155 | } |
156 | }; | 156 | }; |
157 | 157 | ||
158 | void basic_openid_message::to_keyvalues(ostream& o) const { | 158 | void basic_openid_message::to_keyvalues(ostream& o) const { |
159 | for_each(fields_begin(),fields_end(),__om_kv_outputter(*this,o)); | 159 | for_each(fields_begin(),fields_end(),__om_kv_outputter(*this,o)); |
160 | } | 160 | } |
161 | 161 | ||
162 | struct __om_html_outputter : public unary_function<const string&,void> { | 162 | struct __om_html_outputter : public unary_function<const string&,void> { |
163 | public: | 163 | public: |
164 | const basic_openid_message& om; | 164 | const basic_openid_message& om; |
165 | ostream& os; | 165 | ostream& os; |
166 | const char *pfx; | ||
166 | 167 | ||
167 | __om_html_outputter(const basic_openid_message& m,ostream& s) | 168 | __om_html_outputter(const basic_openid_message& m,ostream& s,const char *p=0) |
168 | : om(m), os(s) { } | 169 | : om(m), os(s), pfx(p) { } |
169 | 170 | ||
170 | result_type operator()(argument_type f) { | 171 | result_type operator()(argument_type f) { |
171 | os << | 172 | os << |
172 | "<input type=\"hidden\"" | 173 | "<input type=\"hidden\"" |
173 | " name=\"" << util::attr_escape(f) << "\"" | 174 | " name=\""; |
175 | if(pfx) | ||
176 | os << util::attr_escape(pfx); | ||
177 | os << util::attr_escape(f) << "\"" | ||
174 | " value=\"" << util::attr_escape(om.get_field(f)) << "\" />"; | 178 | " value=\"" << util::attr_escape(om.get_field(f)) << "\" />"; |
175 | } | 179 | } |
176 | }; | 180 | }; |
177 | 181 | ||
178 | void basic_openid_message::to_htmlhiddens(ostream& o) const { | 182 | void basic_openid_message::to_htmlhiddens(ostream& o,const char* pfx) const { |
179 | for_each(fields_begin(),fields_end(),__om_html_outputter(*this,o)); | 183 | for_each(fields_begin(),fields_end(),__om_html_outputter(*this,o,pfx)); |
180 | } | 184 | } |
181 | 185 | ||
182 | void basic_openid_message::add_to_signed(const string& fields) { | 186 | void basic_openid_message::add_to_signed(const string& fields) { |
183 | string::size_type fnc = fields.find_first_not_of(","); | 187 | string::size_type fnc = fields.find_first_not_of(","); |
184 | if(fnc==string::npos) | 188 | if(fnc==string::npos) |
185 | throw bad_input(OPKELE_CP_ "Trying to add nothing in particular to the list of signed fields"); | 189 | throw bad_input(OPKELE_CP_ "Trying to add nothing in particular to the list of signed fields"); |
186 | string signeds; | 190 | string signeds; |
187 | try { | 191 | try { |
188 | signeds = get_field("signed"); | 192 | signeds = get_field("signed"); |
189 | string::size_type lnc = signeds.find_last_not_of(","); | 193 | string::size_type lnc = signeds.find_last_not_of(","); |
190 | if(lnc==string::npos) | 194 | if(lnc==string::npos) |
191 | signeds.assign(fields,fnc,fields.size()-fnc); | 195 | signeds.assign(fields,fnc,fields.size()-fnc); |
192 | else{ | 196 | else{ |
193 | string::size_type ss = signeds.size(); | 197 | string::size_type ss = signeds.size(); |
194 | if(lnc==(ss-1)) { | 198 | if(lnc==(ss-1)) { |
195 | signeds+= ','; | 199 | signeds+= ','; |