-rw-r--r-- | include/opkele/discovery.h | 3 | ||||
-rw-r--r-- | include/opkele/prequeue_rp.h | 8 | ||||
-rw-r--r-- | include/opkele/types.h | 3 | ||||
-rw-r--r-- | lib/prequeue_rp.cc | 9 |
4 files changed, 19 insertions, 4 deletions
diff --git a/include/opkele/discovery.h b/include/opkele/discovery.h index 4471597..f2721a6 100644 --- a/include/opkele/discovery.h +++ b/include/opkele/discovery.h | |||
@@ -84,10 +84,9 @@ namespace opkele { | |||
84 | }; | 84 | }; |
85 | 85 | ||
86 | } | 86 | } |
87 | 87 | ||
88 | typedef util::output_iterator_proxy<openid_endpoint_t> | 88 | typedef openid_endpoint_output_iterator endpoint_discovery_iterator; |
89 | endpoint_discovery_iterator; | ||
90 | 89 | ||
91 | string idiscover( | 90 | string idiscover( |
92 | endpoint_discovery_iterator oi, | 91 | endpoint_discovery_iterator oi, |
93 | const string& identity); | 92 | const string& identity); |
diff --git a/include/opkele/prequeue_rp.h b/include/opkele/prequeue_rp.h index 68fe03d..6f1fda9 100644 --- a/include/opkele/prequeue_rp.h +++ b/include/opkele/prequeue_rp.h | |||
@@ -80,8 +80,16 @@ namespace opkele { | |||
80 | */ | 80 | */ |
81 | 81 | ||
82 | void verify_OP(const string& OP, | 82 | void verify_OP(const string& OP, |
83 | const string& claimed_id,const string& identity) const; | 83 | const string& claimed_id,const string& identity) const; |
84 | |||
85 | /** | ||
86 | * Perform full discovery on identity | ||
87 | * @param it iterator used for feeding discovered endpoints back to caller | ||
88 | * @param id user supplied identity | ||
89 | * @returns normalized identity (canonical identifier can be found in endpoints) | ||
90 | */ | ||
91 | virtual const string discover(openid_endpoint_output_iterator it,const string& id) const; | ||
84 | }; | 92 | }; |
85 | 93 | ||
86 | } | 94 | } |
87 | 95 | ||
diff --git a/include/opkele/types.h b/include/opkele/types.h index 1f48362..1fab869 100644 --- a/include/opkele/types.h +++ b/include/opkele/types.h | |||
@@ -224,7 +224,10 @@ namespace opkele { | |||
224 | return (c=strcmp(uri.c_str(),x.uri.c_str())) | 224 | return (c=strcmp(uri.c_str(),x.uri.c_str())) |
225 | ? (c<0) : (strcmp(local_id.c_str(),x.local_id.c_str())<0); } | 225 | ? (c<0) : (strcmp(local_id.c_str(),x.local_id.c_str())<0); } |
226 | }; | 226 | }; |
227 | 227 | ||
228 | typedef util::output_iterator_proxy<openid_endpoint_t> | ||
229 | openid_endpoint_output_iterator; | ||
230 | |||
228 | } | 231 | } |
229 | 232 | ||
230 | #endif /* __OPKELE_TYPES_H */ | 233 | #endif /* __OPKELE_TYPES_H */ |
diff --git a/lib/prequeue_rp.cc b/lib/prequeue_rp.cc index 3aa960f..ed1ddfe 100644 --- a/lib/prequeue_rp.cc +++ b/lib/prequeue_rp.cc | |||
@@ -43,9 +43,9 @@ namespace opkele { | |||
43 | }; | 43 | }; |
44 | 44 | ||
45 | void prequeue_RP::verify_OP(const string& OP,const string& claimed_id,const string& identity) const { | 45 | void prequeue_RP::verify_OP(const string& OP,const string& claimed_id,const string& identity) const { |
46 | try { | 46 | try { |
47 | idiscover(OP_verifier(OP,identity),claimed_id); | 47 | discover(OP_verifier(OP,identity),claimed_id); |
48 | throw id_res_unauthorized(OPKELE_CP_ | 48 | throw id_res_unauthorized(OPKELE_CP_ |
49 | "OP is not authorized to make an assertion regarding the identity"); | 49 | "OP is not authorized to make an assertion regarding the identity"); |
50 | }catch(__OP_verifier_good_input& ovgi) { | 50 | }catch(__OP_verifier_good_input& ovgi) { |
51 | } | 51 | } |
@@ -66,9 +66,9 @@ namespace opkele { | |||
66 | }; | 66 | }; |
67 | 67 | ||
68 | void prequeue_RP::initiate(const string& usi) { | 68 | void prequeue_RP::initiate(const string& usi) { |
69 | begin_queueing(); | 69 | begin_queueing(); |
70 | set_normalized_id( idiscover(endpoint_queuer(*this),usi) ); | 70 | set_normalized_id( discover(endpoint_queuer(*this),usi) ); |
71 | end_queueing(); | 71 | end_queueing(); |
72 | } | 72 | } |
73 | 73 | ||
74 | void prequeue_RP::set_normalized_id(const string&) { | 74 | void prequeue_RP::set_normalized_id(const string&) { |
@@ -77,5 +77,10 @@ namespace opkele { | |||
77 | const string prequeue_RP::get_normalized_id() const { | 77 | const string prequeue_RP::get_normalized_id() const { |
78 | throw not_implemented(OPKELE_CP_ "get_normalized_id() is not implemented"); | 78 | throw not_implemented(OPKELE_CP_ "get_normalized_id() is not implemented"); |
79 | } | 79 | } |
80 | 80 | ||
81 | const string prequeue_RP::discover(openid_endpoint_output_iterator it, | ||
82 | const string& id) const { | ||
83 | return idiscover(it,id); | ||
84 | } | ||
85 | |||
81 | } | 86 | } |