-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 | |||
@@ -105,97 +105,97 @@ namespace opkele { | |||
105 | * check whether the association is stateless. | 105 | * check whether the association is stateless. |
106 | * @return true if stateless | 106 | * @return true if stateless |
107 | */ | 107 | */ |
108 | virtual bool stateless() const = 0; | 108 | virtual bool stateless() const = 0; |
109 | /** | 109 | /** |
110 | * check whether the association is expired. | 110 | * check whether the association is expired. |
111 | * @return true if expired | 111 | * @return true if expired |
112 | */ | 112 | */ |
113 | virtual bool is_expired() const = 0; | 113 | virtual bool is_expired() const = 0; |
114 | }; | 114 | }; |
115 | 115 | ||
116 | /** | 116 | /** |
117 | * the shared_ptr<> for association_t object type | 117 | * the shared_ptr<> for association_t object type |
118 | */ | 118 | */ |
119 | typedef tr1mem::shared_ptr<association_t> assoc_t; | 119 | typedef tr1mem::shared_ptr<association_t> assoc_t; |
120 | 120 | ||
121 | class basic_openid_message { | 121 | class basic_openid_message { |
122 | public: | 122 | public: |
123 | typedef list<string> fields_t; | 123 | typedef list<string> fields_t; |
124 | typedef util::forward_iterator_proxy< | 124 | typedef util::forward_iterator_proxy< |
125 | string,const string&,const string* | 125 | string,const string&,const string* |
126 | > fields_iterator; | 126 | > fields_iterator; |
127 | 127 | ||
128 | basic_openid_message() { } | 128 | basic_openid_message() { } |
129 | virtual ~basic_openid_message() { } | 129 | virtual ~basic_openid_message() { } |
130 | basic_openid_message(const basic_openid_message& x); | 130 | basic_openid_message(const basic_openid_message& x); |
131 | void copy_to(basic_openid_message& x) const; | 131 | void copy_to(basic_openid_message& x) const; |
132 | 132 | ||
133 | virtual bool has_field(const string& n) const = 0; | 133 | virtual bool has_field(const string& n) const = 0; |
134 | virtual const string& get_field(const string& n) const = 0; | 134 | virtual const string& get_field(const string& n) const = 0; |
135 | 135 | ||
136 | virtual bool has_ns(const string& uri) const; | 136 | virtual bool has_ns(const string& uri) const; |
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; |
170 | virtual fields_iterator fields_begin() const; | 170 | virtual fields_iterator fields_begin() const; |
171 | virtual fields_iterator fields_end() const; | 171 | virtual fields_iterator fields_end() const; |
172 | 172 | ||
173 | void reset_fields(); | 173 | void reset_fields(); |
174 | void set_field(const string& n,const string& v); | 174 | void set_field(const string& n,const string& v); |
175 | void reset_field(const string& n); | 175 | void reset_field(const string& n); |
176 | }; | 176 | }; |
177 | 177 | ||
178 | /** | 178 | /** |
179 | * request/response parameters map | 179 | * request/response parameters map |
180 | */ | 180 | */ |
181 | class params_t : public openid_message_t { | 181 | class params_t : public openid_message_t { |
182 | public: | 182 | public: |
183 | 183 | ||
184 | /** | 184 | /** |
185 | * check whether the parameter is present. | 185 | * check whether the parameter is present. |
186 | * @param n the parameter name | 186 | * @param n the parameter name |
187 | * @return true if yes | 187 | * @return true if yes |
188 | */ | 188 | */ |
189 | bool has_param(const string& n) const { | 189 | bool has_param(const string& n) const { |
190 | return has_field(n); } | 190 | return has_field(n); } |
191 | /** | 191 | /** |
192 | * retrieve the parameter (const version) | 192 | * retrieve the parameter (const version) |
193 | * @param n the parameter name | 193 | * @param n the parameter name |
194 | * @return the parameter value | 194 | * @return the parameter value |
195 | * @throw failed_lookup if there is no such parameter | 195 | * @throw failed_lookup if there is no such parameter |
196 | */ | 196 | */ |
197 | const string& get_param(const string& n) const { | 197 | const string& get_param(const string& n) const { |
198 | return get_field(n); } | 198 | return get_field(n); } |
199 | 199 | ||
200 | /** | 200 | /** |
201 | * parse the OpenID key/value data. | 201 | * parse the OpenID key/value data. |
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 | |||
@@ -118,110 +118,114 @@ namespace opkele { | |||
118 | while(true) { | 118 | while(true) { |
119 | string::size_type co = kv.find(':',p); | 119 | string::size_type co = kv.find(':',p); |
120 | if(co==string::npos) | 120 | if(co==string::npos) |
121 | break; | 121 | break; |
122 | #ifndef POSTELS_LAW | 122 | #ifndef POSTELS_LAW |
123 | string::size_type nl = kv.find('\n',co+1); | 123 | string::size_type nl = kv.find('\n',co+1); |
124 | if(nl==string::npos) | 124 | if(nl==string::npos) |
125 | throw bad_input(OPKELE_CP_ "malformed input"); | 125 | throw bad_input(OPKELE_CP_ "malformed input"); |
126 | if(nl>co) | 126 | if(nl>co) |
127 | insert(value_type(kv.substr(p,co-p),kv.substr(co+1,nl-co-1))); | 127 | insert(value_type(kv.substr(p,co-p),kv.substr(co+1,nl-co-1))); |
128 | p = nl+1; | 128 | p = nl+1; |
129 | #else /* POSTELS_LAW */ | 129 | #else /* POSTELS_LAW */ |
130 | string::size_type lb = kv.find_first_of("\r\n",co+1); | 130 | string::size_type lb = kv.find_first_of("\r\n",co+1); |
131 | if(lb==string::npos) { | 131 | if(lb==string::npos) { |
132 | set_field(kv.substr(p,co-p),kv.substr(co+1)); | 132 | set_field(kv.substr(p,co-p),kv.substr(co+1)); |
133 | break; | 133 | break; |
134 | } | 134 | } |
135 | if(lb>co) | 135 | if(lb>co) |
136 | set_field(kv.substr(p,co-p),kv.substr(co+1,lb-co-1)); | 136 | set_field(kv.substr(p,co-p),kv.substr(co+1,lb-co-1)); |
137 | string::size_type nolb = kv.find_first_not_of("\r\n",lb); | 137 | string::size_type nolb = kv.find_first_not_of("\r\n",lb); |
138 | if(nolb==string::npos) | 138 | if(nolb==string::npos) |
139 | break; | 139 | break; |
140 | p = nolb; | 140 | p = nolb; |
141 | #endif /* POSTELS_LAW */ | 141 | #endif /* POSTELS_LAW */ |
142 | } | 142 | } |
143 | } | 143 | } |
144 | 144 | ||
145 | struct __om_kv_outputter : public unary_function<const string&,void> { | 145 | struct __om_kv_outputter : public unary_function<const string&,void> { |
146 | public: | 146 | public: |
147 | const basic_openid_message& om; | 147 | const basic_openid_message& om; |
148 | ostream& os; | 148 | ostream& os; |
149 | 149 | ||
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+= ','; |
196 | signeds.append(fields,fnc,fields.size()-fnc); | 200 | signeds.append(fields,fnc,fields.size()-fnc); |
197 | }else{ | 201 | }else{ |
198 | if(lnc<(ss-2)) | 202 | if(lnc<(ss-2)) |
199 | signeds.replace(lnc+2,ss-lnc-2, | 203 | signeds.replace(lnc+2,ss-lnc-2, |
200 | fields,fnc,fields.size()-fnc); | 204 | fields,fnc,fields.size()-fnc); |
201 | else | 205 | else |
202 | signeds.append(fields,fnc,fields.size()-fnc); | 206 | signeds.append(fields,fnc,fields.size()-fnc); |
203 | } | 207 | } |
204 | } | 208 | } |
205 | }catch(failed_lookup&) { | 209 | }catch(failed_lookup&) { |
206 | signeds.assign(fields,fnc,fields.size()-fnc); | 210 | signeds.assign(fields,fnc,fields.size()-fnc); |
207 | } | 211 | } |
208 | set_field("signed",signeds); | 212 | set_field("signed",signeds); |
209 | } | 213 | } |
210 | 214 | ||
211 | string basic_openid_message::find_ns(const string& uri,const char *pfx) const { | 215 | string basic_openid_message::find_ns(const string& uri,const char *pfx) const { |
212 | if(has_field("ns")) | 216 | if(has_field("ns")) |
213 | return get_ns(uri); | 217 | return get_ns(uri); |
214 | return pfx; | 218 | return pfx; |
215 | } | 219 | } |
216 | string basic_openid_message::allocate_ns(const string& uri,const char *pfx) { | 220 | string basic_openid_message::allocate_ns(const string& uri,const char *pfx) { |
217 | if(!has_field("ns")) | 221 | if(!has_field("ns")) |
218 | return pfx; | 222 | return pfx; |
219 | if(has_ns(uri)) | 223 | if(has_ns(uri)) |
220 | throw bad_input(OPKELE_CP_ "OpenID message already contains namespace"); | 224 | throw bad_input(OPKELE_CP_ "OpenID message already contains namespace"); |
221 | string rv = pfx; | 225 | string rv = pfx; |
222 | if(has_field("ns."+rv)) { | 226 | if(has_field("ns."+rv)) { |
223 | string::reference c=rv[rv.length()]; | 227 | string::reference c=rv[rv.length()]; |
224 | for(c='a';c<='z' && has_field("ns."+rv);++c); | 228 | for(c='a';c<='z' && has_field("ns."+rv);++c); |
225 | if(c=='z') | 229 | if(c=='z') |
226 | throw exception(OPKELE_CP_ "Failed to allocate namespace"); | 230 | throw exception(OPKELE_CP_ "Failed to allocate namespace"); |
227 | } | 231 | } |