-rw-r--r-- | lib/basic_op.cc | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/lib/basic_op.cc b/lib/basic_op.cc index 7a2dbd2..18446dc 100644 --- a/lib/basic_op.cc +++ b/lib/basic_op.cc | |||
@@ -11,5 +11,5 @@ | |||
11 | namespace opkele { | 11 | namespace opkele { |
12 | 12 | ||
13 | void basic_op::reset_vars() { | 13 | void basic_OP::reset_vars() { |
14 | assoc.reset(); | 14 | assoc.reset(); |
15 | return_to.clear(); realm.clear(); | 15 | return_to.clear(); realm.clear(); |
@@ -18,8 +18,8 @@ namespace opkele { | |||
18 | } | 18 | } |
19 | 19 | ||
20 | bool basic_op::has_return_to() const { | 20 | bool basic_OP::has_return_to() const { |
21 | return !return_to.empty(); | 21 | return !return_to.empty(); |
22 | } | 22 | } |
23 | const string& basic_op::get_return_to() const { | 23 | const string& basic_OP::get_return_to() const { |
24 | if(return_to.empty()) | 24 | if(return_to.empty()) |
25 | throw no_return_to(OPKELE_CP_ "No return_to URL provided with request"); | 25 | throw no_return_to(OPKELE_CP_ "No return_to URL provided with request"); |
@@ -27,13 +27,13 @@ namespace opkele { | |||
27 | } | 27 | } |
28 | 28 | ||
29 | const string& basic_op::get_realm() const { | 29 | const string& basic_OP::get_realm() const { |
30 | assert(!realm.empty()); | 30 | assert(!realm.empty()); |
31 | return realm; | 31 | return realm; |
32 | } | 32 | } |
33 | 33 | ||
34 | bool basic_op::has_identity() const { | 34 | bool basic_OP::has_identity() const { |
35 | return !identity.empty(); | 35 | return !identity.empty(); |
36 | } | 36 | } |
37 | const string& basic_op::get_claimed_id() const { | 37 | const string& basic_OP::get_claimed_id() const { |
38 | if(claimed_id.empty()) | 38 | if(claimed_id.empty()) |
39 | throw non_identity(OPKELE_CP_ "attempting to retrieve claimed_id of non-identity related request"); | 39 | throw non_identity(OPKELE_CP_ "attempting to retrieve claimed_id of non-identity related request"); |
@@ -41,5 +41,5 @@ namespace opkele { | |||
41 | return claimed_id; | 41 | return claimed_id; |
42 | } | 42 | } |
43 | const string& basic_op::get_identity() const { | 43 | const string& basic_OP::get_identity() const { |
44 | if(identity.empty()) | 44 | if(identity.empty()) |
45 | throw non_identity(OPKELE_CP_ "attempting to retrieve identity of non-identity related request"); | 45 | throw non_identity(OPKELE_CP_ "attempting to retrieve identity of non-identity related request"); |
@@ -48,16 +48,16 @@ namespace opkele { | |||
48 | } | 48 | } |
49 | 49 | ||
50 | bool basic_op::is_id_select() const { | 50 | bool basic_OP::is_id_select() const { |
51 | return identity==IDURI_SELECT20; | 51 | return identity==IDURI_SELECT20; |
52 | } | 52 | } |
53 | 53 | ||
54 | void basic_op::select_identity(const string& c,const string& i) { | 54 | void basic_OP::select_identity(const string& c,const string& i) { |
55 | claimed_id = c; identity = i; | 55 | claimed_id = c; identity = i; |
56 | } | 56 | } |
57 | void basic_op::set_claimed_id(const string& c) { | 57 | void basic_OP::set_claimed_id(const string& c) { |
58 | claimed_id = c; | 58 | claimed_id = c; |
59 | } | 59 | } |
60 | 60 | ||
61 | basic_openid_message& basic_op::associate( | 61 | basic_openid_message& basic_OP::associate( |
62 | basic_openid_message& oum, | 62 | basic_openid_message& oum, |
63 | const basic_openid_message& inm) try { | 63 | const basic_openid_message& inm) try { |
@@ -132,5 +132,5 @@ namespace opkele { | |||
132 | } | 132 | } |
133 | 133 | ||
134 | void basic_op::checkid_(const basic_openid_message& inm, | 134 | void basic_OP::checkid_(const basic_openid_message& inm, |
135 | extension_t *ext) { | 135 | extension_t *ext) { |
136 | reset_vars(); | 136 | reset_vars(); |
@@ -194,5 +194,5 @@ namespace opkele { | |||
194 | } | 194 | } |
195 | 195 | ||
196 | basic_openid_message& basic_op::id_res(basic_openid_message& om, | 196 | basic_openid_message& basic_OP::id_res(basic_openid_message& om, |
197 | extension_t *ext) { | 197 | extension_t *ext) { |
198 | assert(!return_to.empty()); | 198 | assert(!return_to.empty()); |
@@ -219,5 +219,5 @@ namespace opkele { | |||
219 | om.set_field("return_to",return_to); | 219 | om.set_field("return_to",return_to); |
220 | string nonce = w3timestr; | 220 | string nonce = w3timestr; |
221 | om.set_field("response_nonce",alloc_nonce(nonce,assoc->stateless())); | 221 | om.set_field("response_nonce",alloc_nonce(nonce)); |
222 | if(!invalidate_handle.empty()) { | 222 | if(!invalidate_handle.empty()) { |
223 | om.set_field("invalidate_handle",invalidate_handle); | 223 | om.set_field("invalidate_handle",invalidate_handle); |
@@ -231,5 +231,5 @@ namespace opkele { | |||
231 | } | 231 | } |
232 | 232 | ||
233 | basic_openid_message& basic_op::cancel(basic_openid_message& om) { | 233 | basic_openid_message& basic_OP::cancel(basic_openid_message& om) { |
234 | assert(!return_to.empty()); | 234 | assert(!return_to.empty()); |
235 | om.set_field("ns",OIURI_OPENID20); | 235 | om.set_field("ns",OIURI_OPENID20); |
@@ -238,5 +238,5 @@ namespace opkele { | |||
238 | } | 238 | } |
239 | 239 | ||
240 | basic_openid_message& basic_op::error(basic_openid_message& om, | 240 | basic_openid_message& basic_OP::error(basic_openid_message& om, |
241 | const string& error,const string& contact, | 241 | const string& error,const string& contact, |
242 | const string& reference ) { | 242 | const string& reference ) { |
@@ -250,5 +250,5 @@ namespace opkele { | |||
250 | } | 250 | } |
251 | 251 | ||
252 | basic_openid_message& basic_op::setup_needed( | 252 | basic_openid_message& basic_OP::setup_needed( |
253 | basic_openid_message& oum,const basic_openid_message& inm) { | 253 | basic_openid_message& oum,const basic_openid_message& inm) { |
254 | assert(mode==mode_checkid_immediate); | 254 | assert(mode==mode_checkid_immediate); |
@@ -267,5 +267,5 @@ namespace opkele { | |||
267 | } | 267 | } |
268 | 268 | ||
269 | basic_openid_message& basic_op::check_authentication( | 269 | basic_openid_message& basic_OP::check_authentication( |
270 | basic_openid_message& oum, | 270 | basic_openid_message& oum, |
271 | const basic_openid_message& inm) try { | 271 | const basic_openid_message& inm) try { |
@@ -321,5 +321,5 @@ namespace opkele { | |||
321 | } | 321 | } |
322 | 322 | ||
323 | void basic_op::verify_return_to() { | 323 | void basic_OP::verify_return_to() { |
324 | if(realm.find('#')!=string::npos) | 324 | if(realm.find('#')!=string::npos) |
325 | throw opkele::bad_realm(OPKELE_CP_ "authentication realm contains URI fragment"); | 325 | throw opkele::bad_realm(OPKELE_CP_ "authentication realm contains URI fragment"); |