-rw-r--r-- | lib/basic_rp.cc | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/lib/basic_rp.cc b/lib/basic_rp.cc index 2da8416..a884583 100644 --- a/lib/basic_rp.cc +++ b/lib/basic_rp.cc | |||
@@ -185,130 +185,113 @@ namespace opkele { | |||
185 | if(eq==string::npos || eq>am) { | 185 | if(eq==string::npos || eq>am) { |
186 | p[""] = u.substr(q,eq-q); | 186 | p[""] = u.substr(q,eq-q); |
187 | }else{ | 187 | }else{ |
188 | p[u.substr(q,eq-q)] = u.substr(eq+1,am-eq-1); | 188 | p[u.substr(q,eq-q)] = u.substr(eq+1,am-eq-1); |
189 | } | 189 | } |
190 | q = ++am; | 190 | q = ++am; |
191 | } | 191 | } |
192 | } | 192 | } |
193 | } | 193 | } |
194 | 194 | ||
195 | void basic_RP::id_res(const basic_openid_message& om,extension_t *ext) { | 195 | void basic_RP::id_res(const basic_openid_message& om,extension_t *ext) { |
196 | bool o2 = om.has_field("ns") | 196 | bool o2 = om.has_field("ns") |
197 | && om.get_field("ns")==OIURI_OPENID20; | 197 | && om.get_field("ns")==OIURI_OPENID20; |
198 | if( (!o2) && om.has_field("user_setup_url")) | 198 | if( (!o2) && om.has_field("user_setup_url")) |
199 | throw id_res_setup(OPKELE_CP_ "assertion failed, setup url provided", | 199 | throw id_res_setup(OPKELE_CP_ "assertion failed, setup url provided", |
200 | om.get_field("user_setup_url")); | 200 | om.get_field("user_setup_url")); |
201 | string m = om.get_field("mode"); | 201 | string m = om.get_field("mode"); |
202 | if(o2 && m=="setup_needed") | 202 | if(o2 && m=="setup_needed") |
203 | throw id_res_setup(OPKELE_CP_ "setup needed, no setup url provided"); | 203 | throw id_res_setup(OPKELE_CP_ "setup needed, no setup url provided"); |
204 | if(m=="cancel") | 204 | if(m=="cancel") |
205 | throw id_res_cancel(OPKELE_CP_ "authentication cancelled"); | 205 | throw id_res_cancel(OPKELE_CP_ "authentication cancelled"); |
206 | bool go_dumb=false; | 206 | bool go_dumb=false; |
207 | try { | 207 | try { |
208 | string OP = o2 | 208 | string OP = o2 |
209 | ?om.get_field("op_endpoint") | 209 | ?om.get_field("op_endpoint") |
210 | :get_endpoint().uri; | 210 | :get_endpoint().uri; |
211 | assoc_t assoc = retrieve_assoc( | 211 | assoc_t assoc = retrieve_assoc( |
212 | OP,om.get_field("assoc_handle")); | 212 | OP,om.get_field("assoc_handle")); |
213 | if(om.get_field("sig")!=util::base64_signature(assoc,om)) | 213 | if(om.get_field("sig")!=util::base64_signature(assoc,om)) |
214 | throw id_res_mismatch(OPKELE_CP_ "signature mismatch"); | 214 | throw id_res_mismatch(OPKELE_CP_ "signature mismatch"); |
215 | }catch(dumb_RP& drp) { | 215 | }catch(dumb_RP& drp) { |
216 | go_dumb=true; | 216 | go_dumb=true; |
217 | }catch(failed_lookup& e) { | 217 | }catch(failed_lookup& e) { |
218 | go_dumb=true; | 218 | go_dumb=true; |
219 | } OPKELE_RETHROW | 219 | } OPKELE_RETHROW |
220 | if(go_dumb) { | 220 | if(go_dumb) { |
221 | try { | 221 | try { |
222 | string OP = o2 | 222 | string OP = o2 |
223 | ?om.get_field("op_endpoint") | 223 | ?om.get_field("op_endpoint") |
224 | :get_endpoint().uri; | 224 | :get_endpoint().uri; |
225 | check_authentication(OP,om); | 225 | check_authentication(OP,om); |
226 | }catch(failed_check_authentication& fca) { | 226 | }catch(failed_check_authentication& fca) { |
227 | throw id_res_failed(OPKELE_CP_ "failed to check_authentication()"); | 227 | throw id_res_failed(OPKELE_CP_ "failed to check_authentication()"); |
228 | } OPKELE_RETHROW | 228 | } OPKELE_RETHROW |
229 | } | 229 | } |
230 | signed_part_message_proxy signeds(om); | 230 | signed_part_message_proxy signeds(om); |
231 | if(o2) { | 231 | if(o2) { |
232 | check_nonce(om.get_field("op_endpoint"), | 232 | check_nonce(om.get_field("op_endpoint"), |
233 | om.get_field("response_nonce")); | 233 | om.get_field("response_nonce")); |
234 | static const char *mustsign[] = { | 234 | static const char *mustsign[] = { |
235 | "op_endpoint", "return_to", "response_nonce", "assoc_handle", | 235 | "op_endpoint", "return_to", "response_nonce", "assoc_handle", |
236 | "claimed_id", "identity" }; | 236 | "claimed_id", "identity" }; |
237 | for(int ms=0;ms<(sizeof(mustsign)/sizeof(*mustsign));++ms) { | 237 | for(int ms=0;ms<(sizeof(mustsign)/sizeof(*mustsign));++ms) { |
238 | if(om.has_field(mustsign[ms]) && !signeds.has_field(mustsign[ms])) | 238 | if(om.has_field(mustsign[ms]) && !signeds.has_field(mustsign[ms])) |
239 | throw bad_input(OPKELE_CP_ string("Field '")+mustsign[ms]+"' is not signed against the specs"); | 239 | throw bad_input(OPKELE_CP_ string("Field '")+mustsign[ms]+"' is not signed against the specs"); |
240 | } | 240 | } |
241 | if( ( | 241 | if( ( |
242 | (om.has_field("claimed_id")?1:0) | 242 | (om.has_field("claimed_id")?1:0) |
243 | ^ | 243 | ^ |
244 | (om.has_field("identity")?1:0) | 244 | (om.has_field("identity")?1:0) |
245 | )&1 ) | 245 | )&1 ) |
246 | throw bad_input(OPKELE_CP_ "claimed_id and identity must be either both present or both absent"); | 246 | throw bad_input(OPKELE_CP_ "claimed_id and identity must be either both present or both absent"); |
247 | 247 | ||
248 | string turl = util::rfc_3986_normalize_uri(get_this_url()); | 248 | string turl = util::rfc_3986_normalize_uri(get_this_url()); |
249 | util::strip_uri_fragment_part(turl); | 249 | util::strip_uri_fragment_part(turl); |
250 | string rurl = util::rfc_3986_normalize_uri(om.get_field("return_to")); | 250 | string rurl = util::rfc_3986_normalize_uri(om.get_field("return_to")); |
251 | util::strip_uri_fragment_part(rurl); | 251 | util::strip_uri_fragment_part(rurl); |
252 | string::size_type | 252 | string::size_type |
253 | tq = turl.find('?'), rq = rurl.find('?'); | 253 | tq = turl.find('?'), rq = rurl.find('?'); |
254 | if( | 254 | if( |
255 | ((tq==string::npos)?turl:turl.substr(0,tq)) | 255 | ((tq==string::npos)?turl:turl.substr(0,tq)) |
256 | != | 256 | != |
257 | ((rq==string::npos)?rurl:rurl.substr(0,rq)) | 257 | ((rq==string::npos)?rurl:rurl.substr(0,rq)) |
258 | ) | 258 | ) |
259 | throw id_res_bad_return_to(OPKELE_CP_ "return_to url doesn't match request url"); | 259 | throw id_res_bad_return_to(OPKELE_CP_ "return_to url doesn't match request url"); |
260 | map<string,string> tp; parse_query(turl,tq,tp); | 260 | map<string,string> tp; parse_query(turl,tq,tp); |
261 | map<string,string> rp; parse_query(rurl,rq,rp); | 261 | map<string,string> rp; parse_query(rurl,rq,rp); |
262 | for(map<string,string>::const_iterator rpi=rp.begin();rpi!=rp.end();++rpi) { | 262 | for(map<string,string>::const_iterator rpi=rp.begin();rpi!=rp.end();++rpi) { |
263 | map<string,string>::const_iterator tpi = tp.find(rpi->first); | 263 | map<string,string>::const_iterator tpi = tp.find(rpi->first); |
264 | if(tpi==tp.end()) | 264 | if(tpi==tp.end()) |
265 | throw id_res_bad_return_to(OPKELE_CP_ string("Parameter '")+rpi->first+"' from return_to is missing from the request"); | 265 | throw id_res_bad_return_to(OPKELE_CP_ string("Parameter '")+rpi->first+"' from return_to is missing from the request"); |
266 | if(tpi->second!=rpi->second) | 266 | if(tpi->second!=rpi->second) |
267 | throw id_res_bad_return_to(OPKELE_CP_ string("Parameter '")+rpi->first+"' from return_to doesn't matche the request"); | 267 | throw id_res_bad_return_to(OPKELE_CP_ string("Parameter '")+rpi->first+"' from return_to doesn't matche the request"); |
268 | } | 268 | } |
269 | 269 | ||
270 | if(om.has_field("claimed_id")) { | 270 | if(om.has_field("claimed_id")) { |
271 | verify_OP( | 271 | verify_OP( |
272 | om.get_field("op_endpoint"), | 272 | om.get_field("op_endpoint"), |
273 | om.get_field("claimed_id"), | 273 | om.get_field("claimed_id"), |
274 | om.get_field("identity") ); | 274 | om.get_field("identity") ); |
275 | } | 275 | } |
276 | 276 | ||
277 | } | 277 | } |
278 | if(ext) ext->id_res_hook(om,signeds); | 278 | if(ext) ext->id_res_hook(om,signeds); |
279 | } | 279 | } |
280 | 280 | ||
281 | class check_auth_message_proxy : public basic_openid_message { | ||
282 | public: | ||
283 | const basic_openid_message& x; | ||
284 | |||
285 | check_auth_message_proxy(const basic_openid_message& xx) : x(xx) { } | ||
286 | |||
287 | bool has_field(const string& n) const { return x.has_field(n); } | ||
288 | const string& get_field(const string& n) const { | ||
289 | static const string checkauthmode="check_authentication"; | ||
290 | return (n=="mode")?checkauthmode:x.get_field(n); } | ||
291 | bool has_ns(const string& uri) const {return x.has_ns(uri); } | ||
292 | string get_ns(const string& uri) const { return x.get_ns(uri); } | ||
293 | fields_iterator fields_begin() const { | ||
294 | return x.fields_begin(); } | ||
295 | fields_iterator fields_end() const { | ||
296 | return x.fields_end(); } | ||
297 | }; | ||
298 | |||
299 | void basic_RP::check_authentication(const string& OP, | 281 | void basic_RP::check_authentication(const string& OP, |
300 | const basic_openid_message& om){ | 282 | const basic_openid_message& om){ |
301 | openid_message_t res; | 283 | openid_message_t res; |
302 | direct_request(res,check_auth_message_proxy(om),OP); | 284 | static const string checkauthmode = "check_authentication"; |
285 | direct_request(res,util::change_mode_message_proxy(om,checkauthmode),OP); | ||
303 | if(res.has_field("is_valid")) { | 286 | if(res.has_field("is_valid")) { |
304 | if(res.get_field("is_valid")=="true") { | 287 | if(res.get_field("is_valid")=="true") { |
305 | if(res.has_field("invalidate_handle")) | 288 | if(res.has_field("invalidate_handle")) |
306 | invalidate_assoc(OP,res.get_field("invalidate_handle")); | 289 | invalidate_assoc(OP,res.get_field("invalidate_handle")); |
307 | return; | 290 | return; |
308 | } | 291 | } |
309 | } | 292 | } |
310 | throw failed_check_authentication( | 293 | throw failed_check_authentication( |
311 | OPKELE_CP_ "failed to verify response"); | 294 | OPKELE_CP_ "failed to verify response"); |
312 | } | 295 | } |
313 | 296 | ||
314 | } | 297 | } |