author | Michael Krelin <hacker@klever.net> | 2007-12-04 19:02:15 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-12-04 19:02:15 (UTC) |
commit | 7a6a6fbcf7e20f0d7da5f625a73c865b361f16aa (patch) (side-by-side diff) | |
tree | 42a2983bd4fdbba0b49d9a5329e5f819ad73d5ec /lib | |
parent | 206de587733c5dbde280fb6e9f1eab2f02de7f54 (diff) | |
download | libopkele-7a6a6fbcf7e20f0d7da5f625a73c865b361f16aa.zip libopkele-7a6a6fbcf7e20f0d7da5f625a73c865b361f16aa.tar.gz libopkele-7a6a6fbcf7e20f0d7da5f625a73c865b361f16aa.tar.bz2 |
Minor improvements
- almost irrelevant documentation updates
- introduced id_res_expired_on_delivery exception to be thrown if the
association has expired right before it could've been used for signature
verification.
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | lib/consumer.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/consumer.cc b/lib/consumer.cc index 66db7dd..9f7530f 100644 --- a/lib/consumer.cc +++ b/lib/consumer.cc @@ -175,26 +175,26 @@ namespace opkele { if(ext) ext->checkid_hook(p,identity); return p.append_query(server); } void consumer_t::id_res(const params_t& pin,const string& identity,extension_t *ext) { if(pin.has_param("openid.user_setup_url")) throw id_res_setup(OPKELE_CP_ "assertion failed, setup url provided",pin.get_param("openid.user_setup_url")); string server,delegate; retrieve_links(identity.empty()?pin.get_param("openid.identity"):canonicalize(identity),server,delegate); params_t ps; try { assoc_t assoc = retrieve_assoc(server,pin.get_param("openid.assoc_handle")); - if(assoc->is_expired()) /* TODO: or should I throw some other exception to force programmer fix his implementation? */ - throw failed_lookup(OPKELE_CP_ "retrieve_assoc() has returned expired handle"); + if(assoc->is_expired()) + throw id_res_expired_on_delivery(OPKELE_CP_ "retrieve_assoc() has returned expired handle"); const string& sigenc = pin.get_param("openid.sig"); vector<unsigned char> sig; util::decode_base64(sigenc,sig); const string& slist = pin.get_param("openid.signed"); string kv; string::size_type p = 0; while(true) { string::size_type co = slist.find(',',p); string f = (co==string::npos)?slist.substr(p):slist.substr(p,co-p); kv += f; kv += ':'; f.insert(0,"openid."); @@ -205,25 +205,25 @@ namespace opkele { break; p = co+1; } secret_t secret = assoc->secret(); unsigned int md_len = 0; unsigned char *md = HMAC( EVP_sha1(), &(secret.front()),secret.size(), (const unsigned char *)kv.data(),kv.length(), 0,&md_len); if(sig.size()!=md_len || memcmp(&(sig.front()),md,md_len)) throw id_res_mismatch(OPKELE_CP_ "signature mismatch"); - }catch(failed_lookup& e) { /* XXX: more specific? */ + }catch(failed_lookup& e) { const string& slist = pin.get_param("openid.signed"); string::size_type pp = 0; params_t p; while(true) { string::size_type co = slist.find(',',pp); string f = "openid."; f += (co==string::npos)?slist.substr(pp):slist.substr(pp,co-pp); p[f] = pin.get_param(f); if(co==string::npos) break; pp = co+1; } |