author | Michael Krelin <hacker@klever.net> | 2007-06-16 09:47:38 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-06-16 09:47:38 (UTC) |
commit | 2d4ea456085c67bdd0539c6b481f7561b5977b3e (patch) (unidiff) | |
tree | 3e3592270f2b4c1cca735cc06a595b1d80019fa1 | |
parent | bd27af85ae505a64cde56ab78b244505b4737cf0 (diff) | |
download | libopkele-2d4ea456085c67bdd0539c6b481f7561b5977b3e.zip libopkele-2d4ea456085c67bdd0539c6b481f7561b5977b3e.tar.gz libopkele-2d4ea456085c67bdd0539c6b481f7561b5977b3e.tar.bz2 |
remove catch-all nop handler
-rw-r--r-- | lib/consumer.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/lib/consumer.cc b/lib/consumer.cc index 30a5507..12866f0 100644 --- a/lib/consumer.cc +++ b/lib/consumer.cc | |||
@@ -133,32 +133,30 @@ namespace opkele { | |||
133 | else if(mode==mode_checkid_setup) | 133 | else if(mode==mode_checkid_setup) |
134 | p["mode"]="checkid_setup"; | 134 | p["mode"]="checkid_setup"; |
135 | else | 135 | else |
136 | throw bad_input(OPKELE_CP_ "unknown checkid_* mode"); | 136 | throw bad_input(OPKELE_CP_ "unknown checkid_* mode"); |
137 | string iurl = canonicalize(identity); | 137 | string iurl = canonicalize(identity); |
138 | string server, delegate; | 138 | string server, delegate; |
139 | retrieve_links(iurl,server,delegate); | 139 | retrieve_links(iurl,server,delegate); |
140 | p["identity"] = delegate.empty()?iurl:delegate; | 140 | p["identity"] = delegate.empty()?iurl:delegate; |
141 | if(!trust_root.empty()) | 141 | if(!trust_root.empty()) |
142 | p["trust_root"] = trust_root; | 142 | p["trust_root"] = trust_root; |
143 | p["return_to"] = return_to; | 143 | p["return_to"] = return_to; |
144 | try { | 144 | try { |
145 | try { | 145 | string ah = find_assoc(server)->handle(); |
146 | string ah = find_assoc(server)->handle(); | 146 | p["assoc_handle"] = ah; |
147 | p["assoc_handle"] = ah; | 147 | }catch(failed_lookup& fl) { |
148 | }catch(failed_lookup& fl) { | 148 | string ah = associate(server)->handle(); |
149 | string ah = associate(server)->handle(); | 149 | p["assoc_handle"] = ah; |
150 | p["assoc_handle"] = ah; | 150 | } |
151 | } | ||
152 | }catch(exception& e) { } | ||
153 | if(ext) ext->checkid_hook(p,identity); | 151 | if(ext) ext->checkid_hook(p,identity); |
154 | return p.append_query(server); | 152 | return p.append_query(server); |
155 | } | 153 | } |
156 | 154 | ||
157 | void consumer_t::id_res(const params_t& pin,const string& identity,extension_t *ext) { | 155 | void consumer_t::id_res(const params_t& pin,const string& identity,extension_t *ext) { |
158 | if(pin.has_param("openid.user_setup_url")) | 156 | if(pin.has_param("openid.user_setup_url")) |
159 | throw id_res_setup(OPKELE_CP_ "assertion failed, setup url provided",pin.get_param("openid.user_setup_url")); | 157 | throw id_res_setup(OPKELE_CP_ "assertion failed, setup url provided",pin.get_param("openid.user_setup_url")); |
160 | string server,delegate; | 158 | string server,delegate; |
161 | retrieve_links(identity.empty()?pin.get_param("openid.identity"):canonicalize(identity),server,delegate); | 159 | retrieve_links(identity.empty()?pin.get_param("openid.identity"):canonicalize(identity),server,delegate); |
162 | params_t ps; | 160 | params_t ps; |
163 | try { | 161 | try { |
164 | assoc_t assoc = retrieve_assoc(server,pin.get_param("openid.assoc_handle")); | 162 | assoc_t assoc = retrieve_assoc(server,pin.get_param("openid.assoc_handle")); |