author | Michael Krelin <hacker@klever.net> | 2008-01-31 22:07:53 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2008-01-31 22:07:53 (UTC) |
commit | 67133db1f33b142561575cdf99fedca8fb6ad79b (patch) (unidiff) | |
tree | 4320aff864ce4848808c6643bf289b9bbfe70a60 | |
parent | 66b14d4368d661daf2248e36ac4f9a3f69f6a75a (diff) | |
download | libopkele-67133db1f33b142561575cdf99fedca8fb6ad79b.zip libopkele-67133db1f33b142561575cdf99fedca8fb6ad79b.tar.gz libopkele-67133db1f33b142561575cdf99fedca8fb6ad79b.tar.bz2 |
added util::change_mode_message_proxy class
generatlized checkauth_message_proxy and added it to util namespace. To be
later used for constructing setup url in 1.0 checkid_immediate reply.
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | include/opkele/util.h | 18 | ||||
-rw-r--r-- | lib/basic_rp.cc | 21 |
2 files changed, 20 insertions, 19 deletions
diff --git a/include/opkele/util.h b/include/opkele/util.h index e9176b0..6f3ddf6 100644 --- a/include/opkele/util.h +++ b/include/opkele/util.h | |||
@@ -146,2 +146,20 @@ namespace opkele { | |||
146 | 146 | ||
147 | class change_mode_message_proxy : public basic_openid_message { | ||
148 | public: | ||
149 | const basic_openid_message& x; | ||
150 | const string& mode; | ||
151 | |||
152 | change_mode_message_proxy(const basic_openid_message& xx,const string& m) : x(xx), mode(m) { } | ||
153 | |||
154 | bool has_field(const string& n) const { return x.has_field(n); } | ||
155 | const string& get_field(const string& n) const { | ||
156 | return (n=="mode")?mode:x.get_field(n); } | ||
157 | bool has_ns(const string& uri) const {return x.has_ns(uri); } | ||
158 | string get_ns(const string& uri) const { return x.get_ns(uri); } | ||
159 | fields_iterator fields_begin() const { | ||
160 | return x.fields_begin(); } | ||
161 | fields_iterator fields_end() const { | ||
162 | return x.fields_end(); } | ||
163 | }; | ||
164 | |||
147 | } | 165 | } |
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 | |||
@@ -280,20 +280,2 @@ namespace opkele { | |||
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, |
@@ -301,3 +283,4 @@ namespace opkele { | |||
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")) { |