summaryrefslogtreecommitdiffabout
path: root/lib/basic_rp.cc
Unidiff
Diffstat (limited to 'lib/basic_rp.cc') (more/less context) (ignore whitespace changes)
-rw-r--r--lib/basic_rp.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/basic_rp.cc b/lib/basic_rp.cc
index 3cad71c..8125aa7 100644
--- a/lib/basic_rp.cc
+++ b/lib/basic_rp.cc
@@ -197,49 +197,49 @@ namespace opkele {
197 while(q<l) { 197 while(q<l) {
198 string::size_type eq = u.find('=',q); 198 string::size_type eq = u.find('=',q);
199 string::size_type am = u.find('&',q); 199 string::size_type am = u.find('&',q);
200 if(am==string::npos) { 200 if(am==string::npos) {
201 if(eq==string::npos) { 201 if(eq==string::npos) {
202 p[""] = u.substr(q); 202 p[""] = u.substr(q);
203 }else{ 203 }else{
204 p[u.substr(q,eq-q)] = u.substr(eq+1); 204 p[u.substr(q,eq-q)] = u.substr(eq+1);
205 } 205 }
206 break; 206 break;
207 }else{ 207 }else{
208 if(eq==string::npos || eq>am) { 208 if(eq==string::npos || eq>am) {
209 p[""] = u.substr(q,eq-q); 209 p[""] = u.substr(q,eq-q);
210 }else{ 210 }else{
211 p[u.substr(q,eq-q)] = u.substr(eq+1,am-eq-1); 211 p[u.substr(q,eq-q)] = u.substr(eq+1,am-eq-1);
212 } 212 }
213 q = ++am; 213 q = ++am;
214 } 214 }
215 } 215 }
216 } 216 }
217 217
218 void basic_RP::id_res(const basic_openid_message& om,extension_t *ext) { 218 void basic_RP::id_res(const basic_openid_message& om,extension_t *ext) {
219 reset_vars(); 219 reset_vars();
220 bool o2 = om.has_field("ns") 220 bool o2 = om.has_field("ns")
221 && om.get_field("ns")==OIURI_OPENID20; 221 && om.get_field("ns")==OIURI_OPENID20 && !om.get_field("op_endpoint").empty();
222 if( (!o2) && om.has_field("user_setup_url")) 222 if( (!o2) && om.has_field("user_setup_url"))
223 throw id_res_setup(OPKELE_CP_ "assertion failed, setup url provided", 223 throw id_res_setup(OPKELE_CP_ "assertion failed, setup url provided",
224 om.get_field("user_setup_url")); 224 om.get_field("user_setup_url"));
225 string m = om.get_field("mode"); 225 string m = om.get_field("mode");
226 if(o2 && m=="setup_needed") 226 if(o2 && m=="setup_needed")
227 throw id_res_setup(OPKELE_CP_ "setup needed, no setup url provided"); 227 throw id_res_setup(OPKELE_CP_ "setup needed, no setup url provided");
228 if(m=="cancel") 228 if(m=="cancel")
229 throw id_res_cancel(OPKELE_CP_ "authentication cancelled"); 229 throw id_res_cancel(OPKELE_CP_ "authentication cancelled");
230 bool go_dumb=false; 230 bool go_dumb=false;
231 try { 231 try {
232 string OP = o2 232 string OP = o2
233 ?om.get_field("op_endpoint") 233 ?om.get_field("op_endpoint")
234 :get_endpoint().uri; 234 :get_endpoint().uri;
235 assoc_t assoc = retrieve_assoc( 235 assoc_t assoc = retrieve_assoc(
236 OP,om.get_field("assoc_handle")); 236 OP,om.get_field("assoc_handle"));
237 if(om.get_field("sig")!=util::base64_signature(assoc,om)) 237 if(om.get_field("sig")!=util::base64_signature(assoc,om))
238 throw id_res_mismatch(OPKELE_CP_ "signature mismatch"); 238 throw id_res_mismatch(OPKELE_CP_ "signature mismatch");
239 }catch(dumb_RP& drp) { 239 }catch(dumb_RP& drp) {
240 go_dumb=true; 240 go_dumb=true;
241 }catch(failed_lookup& e) { 241 }catch(failed_lookup& e) {
242 go_dumb=true; 242 go_dumb=true;
243 } OPKELE_RETHROW 243 } OPKELE_RETHROW
244 if(go_dumb) { 244 if(go_dumb) {
245 try { 245 try {