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 /lib/consumer.cc | |
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 | |||
@@ -97,104 +97,102 @@ namespace opkele { | |||
97 | secret_t secret; | 97 | secret_t secret; |
98 | if(st.empty()) { | 98 | if(st.empty()) { |
99 | secret.from_base64(p.get_param("mac_key")); | 99 | secret.from_base64(p.get_param("mac_key")); |
100 | }else{ | 100 | }else{ |
101 | util::bignum_t s_pub = util::base64_to_bignum(p.get_param("dh_server_public")); | 101 | util::bignum_t s_pub = util::base64_to_bignum(p.get_param("dh_server_public")); |
102 | vector<unsigned char> ck(DH_size(dh)); | 102 | vector<unsigned char> ck(DH_size(dh)); |
103 | int cklen = DH_compute_key(&(ck.front()),s_pub,dh); | 103 | int cklen = DH_compute_key(&(ck.front()),s_pub,dh); |
104 | if(cklen<0) | 104 | if(cklen<0) |
105 | throw exception_openssl(OPKELE_CP_ "failed to DH_compute_key()"); | 105 | throw exception_openssl(OPKELE_CP_ "failed to DH_compute_key()"); |
106 | ck.resize(cklen); | 106 | ck.resize(cklen); |
107 | // OpenID algorithm requires extra zero in case of set bit here | 107 | // OpenID algorithm requires extra zero in case of set bit here |
108 | if(ck[0]&0x80) ck.insert(ck.begin(),1,0); | 108 | if(ck[0]&0x80) ck.insert(ck.begin(),1,0); |
109 | unsigned char key_sha1[SHA_DIGEST_LENGTH]; | 109 | unsigned char key_sha1[SHA_DIGEST_LENGTH]; |
110 | SHA1(&(ck.front()),ck.size(),key_sha1); | 110 | SHA1(&(ck.front()),ck.size(),key_sha1); |
111 | secret.enxor_from_base64(key_sha1,p.get_param("enc_mac_key")); | 111 | secret.enxor_from_base64(key_sha1,p.get_param("enc_mac_key")); |
112 | } | 112 | } |
113 | int expires_in = 0; | 113 | int expires_in = 0; |
114 | if(p.has_param("expires_in")) { | 114 | if(p.has_param("expires_in")) { |
115 | expires_in = util::string_to_long(p.get_param("expires_in")); | 115 | expires_in = util::string_to_long(p.get_param("expires_in")); |
116 | }else if(p.has_param("issued") && p.has_param("expiry")) { | 116 | }else if(p.has_param("issued") && p.has_param("expiry")) { |
117 | expires_in = util::w3c_to_time(p.get_param("expiry"))-util::w3c_to_time(p.get_param("issued")); | 117 | expires_in = util::w3c_to_time(p.get_param("expiry"))-util::w3c_to_time(p.get_param("issued")); |
118 | }else | 118 | }else |
119 | throw bad_input(OPKELE_CP_ "no expiration information"); | 119 | throw bad_input(OPKELE_CP_ "no expiration information"); |
120 | return store_assoc(server,p.get_param("assoc_handle"),secret,expires_in); | 120 | return store_assoc(server,p.get_param("assoc_handle"),secret,expires_in); |
121 | } | 121 | } |
122 | 122 | ||
123 | string consumer_t::checkid_immediate(const string& identity,const string& return_to,const string& trust_root,extension_t *ext) { | 123 | string consumer_t::checkid_immediate(const string& identity,const string& return_to,const string& trust_root,extension_t *ext) { |
124 | return checkid_(mode_checkid_immediate,identity,return_to,trust_root,ext); | 124 | return checkid_(mode_checkid_immediate,identity,return_to,trust_root,ext); |
125 | } | 125 | } |
126 | string consumer_t::checkid_setup(const string& identity,const string& return_to,const string& trust_root,extension_t *ext) { | 126 | string consumer_t::checkid_setup(const string& identity,const string& return_to,const string& trust_root,extension_t *ext) { |
127 | return checkid_(mode_checkid_setup,identity,return_to,trust_root,ext); | 127 | return checkid_(mode_checkid_setup,identity,return_to,trust_root,ext); |
128 | } | 128 | } |
129 | string consumer_t::checkid_(mode_t mode,const string& identity,const string& return_to,const string& trust_root,extension_t *ext) { | 129 | string consumer_t::checkid_(mode_t mode,const string& identity,const string& return_to,const string& trust_root,extension_t *ext) { |
130 | params_t p; | 130 | params_t p; |
131 | if(mode==mode_checkid_immediate) | 131 | if(mode==mode_checkid_immediate) |
132 | p["mode"]="checkid_immediate"; | 132 | p["mode"]="checkid_immediate"; |
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")); |
165 | const string& sigenc = pin.get_param("openid.sig"); | 163 | const string& sigenc = pin.get_param("openid.sig"); |
166 | vector<unsigned char> sig; | 164 | vector<unsigned char> sig; |
167 | util::decode_base64(sigenc,sig); | 165 | util::decode_base64(sigenc,sig); |
168 | const string& slist = pin.get_param("openid.signed"); | 166 | const string& slist = pin.get_param("openid.signed"); |
169 | string kv; | 167 | string kv; |
170 | string::size_type p = 0; | 168 | string::size_type p = 0; |
171 | while(true) { | 169 | while(true) { |
172 | string::size_type co = slist.find(',',p); | 170 | string::size_type co = slist.find(',',p); |
173 | string f = (co==string::npos)?slist.substr(p):slist.substr(p,co-p); | 171 | string f = (co==string::npos)?slist.substr(p):slist.substr(p,co-p); |
174 | kv += f; | 172 | kv += f; |
175 | kv += ':'; | 173 | kv += ':'; |
176 | f.insert(0,"openid."); | 174 | f.insert(0,"openid."); |
177 | kv += pin.get_param(f); | 175 | kv += pin.get_param(f); |
178 | kv += '\n'; | 176 | kv += '\n'; |
179 | if(ext) ps[f.substr(sizeof("openid.")-1)] = pin.get_param(f); | 177 | if(ext) ps[f.substr(sizeof("openid.")-1)] = pin.get_param(f); |
180 | if(co==string::npos) | 178 | if(co==string::npos) |
181 | break; | 179 | break; |
182 | p = co+1; | 180 | p = co+1; |
183 | } | 181 | } |
184 | secret_t secret = assoc->secret(); | 182 | secret_t secret = assoc->secret(); |
185 | unsigned int md_len = 0; | 183 | unsigned int md_len = 0; |
186 | unsigned char *md = HMAC( | 184 | unsigned char *md = HMAC( |
187 | EVP_sha1(), | 185 | EVP_sha1(), |
188 | &(secret.front()),secret.size(), | 186 | &(secret.front()),secret.size(), |
189 | (const unsigned char *)kv.data(),kv.length(), | 187 | (const unsigned char *)kv.data(),kv.length(), |
190 | 0,&md_len); | 188 | 0,&md_len); |
191 | if(sig.size()!=md_len || memcmp(&(sig.front()),md,md_len)) | 189 | if(sig.size()!=md_len || memcmp(&(sig.front()),md,md_len)) |
192 | throw id_res_mismatch(OPKELE_CP_ "signature mismatch"); | 190 | throw id_res_mismatch(OPKELE_CP_ "signature mismatch"); |
193 | }catch(failed_lookup& e) { /* XXX: more specific? */ | 191 | }catch(failed_lookup& e) { /* XXX: more specific? */ |
194 | const string& slist = pin.get_param("openid.signed"); | 192 | const string& slist = pin.get_param("openid.signed"); |
195 | string::size_type pp = 0; | 193 | string::size_type pp = 0; |
196 | params_t p; | 194 | params_t p; |
197 | while(true) { | 195 | while(true) { |
198 | string::size_type co = slist.find(',',pp); | 196 | string::size_type co = slist.find(',',pp); |
199 | string f = "openid."; | 197 | string f = "openid."; |
200 | f += (co==string::npos)?slist.substr(pp):slist.substr(pp,co-pp); | 198 | f += (co==string::npos)?slist.substr(pp):slist.substr(pp,co-pp); |