-rw-r--r-- | lib/consumer.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/consumer.cc b/lib/consumer.cc index dd8e150..af309c1 100644 --- a/lib/consumer.cc +++ b/lib/consumer.cc | |||
@@ -51,209 +51,213 @@ namespace opkele { | |||
51 | static size_t _curl_tostring(void *ptr,size_t size,size_t nmemb,void *stream) { | 51 | static size_t _curl_tostring(void *ptr,size_t size,size_t nmemb,void *stream) { |
52 | string *str = (string*)stream; | 52 | string *str = (string*)stream; |
53 | size_t bytes = size*nmemb; | 53 | size_t bytes = size*nmemb; |
54 | size_t get = min(16384-str->length(),bytes); | 54 | size_t get = min(16384-str->length(),bytes); |
55 | str->append((const char*)ptr,get); | 55 | str->append((const char*)ptr,get); |
56 | return get; | 56 | return get; |
57 | } | 57 | } |
58 | 58 | ||
59 | assoc_t consumer_t::associate(const string& server) { | 59 | assoc_t consumer_t::associate(const string& server) { |
60 | util::dh_t dh = DH_new(); | 60 | util::dh_t dh = DH_new(); |
61 | if(!dh) | 61 | if(!dh) |
62 | throw exception_openssl(OPKELE_CP_ "failed to DH_new()"); | 62 | throw exception_openssl(OPKELE_CP_ "failed to DH_new()"); |
63 | dh->p = util::dec_to_bignum(data::_default_p); | 63 | dh->p = util::dec_to_bignum(data::_default_p); |
64 | dh->g = util::dec_to_bignum(data::_default_g); | 64 | dh->g = util::dec_to_bignum(data::_default_g); |
65 | if(!DH_generate_key(dh)) | 65 | if(!DH_generate_key(dh)) |
66 | throw exception_openssl(OPKELE_CP_ "failed to DH_generate_key()"); | 66 | throw exception_openssl(OPKELE_CP_ "failed to DH_generate_key()"); |
67 | string request = | 67 | string request = |
68 | "openid.mode=associate" | 68 | "openid.mode=associate" |
69 | "&openid.assoc_type=HMAC-SHA1" | 69 | "&openid.assoc_type=HMAC-SHA1" |
70 | "&openid.session_type=DH-SHA1" | 70 | "&openid.session_type=DH-SHA1" |
71 | "&openid.dh_consumer_public="; | 71 | "&openid.dh_consumer_public="; |
72 | request += util::url_encode(util::bignum_to_base64(dh->pub_key)); | 72 | request += util::url_encode(util::bignum_to_base64(dh->pub_key)); |
73 | curl_t curl = curl_easy_init(); | 73 | curl_t curl = curl_easy_init(); |
74 | if(!curl) | 74 | if(!curl) |
75 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()"); | 75 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()"); |
76 | string response; | 76 | string response; |
77 | CURLcode r; | 77 | CURLcode r; |
78 | (r=curl_misc_sets(curl)) | 78 | (r=curl_misc_sets(curl)) |
79 | || (r=curl_easy_setopt(curl,CURLOPT_URL,server.c_str())) | 79 | || (r=curl_easy_setopt(curl,CURLOPT_URL,server.c_str())) |
80 | || (r=curl_easy_setopt(curl,CURLOPT_POST,1)) | 80 | || (r=curl_easy_setopt(curl,CURLOPT_POST,1)) |
81 | || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDS,request.data())) | 81 | || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDS,request.data())) |
82 | || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDSIZE,request.length())) | 82 | || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDSIZE,request.length())) |
83 | || (r=curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,_curl_tostring)) | 83 | || (r=curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,_curl_tostring)) |
84 | || (r=curl_easy_setopt(curl,CURLOPT_WRITEDATA,&response)) | 84 | || (r=curl_easy_setopt(curl,CURLOPT_WRITEDATA,&response)) |
85 | ; | 85 | ; |
86 | if(r) | 86 | if(r) |
87 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r); | 87 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r); |
88 | if(r=curl_easy_perform(curl)) | 88 | if(r=curl_easy_perform(curl)) |
89 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r); | 89 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r); |
90 | params_t p; p.parse_keyvalues(response); | 90 | params_t p; p.parse_keyvalues(response); |
91 | if(p.has_param("assoc_type") && p.get_param("assoc_type")!="HMAC-SHA1") | 91 | if(p.has_param("assoc_type") && p.get_param("assoc_type")!="HMAC-SHA1") |
92 | throw bad_input(OPKELE_CP_ "unsupported assoc_type"); | 92 | throw bad_input(OPKELE_CP_ "unsupported assoc_type"); |
93 | string st; | 93 | string st; |
94 | if(p.has_param("session_type")) st = p.get_param("session_type"); | 94 | if(p.has_param("session_type")) st = p.get_param("session_type"); |
95 | if((!st.empty()) && st!="DH-SHA1") | 95 | if((!st.empty()) && st!="DH-SHA1") |
96 | throw bad_input(OPKELE_CP_ "unsupported session_type"); | 96 | throw bad_input(OPKELE_CP_ "unsupported session_type"); |
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)+1); | 102 | vector<unsigned char> ck(DH_size(dh)+1); |
103 | unsigned char *ckptr = &(ck.front())+1; | 103 | unsigned char *ckptr = &(ck.front())+1; |
104 | int cklen = DH_compute_key(ckptr,s_pub,dh); | 104 | int cklen = DH_compute_key(ckptr,s_pub,dh); |
105 | if(cklen<0) | 105 | if(cklen<0) |
106 | throw exception_openssl(OPKELE_CP_ "failed to DH_compute_key()"); | 106 | throw exception_openssl(OPKELE_CP_ "failed to DH_compute_key()"); |
107 | if(cklen && (*ckptr)&0x80) { | 107 | if(cklen && (*ckptr)&0x80) { |
108 | (*(--ckptr)) = 0; ++cklen; | 108 | (*(--ckptr)) = 0; ++cklen; |
109 | } | 109 | } |
110 | unsigned char key_sha1[SHA_DIGEST_LENGTH]; | 110 | unsigned char key_sha1[SHA_DIGEST_LENGTH]; |
111 | SHA1(ckptr,cklen,key_sha1); | 111 | SHA1(ckptr,cklen,key_sha1); |
112 | secret.enxor_from_base64(key_sha1,p.get_param("enc_mac_key")); | 112 | secret.enxor_from_base64(key_sha1,p.get_param("enc_mac_key")); |
113 | } | 113 | } |
114 | int expires_in = 0; | 114 | int expires_in = 0; |
115 | if(p.has_param("expires_in")) { | 115 | if(p.has_param("expires_in")) { |
116 | expires_in = util::string_to_long(p.get_param("expires_in")); | 116 | expires_in = util::string_to_long(p.get_param("expires_in")); |
117 | }else if(p.has_param("issued") && p.has_param("expiry")) { | 117 | }else if(p.has_param("issued") && p.has_param("expiry")) { |
118 | expires_in = util::w3c_to_time(p.get_param("expiry"))-util::w3c_to_time(p.get_param("issued")); | 118 | expires_in = util::w3c_to_time(p.get_param("expiry"))-util::w3c_to_time(p.get_param("issued")); |
119 | }else | 119 | }else |
120 | throw bad_input(OPKELE_CP_ "no expiration information"); | 120 | throw bad_input(OPKELE_CP_ "no expiration information"); |
121 | return store_assoc(server,p.get_param("assoc_handle"),secret,expires_in); | 121 | return store_assoc(server,p.get_param("assoc_handle"),secret,expires_in); |
122 | } | 122 | } |
123 | 123 | ||
124 | string consumer_t::checkid_immediate(const string& identity,const string& return_to,const string& trust_root,extension_t *ext) { | 124 | string consumer_t::checkid_immediate(const string& identity,const string& return_to,const string& trust_root,extension_t *ext) { |
125 | return checkid_(mode_checkid_immediate,identity,return_to,trust_root,ext); | 125 | return checkid_(mode_checkid_immediate,identity,return_to,trust_root,ext); |
126 | } | 126 | } |
127 | string consumer_t::checkid_setup(const string& identity,const string& return_to,const string& trust_root,extension_t *ext) { | 127 | string consumer_t::checkid_setup(const string& identity,const string& return_to,const string& trust_root,extension_t *ext) { |
128 | return checkid_(mode_checkid_setup,identity,return_to,trust_root,ext); | 128 | return checkid_(mode_checkid_setup,identity,return_to,trust_root,ext); |
129 | } | 129 | } |
130 | string consumer_t::checkid_(mode_t mode,const string& identity,const string& return_to,const string& trust_root,extension_t *ext) { | 130 | string consumer_t::checkid_(mode_t mode,const string& identity,const string& return_to,const string& trust_root,extension_t *ext) { |
131 | params_t p; | 131 | params_t p; |
132 | if(mode==mode_checkid_immediate) | 132 | if(mode==mode_checkid_immediate) |
133 | p["mode"]="checkid_immediate"; | 133 | p["mode"]="checkid_immediate"; |
134 | else if(mode==mode_checkid_setup) | 134 | else if(mode==mode_checkid_setup) |
135 | p["mode"]="checkid_setup"; | 135 | p["mode"]="checkid_setup"; |
136 | else | 136 | else |
137 | throw bad_input(OPKELE_CP_ "unknown checkid_* mode"); | 137 | throw bad_input(OPKELE_CP_ "unknown checkid_* mode"); |
138 | string iurl = canonicalize(identity); | 138 | string iurl = canonicalize(identity); |
139 | string server, delegate; | 139 | string server, delegate; |
140 | retrieve_links(iurl,server,delegate); | 140 | retrieve_links(iurl,server,delegate); |
141 | p["identity"] = delegate.empty()?iurl:delegate; | 141 | p["identity"] = delegate.empty()?iurl:delegate; |
142 | if(!trust_root.empty()) | 142 | if(!trust_root.empty()) |
143 | p["trust_root"] = trust_root; | 143 | p["trust_root"] = trust_root; |
144 | p["return_to"] = return_to; | 144 | p["return_to"] = return_to; |
145 | try { | 145 | try { |
146 | string ah = find_assoc(server)->handle(); | 146 | string ah = find_assoc(server)->handle(); |
147 | if(ah->is_expired()) /* TODO: or should I throw some other exception to force programmer fix his implementation? */ | ||
148 | throw failed_lookup(OPKELE_CP_ "find_assoc() has returned expired handle"); | ||
147 | p["assoc_handle"] = ah; | 149 | p["assoc_handle"] = ah; |
148 | }catch(failed_lookup& fl) { | 150 | }catch(failed_lookup& fl) { |
149 | string ah = associate(server)->handle(); | 151 | string ah = associate(server)->handle(); |
150 | p["assoc_handle"] = ah; | 152 | p["assoc_handle"] = ah; |
151 | } | 153 | } |
152 | if(ext) ext->checkid_hook(p,identity); | 154 | if(ext) ext->checkid_hook(p,identity); |
153 | return p.append_query(server); | 155 | return p.append_query(server); |
154 | } | 156 | } |
155 | 157 | ||
156 | void consumer_t::id_res(const params_t& pin,const string& identity,extension_t *ext) { | 158 | void consumer_t::id_res(const params_t& pin,const string& identity,extension_t *ext) { |
157 | if(pin.has_param("openid.user_setup_url")) | 159 | if(pin.has_param("openid.user_setup_url")) |
158 | throw id_res_setup(OPKELE_CP_ "assertion failed, setup url provided",pin.get_param("openid.user_setup_url")); | 160 | throw id_res_setup(OPKELE_CP_ "assertion failed, setup url provided",pin.get_param("openid.user_setup_url")); |
159 | string server,delegate; | 161 | string server,delegate; |
160 | retrieve_links(identity.empty()?pin.get_param("openid.identity"):canonicalize(identity),server,delegate); | 162 | retrieve_links(identity.empty()?pin.get_param("openid.identity"):canonicalize(identity),server,delegate); |
161 | params_t ps; | 163 | params_t ps; |
162 | try { | 164 | try { |
163 | assoc_t assoc = retrieve_assoc(server,pin.get_param("openid.assoc_handle")); | 165 | assoc_t assoc = retrieve_assoc(server,pin.get_param("openid.assoc_handle")); |
166 | if(assoc->is_expired()) /* TODO: or should I throw some other exception to force programmer fix his implementation? */ | ||
167 | throw failed_lookup(OPKELE_CP_ "retrieve_assoc() has returned expired handle"); | ||
164 | const string& sigenc = pin.get_param("openid.sig"); | 168 | const string& sigenc = pin.get_param("openid.sig"); |
165 | vector<unsigned char> sig; | 169 | vector<unsigned char> sig; |
166 | util::decode_base64(sigenc,sig); | 170 | util::decode_base64(sigenc,sig); |
167 | const string& slist = pin.get_param("openid.signed"); | 171 | const string& slist = pin.get_param("openid.signed"); |
168 | string kv; | 172 | string kv; |
169 | string::size_type p = 0; | 173 | string::size_type p = 0; |
170 | while(true) { | 174 | while(true) { |
171 | string::size_type co = slist.find(',',p); | 175 | string::size_type co = slist.find(',',p); |
172 | string f = (co==string::npos)?slist.substr(p):slist.substr(p,co-p); | 176 | string f = (co==string::npos)?slist.substr(p):slist.substr(p,co-p); |
173 | kv += f; | 177 | kv += f; |
174 | kv += ':'; | 178 | kv += ':'; |
175 | f.insert(0,"openid."); | 179 | f.insert(0,"openid."); |
176 | kv += pin.get_param(f); | 180 | kv += pin.get_param(f); |
177 | kv += '\n'; | 181 | kv += '\n'; |
178 | if(ext) ps[f.substr(sizeof("openid.")-1)] = pin.get_param(f); | 182 | if(ext) ps[f.substr(sizeof("openid.")-1)] = pin.get_param(f); |
179 | if(co==string::npos) | 183 | if(co==string::npos) |
180 | break; | 184 | break; |
181 | p = co+1; | 185 | p = co+1; |
182 | } | 186 | } |
183 | secret_t secret = assoc->secret(); | 187 | secret_t secret = assoc->secret(); |
184 | unsigned int md_len = 0; | 188 | unsigned int md_len = 0; |
185 | unsigned char *md = HMAC( | 189 | unsigned char *md = HMAC( |
186 | EVP_sha1(), | 190 | EVP_sha1(), |
187 | &(secret.front()),secret.size(), | 191 | &(secret.front()),secret.size(), |
188 | (const unsigned char *)kv.data(),kv.length(), | 192 | (const unsigned char *)kv.data(),kv.length(), |
189 | 0,&md_len); | 193 | 0,&md_len); |
190 | if(sig.size()!=md_len || memcmp(&(sig.front()),md,md_len)) | 194 | if(sig.size()!=md_len || memcmp(&(sig.front()),md,md_len)) |
191 | throw id_res_mismatch(OPKELE_CP_ "signature mismatch"); | 195 | throw id_res_mismatch(OPKELE_CP_ "signature mismatch"); |
192 | }catch(failed_lookup& e) { /* XXX: more specific? */ | 196 | }catch(failed_lookup& e) { /* XXX: more specific? */ |
193 | const string& slist = pin.get_param("openid.signed"); | 197 | const string& slist = pin.get_param("openid.signed"); |
194 | string::size_type pp = 0; | 198 | string::size_type pp = 0; |
195 | params_t p; | 199 | params_t p; |
196 | while(true) { | 200 | while(true) { |
197 | string::size_type co = slist.find(',',pp); | 201 | string::size_type co = slist.find(',',pp); |
198 | string f = "openid."; | 202 | string f = "openid."; |
199 | f += (co==string::npos)?slist.substr(pp):slist.substr(pp,co-pp); | 203 | f += (co==string::npos)?slist.substr(pp):slist.substr(pp,co-pp); |
200 | p[f] = pin.get_param(f); | 204 | p[f] = pin.get_param(f); |
201 | if(co==string::npos) | 205 | if(co==string::npos) |
202 | break; | 206 | break; |
203 | pp = co+1; | 207 | pp = co+1; |
204 | } | 208 | } |
205 | p["openid.assoc_handle"] = pin.get_param("openid.assoc_handle"); | 209 | p["openid.assoc_handle"] = pin.get_param("openid.assoc_handle"); |
206 | p["openid.sig"] = pin.get_param("openid.sig"); | 210 | p["openid.sig"] = pin.get_param("openid.sig"); |
207 | p["openid.signed"] = pin.get_param("openid.signed"); | 211 | p["openid.signed"] = pin.get_param("openid.signed"); |
208 | try { | 212 | try { |
209 | string ih = pin.get_param("openid.invalidate_handle"); | 213 | string ih = pin.get_param("openid.invalidate_handle"); |
210 | p["openid.invalidate_handle"] = ih; | 214 | p["openid.invalidate_handle"] = ih; |
211 | }catch(failed_lookup& fl) { } | 215 | }catch(failed_lookup& fl) { } |
212 | try { | 216 | try { |
213 | check_authentication(server,p); | 217 | check_authentication(server,p); |
214 | }catch(failed_check_authentication& fca) { | 218 | }catch(failed_check_authentication& fca) { |
215 | throw id_res_failed(OPKELE_CP_ "failed to check_authentication()"); | 219 | throw id_res_failed(OPKELE_CP_ "failed to check_authentication()"); |
216 | } | 220 | } |
217 | } | 221 | } |
218 | if(ext) ext->id_res_hook(pin,ps,identity); | 222 | if(ext) ext->id_res_hook(pin,ps,identity); |
219 | } | 223 | } |
220 | 224 | ||
221 | void consumer_t::check_authentication(const string& server,const params_t& p) { | 225 | void consumer_t::check_authentication(const string& server,const params_t& p) { |
222 | string request = "openid.mode=check_authentication"; | 226 | string request = "openid.mode=check_authentication"; |
223 | for(params_t::const_iterator i=p.begin();i!=p.end();++i) { | 227 | for(params_t::const_iterator i=p.begin();i!=p.end();++i) { |
224 | if(i->first!="openid.mode") { | 228 | if(i->first!="openid.mode") { |
225 | request += '&'; | 229 | request += '&'; |
226 | request += i->first; | 230 | request += i->first; |
227 | request += '='; | 231 | request += '='; |
228 | request += util::url_encode(i->second); | 232 | request += util::url_encode(i->second); |
229 | } | 233 | } |
230 | } | 234 | } |
231 | curl_t curl = curl_easy_init(); | 235 | curl_t curl = curl_easy_init(); |
232 | if(!curl) | 236 | if(!curl) |
233 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()"); | 237 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()"); |
234 | string response; | 238 | string response; |
235 | CURLcode r; | 239 | CURLcode r; |
236 | (r=curl_misc_sets(curl)) | 240 | (r=curl_misc_sets(curl)) |
237 | || (r=curl_easy_setopt(curl,CURLOPT_URL,server.c_str())) | 241 | || (r=curl_easy_setopt(curl,CURLOPT_URL,server.c_str())) |
238 | || (r=curl_easy_setopt(curl,CURLOPT_POST,1)) | 242 | || (r=curl_easy_setopt(curl,CURLOPT_POST,1)) |
239 | || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDS,request.data())) | 243 | || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDS,request.data())) |
240 | || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDSIZE,request.length())) | 244 | || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDSIZE,request.length())) |
241 | || (r=curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,_curl_tostring)) | 245 | || (r=curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,_curl_tostring)) |
242 | || (r=curl_easy_setopt(curl,CURLOPT_WRITEDATA,&response)) | 246 | || (r=curl_easy_setopt(curl,CURLOPT_WRITEDATA,&response)) |
243 | ; | 247 | ; |
244 | if(r) | 248 | if(r) |
245 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r); | 249 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r); |
246 | if(r=curl_easy_perform(curl)) | 250 | if(r=curl_easy_perform(curl)) |
247 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r); | 251 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r); |
248 | params_t pp; pp.parse_keyvalues(response); | 252 | params_t pp; pp.parse_keyvalues(response); |
249 | if(pp.has_param("invalidate_handle")) | 253 | if(pp.has_param("invalidate_handle")) |
250 | invalidate_assoc(server,pp.get_param("invalidate_handle")); | 254 | invalidate_assoc(server,pp.get_param("invalidate_handle")); |
251 | if(pp.has_param("is_valid")) { | 255 | if(pp.has_param("is_valid")) { |
252 | if(pp.get_param("is_valid")=="true") | 256 | if(pp.get_param("is_valid")=="true") |
253 | return; | 257 | return; |
254 | }else if(pp.has_param("lifetime")) { | 258 | }else if(pp.has_param("lifetime")) { |
255 | if(util::string_to_long(pp.get_param("lifetime"))) | 259 | if(util::string_to_long(pp.get_param("lifetime"))) |
256 | return; | 260 | return; |
257 | } | 261 | } |
258 | throw failed_check_authentication(OPKELE_CP_ "failed to verify response"); | 262 | throw failed_check_authentication(OPKELE_CP_ "failed to verify response"); |
259 | } | 263 | } |