-rw-r--r-- | lib/consumer.cc | 29 | ||||
-rw-r--r-- | lib/util.cc | 25 |
2 files changed, 27 insertions, 27 deletions
diff --git a/lib/consumer.cc b/lib/consumer.cc index bd76b61..cbe0769 100644 --- a/lib/consumer.cc +++ b/lib/consumer.cc | |||
@@ -44,273 +44,298 @@ namespace opkele { | |||
44 | (r=curl_easy_setopt(c,CURLOPT_FOLLOWLOCATION,1)) | 44 | (r=curl_easy_setopt(c,CURLOPT_FOLLOWLOCATION,1)) |
45 | || (r=curl_easy_setopt(c,CURLOPT_MAXREDIRS,5)) | 45 | || (r=curl_easy_setopt(c,CURLOPT_MAXREDIRS,5)) |
46 | || (r=curl_easy_setopt(c,CURLOPT_DNS_CACHE_TIMEOUT,120)) | 46 | || (r=curl_easy_setopt(c,CURLOPT_DNS_CACHE_TIMEOUT,120)) |
47 | || (r=curl_easy_setopt(c,CURLOPT_DNS_USE_GLOBAL_CACHE,1)) | 47 | || (r=curl_easy_setopt(c,CURLOPT_DNS_USE_GLOBAL_CACHE,1)) |
48 | || (r=curl_easy_setopt(c,CURLOPT_USERAGENT,PACKAGE_NAME"/"PACKAGE_VERSION)) | 48 | || (r=curl_easy_setopt(c,CURLOPT_USERAGENT,PACKAGE_NAME"/"PACKAGE_VERSION)) |
49 | || (r=curl_easy_setopt(c,CURLOPT_TIMEOUT,20)) | 49 | || (r=curl_easy_setopt(c,CURLOPT_TIMEOUT,20)) |
50 | ; | 50 | ; |
51 | return r; | 51 | return r; |
52 | } | 52 | } |
53 | 53 | ||
54 | static size_t _curl_tostring(void *ptr,size_t size,size_t nmemb,void *stream) { | 54 | static size_t _curl_tostring(void *ptr,size_t size,size_t nmemb,void *stream) { |
55 | string *str = (string*)stream; | 55 | string *str = (string*)stream; |
56 | size_t bytes = size*nmemb; | 56 | size_t bytes = size*nmemb; |
57 | size_t get = min(16384-str->length(),bytes); | 57 | size_t get = min(16384-str->length(),bytes); |
58 | str->append((const char*)ptr,get); | 58 | str->append((const char*)ptr,get); |
59 | return get; | 59 | return get; |
60 | } | 60 | } |
61 | 61 | ||
62 | assoc_t consumer_t::associate(const string& server) { | 62 | assoc_t consumer_t::associate(const string& server) { |
63 | util::dh_t dh = DH_new(); | 63 | util::dh_t dh = DH_new(); |
64 | if(!dh) | 64 | if(!dh) |
65 | throw exception_openssl(OPKELE_CP_ "failed to DH_new()"); | 65 | throw exception_openssl(OPKELE_CP_ "failed to DH_new()"); |
66 | dh->p = util::dec_to_bignum(data::_default_p); | 66 | dh->p = util::dec_to_bignum(data::_default_p); |
67 | dh->g = util::dec_to_bignum(data::_default_g); | 67 | dh->g = util::dec_to_bignum(data::_default_g); |
68 | if(!DH_generate_key(dh)) | 68 | if(!DH_generate_key(dh)) |
69 | throw exception_openssl(OPKELE_CP_ "failed to DH_generate_key()"); | 69 | throw exception_openssl(OPKELE_CP_ "failed to DH_generate_key()"); |
70 | string request = | 70 | string request = |
71 | "openid.mode=associate" | 71 | "openid.mode=associate" |
72 | "&openid.assoc_type=HMAC-SHA1" | 72 | "&openid.assoc_type=HMAC-SHA1" |
73 | "&openid.session_type=DH-SHA1" | 73 | "&openid.session_type=DH-SHA1" |
74 | "&openid.dh_consumer_public="; | 74 | "&openid.dh_consumer_public="; |
75 | request += util::url_encode(util::bignum_to_base64(dh->pub_key)); | 75 | request += util::url_encode(util::bignum_to_base64(dh->pub_key)); |
76 | curl_t curl = curl_easy_init(); | 76 | curl_t curl = curl_easy_init(); |
77 | if(!curl) | 77 | if(!curl) |
78 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()"); | 78 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()"); |
79 | string response; | 79 | string response; |
80 | CURLcode r; | 80 | CURLcode r; |
81 | (r=curl_misc_sets(curl)) | 81 | (r=curl_misc_sets(curl)) |
82 | || (r=curl_easy_setopt(curl,CURLOPT_URL,server.c_str())) | 82 | || (r=curl_easy_setopt(curl,CURLOPT_URL,server.c_str())) |
83 | || (r=curl_easy_setopt(curl,CURLOPT_POST,1)) | 83 | || (r=curl_easy_setopt(curl,CURLOPT_POST,1)) |
84 | || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDS,request.data())) | 84 | || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDS,request.data())) |
85 | || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDSIZE,request.length())) | 85 | || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDSIZE,request.length())) |
86 | || (r=curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,_curl_tostring)) | 86 | || (r=curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,_curl_tostring)) |
87 | || (r=curl_easy_setopt(curl,CURLOPT_WRITEDATA,&response)) | 87 | || (r=curl_easy_setopt(curl,CURLOPT_WRITEDATA,&response)) |
88 | ; | 88 | ; |
89 | if(r) | 89 | if(r) |
90 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r); | 90 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r); |
91 | if(r=curl_easy_perform(curl)) | 91 | if(r=curl_easy_perform(curl)) |
92 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r); | 92 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r); |
93 | params_t p; p.parse_keyvalues(response); | 93 | params_t p; p.parse_keyvalues(response); |
94 | if(p.has_param("assoc_type") && p.get_param("assoc_type")!="HMAC-SHA1") | 94 | if(p.has_param("assoc_type") && p.get_param("assoc_type")!="HMAC-SHA1") |
95 | throw bad_input(OPKELE_CP_ "unsupported assoc_type"); | 95 | throw bad_input(OPKELE_CP_ "unsupported assoc_type"); |
96 | string st; | 96 | string st; |
97 | if(p.has_param("session_type")) st = p.get_param("session_type"); | 97 | if(p.has_param("session_type")) st = p.get_param("session_type"); |
98 | if((!st.empty()) && st!="DH-SHA1") | 98 | if((!st.empty()) && st!="DH-SHA1") |
99 | throw bad_input(OPKELE_CP_ "unsupported session_type"); | 99 | throw bad_input(OPKELE_CP_ "unsupported session_type"); |
100 | secret_t secret; | 100 | secret_t secret; |
101 | if(st.empty()) { | 101 | if(st.empty()) { |
102 | secret.from_base64(p.get_param("mac_key")); | 102 | secret.from_base64(p.get_param("mac_key")); |
103 | }else{ | 103 | }else{ |
104 | util::bignum_t s_pub = util::base64_to_bignum(p.get_param("dh_server_public")); | 104 | util::bignum_t s_pub = util::base64_to_bignum(p.get_param("dh_server_public")); |
105 | vector<unsigned char> ck(DH_size(dh)); | 105 | vector<unsigned char> ck(DH_size(dh)); |
106 | int cklen = DH_compute_key(&(ck.front()),s_pub,dh); | 106 | int cklen = DH_compute_key(&(ck.front()),s_pub,dh); |
107 | if(cklen<0) | 107 | if(cklen<0) |
108 | throw exception_openssl(OPKELE_CP_ "failed to DH_compute_key()"); | 108 | throw exception_openssl(OPKELE_CP_ "failed to DH_compute_key()"); |
109 | ck.resize(cklen); | 109 | ck.resize(cklen); |
110 | // OpenID algorithm requires extra zero in case of set bit here | 110 | // OpenID algorithm requires extra zero in case of set bit here |
111 | if(ck[0]&0x80) ck.insert(ck.begin(),1,0); | 111 | if(ck[0]&0x80) ck.insert(ck.begin(),1,0); |
112 | unsigned char key_sha1[SHA_DIGEST_LENGTH]; | 112 | unsigned char key_sha1[SHA_DIGEST_LENGTH]; |
113 | SHA1(&(ck.front()),ck.size(),key_sha1); | 113 | SHA1(&(ck.front()),ck.size(),key_sha1); |
114 | secret.enxor_from_base64(key_sha1,p.get_param("enc_mac_key")); | 114 | secret.enxor_from_base64(key_sha1,p.get_param("enc_mac_key")); |
115 | } | 115 | } |
116 | int expires_in = 0; | 116 | int expires_in = 0; |
117 | if(p.has_param("expires_in")) { | 117 | if(p.has_param("expires_in")) { |
118 | expires_in = util::string_to_long(p.get_param("expires_in")); | 118 | expires_in = util::string_to_long(p.get_param("expires_in")); |
119 | }else if(p.has_param("issued") && p.has_param("expiry")) { | 119 | }else if(p.has_param("issued") && p.has_param("expiry")) { |
120 | expires_in = util::w3c_to_time(p.get_param("expiry"))-util::w3c_to_time(p.get_param("issued")); | 120 | expires_in = util::w3c_to_time(p.get_param("expiry"))-util::w3c_to_time(p.get_param("issued")); |
121 | }else | 121 | }else |
122 | throw bad_input(OPKELE_CP_ "no expiration information"); | 122 | throw bad_input(OPKELE_CP_ "no expiration information"); |
123 | return store_assoc(server,p.get_param("assoc_handle"),secret,expires_in); | 123 | return store_assoc(server,p.get_param("assoc_handle"),secret,expires_in); |
124 | } | 124 | } |
125 | 125 | ||
126 | string consumer_t::checkid_immediate(const string& identity,const string& return_to,const string& trust_root) { | 126 | string consumer_t::checkid_immediate(const string& identity,const string& return_to,const string& trust_root) { |
127 | return checkid_(mode_checkid_immediate,identity,return_to,trust_root); | 127 | return checkid_(mode_checkid_immediate,identity,return_to,trust_root); |
128 | } | 128 | } |
129 | string consumer_t::checkid_setup(const string& identity,const string& return_to,const string& trust_root) { | 129 | string consumer_t::checkid_setup(const string& identity,const string& return_to,const string& trust_root) { |
130 | return checkid_(mode_checkid_setup,identity,return_to,trust_root); | 130 | return checkid_(mode_checkid_setup,identity,return_to,trust_root); |
131 | } | 131 | } |
132 | string consumer_t::checkid_(mode_t mode,const string& identity,const string& return_to,const string& trust_root) { | 132 | string consumer_t::checkid_(mode_t mode,const string& identity,const string& return_to,const string& trust_root) { |
133 | params_t p; | 133 | params_t p; |
134 | if(mode==mode_checkid_immediate) | 134 | if(mode==mode_checkid_immediate) |
135 | p["mode"]="checkid_immediate"; | 135 | p["mode"]="checkid_immediate"; |
136 | else if(mode==mode_checkid_setup) | 136 | else if(mode==mode_checkid_setup) |
137 | p["mode"]="checkid_setup"; | 137 | p["mode"]="checkid_setup"; |
138 | else | 138 | else |
139 | throw bad_input(OPKELE_CP_ "unknown checkid_* mode"); | 139 | throw bad_input(OPKELE_CP_ "unknown checkid_* mode"); |
140 | string iurl = util::canonicalize_url(identity); | 140 | string iurl = canonicalize(identity); |
141 | string server, delegate; | 141 | string server, delegate; |
142 | retrieve_links(iurl,server,delegate); | 142 | retrieve_links(iurl,server,delegate); |
143 | p["identity"] = delegate.empty()?iurl:delegate; | 143 | p["identity"] = delegate.empty()?iurl:delegate; |
144 | if(!trust_root.empty()) | 144 | if(!trust_root.empty()) |
145 | p["trust_root"] = trust_root; | 145 | p["trust_root"] = trust_root; |
146 | p["return_to"] = return_to; | 146 | p["return_to"] = return_to; |
147 | try { | 147 | try { |
148 | try { | 148 | try { |
149 | string ah = find_assoc(server)->handle(); | 149 | string ah = find_assoc(server)->handle(); |
150 | p["assoc_handle"] = ah; | 150 | p["assoc_handle"] = ah; |
151 | }catch(failed_lookup& fl) { | 151 | }catch(failed_lookup& fl) { |
152 | string ah = associate(server)->handle(); | 152 | string ah = associate(server)->handle(); |
153 | p["assoc_handle"] = ah; | 153 | p["assoc_handle"] = ah; |
154 | } | 154 | } |
155 | }catch(exception& e) { } | 155 | }catch(exception& e) { } |
156 | return p.append_query(server); | 156 | return p.append_query(server); |
157 | } | 157 | } |
158 | 158 | ||
159 | void consumer_t::id_res(const params_t& pin,const string& identity) { | 159 | void consumer_t::id_res(const params_t& pin,const string& identity) { |
160 | if(pin.has_param("openid.user_setup_url")) | 160 | if(pin.has_param("openid.user_setup_url")) |
161 | throw id_res_setup(OPKELE_CP_ "assertion failed, setup url provided",pin.get_param("openid.user_setup_url")); | 161 | throw id_res_setup(OPKELE_CP_ "assertion failed, setup url provided",pin.get_param("openid.user_setup_url")); |
162 | string server,delegate; | 162 | string server,delegate; |
163 | retrieve_links(identity.empty()?pin.get_param("openid.identity"):util::canonicalize_url(identity),server,delegate); | 163 | retrieve_links(identity.empty()?pin.get_param("openid.identity"):canonicalize(identity),server,delegate); |
164 | try { | 164 | try { |
165 | 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 | const string& sigenc = pin.get_param("openid.sig"); | 166 | const string& sigenc = pin.get_param("openid.sig"); |
167 | mimetic::Base64::Decoder b; | 167 | mimetic::Base64::Decoder b; |
168 | vector<unsigned char> sig; | 168 | vector<unsigned char> sig; |
169 | mimetic::decode( | 169 | mimetic::decode( |
170 | sigenc.begin(),sigenc.end(), b, | 170 | sigenc.begin(),sigenc.end(), b, |
171 | back_insert_iterator<vector<unsigned char> >(sig) ); | 171 | back_insert_iterator<vector<unsigned char> >(sig) ); |
172 | const string& slist = pin.get_param("openid.signed"); | 172 | const string& slist = pin.get_param("openid.signed"); |
173 | string kv; | 173 | string kv; |
174 | string::size_type p = 0; | 174 | string::size_type p = 0; |
175 | while(true) { | 175 | while(true) { |
176 | string::size_type co = slist.find(',',p); | 176 | string::size_type co = slist.find(',',p); |
177 | string f = (co==string::npos)?slist.substr(p):slist.substr(p,co-p); | 177 | string f = (co==string::npos)?slist.substr(p):slist.substr(p,co-p); |
178 | kv += f; | 178 | kv += f; |
179 | kv += ':'; | 179 | kv += ':'; |
180 | f.insert(0,"openid."); | 180 | f.insert(0,"openid."); |
181 | kv += pin.get_param(f); | 181 | kv += pin.get_param(f); |
182 | kv += '\n'; | 182 | kv += '\n'; |
183 | if(co==string::npos) | 183 | if(co==string::npos) |
184 | break; | 184 | break; |
185 | p = co+1; | 185 | p = co+1; |
186 | } | 186 | } |
187 | secret_t secret = assoc->secret(); | 187 | secret_t secret = assoc->secret(); |
188 | unsigned int md_len = 0; | 188 | unsigned int md_len = 0; |
189 | unsigned char *md = HMAC( | 189 | unsigned char *md = HMAC( |
190 | EVP_sha1(), | 190 | EVP_sha1(), |
191 | &(secret.front()),secret.size(), | 191 | &(secret.front()),secret.size(), |
192 | (const unsigned char *)kv.data(),kv.length(), | 192 | (const unsigned char *)kv.data(),kv.length(), |
193 | 0,&md_len); | 193 | 0,&md_len); |
194 | if(sig.size()!=md_len || memcmp(&(sig.front()),md,md_len)) | 194 | if(sig.size()!=md_len || memcmp(&(sig.front()),md,md_len)) |
195 | throw id_res_mismatch(OPKELE_CP_ "signature mismatch"); | 195 | throw id_res_mismatch(OPKELE_CP_ "signature mismatch"); |
196 | }catch(failed_lookup& e) { /* XXX: more specific? */ | 196 | }catch(failed_lookup& e) { /* XXX: more specific? */ |
197 | const string& slist = pin.get_param("openid.signed"); | 197 | const string& slist = pin.get_param("openid.signed"); |
198 | string::size_type pp = 0; | 198 | string::size_type pp = 0; |
199 | params_t p; | 199 | params_t p; |
200 | while(true) { | 200 | while(true) { |
201 | string::size_type co = slist.find(',',pp); | 201 | string::size_type co = slist.find(',',pp); |
202 | string f = "openid."; | 202 | string f = "openid."; |
203 | 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); |
204 | p[f] = pin.get_param(f); | 204 | p[f] = pin.get_param(f); |
205 | if(co==string::npos) | 205 | if(co==string::npos) |
206 | break; | 206 | break; |
207 | pp = co+1; | 207 | pp = co+1; |
208 | } | 208 | } |
209 | p["openid.assoc_handle"] = pin.get_param("openid.assoc_handle"); | 209 | p["openid.assoc_handle"] = pin.get_param("openid.assoc_handle"); |
210 | p["openid.sig"] = pin.get_param("openid.sig"); | 210 | p["openid.sig"] = pin.get_param("openid.sig"); |
211 | p["openid.signed"] = pin.get_param("openid.signed"); | 211 | p["openid.signed"] = pin.get_param("openid.signed"); |
212 | try { | 212 | try { |
213 | string ih = pin.get_param("openid.invalidate_handle"); | 213 | string ih = pin.get_param("openid.invalidate_handle"); |
214 | p["openid.invalidate_handle"] = ih; | 214 | p["openid.invalidate_handle"] = ih; |
215 | }catch(failed_lookup& fl) { } | 215 | }catch(failed_lookup& fl) { } |
216 | try { | 216 | try { |
217 | check_authentication(server,p); | 217 | check_authentication(server,p); |
218 | }catch(failed_check_authentication& fca) { | 218 | }catch(failed_check_authentication& fca) { |
219 | throw id_res_failed(OPKELE_CP_ "failed to check_authentication()"); | 219 | throw id_res_failed(OPKELE_CP_ "failed to check_authentication()"); |
220 | } | 220 | } |
221 | } | 221 | } |
222 | } | 222 | } |
223 | 223 | ||
224 | void consumer_t::check_authentication(const string& server,const params_t& p) { | 224 | void consumer_t::check_authentication(const string& server,const params_t& p) { |
225 | string request = "openid.mode=check_authentication"; | 225 | string request = "openid.mode=check_authentication"; |
226 | for(params_t::const_iterator i=p.begin();i!=p.end();++i) { | 226 | for(params_t::const_iterator i=p.begin();i!=p.end();++i) { |
227 | if(i->first!="openid.mode") { | 227 | if(i->first!="openid.mode") { |
228 | request += '&'; | 228 | request += '&'; |
229 | request += i->first; | 229 | request += i->first; |
230 | request += '='; | 230 | request += '='; |
231 | request += util::url_encode(i->second); | 231 | request += util::url_encode(i->second); |
232 | } | 232 | } |
233 | } | 233 | } |
234 | curl_t curl = curl_easy_init(); | 234 | curl_t curl = curl_easy_init(); |
235 | if(!curl) | 235 | if(!curl) |
236 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()"); | 236 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()"); |
237 | string response; | 237 | string response; |
238 | CURLcode r; | 238 | CURLcode r; |
239 | (r=curl_misc_sets(curl)) | 239 | (r=curl_misc_sets(curl)) |
240 | || (r=curl_easy_setopt(curl,CURLOPT_URL,server.c_str())) | 240 | || (r=curl_easy_setopt(curl,CURLOPT_URL,server.c_str())) |
241 | || (r=curl_easy_setopt(curl,CURLOPT_POST,1)) | 241 | || (r=curl_easy_setopt(curl,CURLOPT_POST,1)) |
242 | || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDS,request.data())) | 242 | || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDS,request.data())) |
243 | || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDSIZE,request.length())) | 243 | || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDSIZE,request.length())) |
244 | || (r=curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,_curl_tostring)) | 244 | || (r=curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,_curl_tostring)) |
245 | || (r=curl_easy_setopt(curl,CURLOPT_WRITEDATA,&response)) | 245 | || (r=curl_easy_setopt(curl,CURLOPT_WRITEDATA,&response)) |
246 | ; | 246 | ; |
247 | if(r) | 247 | if(r) |
248 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r); | 248 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r); |
249 | if(r=curl_easy_perform(curl)) | 249 | if(r=curl_easy_perform(curl)) |
250 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r); | 250 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r); |
251 | params_t pp; pp.parse_keyvalues(response); | 251 | params_t pp; pp.parse_keyvalues(response); |
252 | if(pp.has_param("invalidate_handle")) | 252 | if(pp.has_param("invalidate_handle")) |
253 | invalidate_assoc(server,pp.get_param("invalidate_handle")); | 253 | invalidate_assoc(server,pp.get_param("invalidate_handle")); |
254 | if(pp.has_param("is_valid")) { | 254 | if(pp.has_param("is_valid")) { |
255 | if(pp.get_param("is_valid")=="true") | 255 | if(pp.get_param("is_valid")=="true") |
256 | return; | 256 | return; |
257 | }else if(pp.has_param("lifetime")) { | 257 | }else if(pp.has_param("lifetime")) { |
258 | if(util::string_to_long(pp.get_param("lifetime"))) | 258 | if(util::string_to_long(pp.get_param("lifetime"))) |
259 | return; | 259 | return; |
260 | } | 260 | } |
261 | throw failed_check_authentication(OPKELE_CP_ "failed to verify response"); | 261 | throw failed_check_authentication(OPKELE_CP_ "failed to verify response"); |
262 | } | 262 | } |
263 | 263 | ||
264 | void consumer_t::retrieve_links(const string& url,string& server,string& delegate) { | 264 | void consumer_t::retrieve_links(const string& url,string& server,string& delegate) { |
265 | server.erase(); | 265 | server.erase(); |
266 | delegate.erase(); | 266 | delegate.erase(); |
267 | curl_t curl = curl_easy_init(); | 267 | curl_t curl = curl_easy_init(); |
268 | if(!curl) | 268 | if(!curl) |
269 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()"); | 269 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()"); |
270 | string html; | 270 | string html; |
271 | CURLcode r; | 271 | CURLcode r; |
272 | (r=curl_misc_sets(curl)) | 272 | (r=curl_misc_sets(curl)) |
273 | || (r=curl_easy_setopt(curl,CURLOPT_URL,url.c_str())) | 273 | || (r=curl_easy_setopt(curl,CURLOPT_URL,url.c_str())) |
274 | || (r=curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,_curl_tostring)) | 274 | || (r=curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,_curl_tostring)) |
275 | || (r=curl_easy_setopt(curl,CURLOPT_WRITEDATA,&html)) | 275 | || (r=curl_easy_setopt(curl,CURLOPT_WRITEDATA,&html)) |
276 | ; | 276 | ; |
277 | if(r) | 277 | if(r) |
278 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r); | 278 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r); |
279 | r = curl_easy_perform(curl); | 279 | r = curl_easy_perform(curl); |
280 | if(r && r!=CURLE_WRITE_ERROR) | 280 | if(r && r!=CURLE_WRITE_ERROR) |
281 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r); | 281 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r); |
282 | pcrepp::Pcre bre("<body\\b",PCRE_CASELESS); | 282 | pcrepp::Pcre bre("<body\\b",PCRE_CASELESS); |
283 | // strip out everything past body | 283 | // strip out everything past body |
284 | if(bre.search(html)) | 284 | if(bre.search(html)) |
285 | html.erase(bre.get_match_start()); | 285 | html.erase(bre.get_match_start()); |
286 | pcrepp::Pcre hdre("<head[^>]*>",PCRE_CASELESS); | 286 | pcrepp::Pcre hdre("<head[^>]*>",PCRE_CASELESS); |
287 | if(!hdre.search(html)) | 287 | if(!hdre.search(html)) |
288 | throw bad_input(OPKELE_CP_ "failed to find head"); | 288 | throw bad_input(OPKELE_CP_ "failed to find head"); |
289 | html.erase(0,hdre.get_match_end()+1); | 289 | html.erase(0,hdre.get_match_end()+1); |
290 | pcrepp::Pcre lre("<link\\b([^>]+)>",PCRE_CASELESS), | 290 | pcrepp::Pcre lre("<link\\b([^>]+)>",PCRE_CASELESS), |
291 | rre("\\brel=['\"]([^'\"]+)['\"]",PCRE_CASELESS), | 291 | rre("\\brel=['\"]([^'\"]+)['\"]",PCRE_CASELESS), |
292 | hre("\\bhref=['\"]([^'\"]+)['\"]",PCRE_CASELESS); | 292 | hre("\\bhref=['\"]([^'\"]+)['\"]",PCRE_CASELESS); |
293 | while(lre.search(html)) { | 293 | while(lre.search(html)) { |
294 | string attrs = lre[0]; | 294 | string attrs = lre[0]; |
295 | html.erase(0,lre.get_match_end()+1); | 295 | html.erase(0,lre.get_match_end()+1); |
296 | if(!(rre.search(attrs)&&hre.search(attrs))) | 296 | if(!(rre.search(attrs)&&hre.search(attrs))) |
297 | continue; | 297 | continue; |
298 | if(rre[0]=="openid.server") { | 298 | if(rre[0]=="openid.server") { |
299 | server = hre[0]; | 299 | server = hre[0]; |
300 | if(!delegate.empty()) | 300 | if(!delegate.empty()) |
301 | break; | 301 | break; |
302 | }else if(rre[0]=="openid.delegate") { | 302 | }else if(rre[0]=="openid.delegate") { |
303 | delegate = hre[0]; | 303 | delegate = hre[0]; |
304 | if(!server.empty()) | 304 | if(!server.empty()) |
305 | break; | 305 | break; |
306 | } | 306 | } |
307 | } | 307 | } |
308 | if(server.empty()) | 308 | if(server.empty()) |
309 | throw failed_assertion(OPKELE_CP_ "The location has no openid.server declaration"); | 309 | throw failed_assertion(OPKELE_CP_ "The location has no openid.server declaration"); |
310 | } | 310 | } |
311 | 311 | ||
312 | assoc_t consumer_t::find_assoc(const string& server) { | 312 | assoc_t consumer_t::find_assoc(const string& server) { |
313 | throw failed_lookup(OPKELE_CP_ "no find_assoc() provided"); | 313 | throw failed_lookup(OPKELE_CP_ "no find_assoc() provided"); |
314 | } | 314 | } |
315 | 315 | ||
316 | string consumer_t::canonicalize(const string& url) { | ||
317 | string rv = url; | ||
318 | // strip leading and trailing spaces | ||
319 | string::size_type i = rv.find_first_not_of(" \t\r\n"); | ||
320 | if(i==string::npos) | ||
321 | throw bad_input(OPKELE_CP_ "empty URL"); | ||
322 | if(i) | ||
323 | rv.erase(0,i); | ||
324 | i = rv.find_last_not_of(" \t\r\n"); | ||
325 | assert(i!=string::npos); | ||
326 | if(i<(rv.length()-1)) | ||
327 | rv.erase(i+1); | ||
328 | // add missing http:// | ||
329 | i = rv.find("://"); | ||
330 | if(i==string::npos) { // primitive. but do we need more? | ||
331 | rv.insert(0,"http://"); | ||
332 | i = sizeof("http://")-1; | ||
333 | }else{ | ||
334 | i += sizeof("://")-1; | ||
335 | } | ||
336 | if(rv.find('/',i)==string::npos) | ||
337 | rv += '/'; | ||
338 | return rv; | ||
339 | } | ||
340 | |||
316 | } | 341 | } |
diff --git a/lib/util.cc b/lib/util.cc index 1e7335c..d78b5e0 100644 --- a/lib/util.cc +++ b/lib/util.cc | |||
@@ -1,138 +1,113 @@ | |||
1 | #include <errno.h> | 1 | #include <errno.h> |
2 | #include <cassert> | 2 | #include <cassert> |
3 | #include <vector> | 3 | #include <vector> |
4 | #include <string> | 4 | #include <string> |
5 | #include <mimetic/mimetic.h> | 5 | #include <mimetic/mimetic.h> |
6 | #include <curl/curl.h> | 6 | #include <curl/curl.h> |
7 | #include "opkele/util.h" | 7 | #include "opkele/util.h" |
8 | #include "opkele/exception.h" | 8 | #include "opkele/exception.h" |
9 | 9 | ||
10 | namespace opkele { | 10 | namespace opkele { |
11 | using namespace std; | 11 | using namespace std; |
12 | 12 | ||
13 | namespace util { | 13 | namespace util { |
14 | 14 | ||
15 | /* | 15 | /* |
16 | * big numerics | 16 | * big numerics |
17 | */ | 17 | */ |
18 | 18 | ||
19 | BIGNUM *base64_to_bignum(const string& b64) { | 19 | BIGNUM *base64_to_bignum(const string& b64) { |
20 | vector<unsigned char> bin; | 20 | vector<unsigned char> bin; |
21 | mimetic::Base64::Decoder b; | 21 | mimetic::Base64::Decoder b; |
22 | mimetic::decode( | 22 | mimetic::decode( |
23 | b64.begin(),b64.end(), b, | 23 | b64.begin(),b64.end(), b, |
24 | back_insert_iterator<vector<unsigned char> >(bin) ); | 24 | back_insert_iterator<vector<unsigned char> >(bin) ); |
25 | BIGNUM *rv = BN_bin2bn(&(bin.front()),bin.size(),0); | 25 | BIGNUM *rv = BN_bin2bn(&(bin.front()),bin.size(),0); |
26 | if(!rv) | 26 | if(!rv) |
27 | throw failed_conversion(OPKELE_CP_ "failed to BN_bin2bn()"); | 27 | throw failed_conversion(OPKELE_CP_ "failed to BN_bin2bn()"); |
28 | return rv; | 28 | return rv; |
29 | } | 29 | } |
30 | 30 | ||
31 | BIGNUM *dec_to_bignum(const string& dec) { | 31 | BIGNUM *dec_to_bignum(const string& dec) { |
32 | BIGNUM *rv = 0; | 32 | BIGNUM *rv = 0; |
33 | if(!BN_dec2bn(&rv,dec.c_str())) | 33 | if(!BN_dec2bn(&rv,dec.c_str())) |
34 | throw failed_conversion(OPKELE_CP_ "failed to BN_dec2bn()"); | 34 | throw failed_conversion(OPKELE_CP_ "failed to BN_dec2bn()"); |
35 | return rv; | 35 | return rv; |
36 | } | 36 | } |
37 | 37 | ||
38 | string bignum_to_base64(const BIGNUM *bn) { | 38 | string bignum_to_base64(const BIGNUM *bn) { |
39 | vector<unsigned char> bin(BN_num_bytes(bn)); | 39 | vector<unsigned char> bin(BN_num_bytes(bn)); |
40 | int l = BN_bn2bin(bn,&(bin.front())); | 40 | int l = BN_bn2bin(bn,&(bin.front())); |
41 | string rv; | 41 | string rv; |
42 | mimetic::Base64::Encoder b(0); | 42 | mimetic::Base64::Encoder b(0); |
43 | mimetic::encode( | 43 | mimetic::encode( |
44 | bin.begin(),bin.begin()+l, b, | 44 | bin.begin(),bin.begin()+l, b, |
45 | back_insert_iterator<string>(rv) ); | 45 | back_insert_iterator<string>(rv) ); |
46 | return rv; | 46 | return rv; |
47 | } | 47 | } |
48 | 48 | ||
49 | /* | 49 | /* |
50 | * w3c times | 50 | * w3c times |
51 | */ | 51 | */ |
52 | 52 | ||
53 | string time_to_w3c(time_t t) { | 53 | string time_to_w3c(time_t t) { |
54 | struct tm tm_t; | 54 | struct tm tm_t; |
55 | if(!gmtime_r(&t,&tm_t)) | 55 | if(!gmtime_r(&t,&tm_t)) |
56 | throw failed_conversion(OPKELE_CP_ "failed to BN_dec2bn()"); | 56 | throw failed_conversion(OPKELE_CP_ "failed to BN_dec2bn()"); |
57 | char rv[25]; | 57 | char rv[25]; |
58 | if(!strftime(rv,sizeof(rv)-1,"%Y-%m-%dT%H:%M:%SZ",&tm_t)) | 58 | if(!strftime(rv,sizeof(rv)-1,"%Y-%m-%dT%H:%M:%SZ",&tm_t)) |
59 | throw failed_conversion(OPKELE_CP_ "failed to strftime()"); | 59 | throw failed_conversion(OPKELE_CP_ "failed to strftime()"); |
60 | return rv; | 60 | return rv; |
61 | } | 61 | } |
62 | 62 | ||
63 | time_t w3c_to_time(const string& w) { | 63 | time_t w3c_to_time(const string& w) { |
64 | struct tm tm_t; | 64 | struct tm tm_t; |
65 | memset(&tm_t,0,sizeof(tm_t)); | 65 | memset(&tm_t,0,sizeof(tm_t)); |
66 | if( | 66 | if( |
67 | sscanf( | 67 | sscanf( |
68 | w.c_str(), | 68 | w.c_str(), |
69 | "%04d-%02d-%02dT%02d:%02d:%02dZ", | 69 | "%04d-%02d-%02dT%02d:%02d:%02dZ", |
70 | &tm_t.tm_year,&tm_t.tm_mon,&tm_t.tm_mday, | 70 | &tm_t.tm_year,&tm_t.tm_mon,&tm_t.tm_mday, |
71 | &tm_t.tm_hour,&tm_t.tm_min,&tm_t.tm_sec | 71 | &tm_t.tm_hour,&tm_t.tm_min,&tm_t.tm_sec |
72 | ) != 6 ) | 72 | ) != 6 ) |
73 | throw failed_conversion(OPKELE_CP_ "failed to sscanf()"); | 73 | throw failed_conversion(OPKELE_CP_ "failed to sscanf()"); |
74 | tm_t.tm_mon--; | 74 | tm_t.tm_mon--; |
75 | tm_t.tm_year-=1900; | 75 | tm_t.tm_year-=1900; |
76 | time_t rv = mktime(&tm_t); | 76 | time_t rv = mktime(&tm_t); |
77 | if(rv==(time_t)-1) | 77 | if(rv==(time_t)-1) |
78 | throw failed_conversion(OPKELE_CP_ "failed to mktime()"); | 78 | throw failed_conversion(OPKELE_CP_ "failed to mktime()"); |
79 | return rv; | 79 | return rv; |
80 | } | 80 | } |
81 | 81 | ||
82 | /* | 82 | /* |
83 | * | 83 | * |
84 | */ | 84 | */ |
85 | 85 | ||
86 | string canonicalize_url(const string& url) { | ||
87 | string rv = url; | ||
88 | // strip leading and trailing spaces | ||
89 | string::size_type i = rv.find_first_not_of(" \t\r\n"); | ||
90 | if(i==string::npos) | ||
91 | throw bad_input(OPKELE_CP_ "empty URL"); | ||
92 | if(i) | ||
93 | rv.erase(0,i); | ||
94 | i = rv.find_last_not_of(" \t\r\n"); | ||
95 | assert(i!=string::npos); | ||
96 | if(i<(rv.length()-1)) | ||
97 | rv.erase(i+1); | ||
98 | // add missing http:// | ||
99 | i = rv.find("://"); | ||
100 | if(i==string::npos) { // primitive. but do we need more? | ||
101 | rv.insert(0,"http://"); | ||
102 | i = sizeof("http://")-1; | ||
103 | }else{ | ||
104 | i += sizeof("://")-1; | ||
105 | } | ||
106 | if(rv.find('/',i)==string::npos) | ||
107 | rv += '/'; | ||
108 | return rv; | ||
109 | } | ||
110 | |||
111 | string url_encode(const string& str) { | 86 | string url_encode(const string& str) { |
112 | char * t = curl_escape(str.c_str(),str.length()); | 87 | char * t = curl_escape(str.c_str(),str.length()); |
113 | if(!t) | 88 | if(!t) |
114 | throw failed_conversion(OPKELE_CP_ "failed to curl_escape()"); | 89 | throw failed_conversion(OPKELE_CP_ "failed to curl_escape()"); |
115 | string rv(t); | 90 | string rv(t); |
116 | curl_free(t); | 91 | curl_free(t); |
117 | return rv; | 92 | return rv; |
118 | } | 93 | } |
119 | 94 | ||
120 | string long_to_string(long l) { | 95 | string long_to_string(long l) { |
121 | char rv[32]; | 96 | char rv[32]; |
122 | int r=snprintf(rv,sizeof(rv),"%ld",l); | 97 | int r=snprintf(rv,sizeof(rv),"%ld",l); |
123 | if(r<0 || r>=sizeof(rv)) | 98 | if(r<0 || r>=sizeof(rv)) |
124 | throw failed_conversion(OPKELE_CP_ "failed to snprintf()"); | 99 | throw failed_conversion(OPKELE_CP_ "failed to snprintf()"); |
125 | return rv; | 100 | return rv; |
126 | } | 101 | } |
127 | 102 | ||
128 | long string_to_long(const string& s) { | 103 | long string_to_long(const string& s) { |
129 | char *endptr = 0; | 104 | char *endptr = 0; |
130 | long rv = strtol(s.c_str(),&endptr,10); | 105 | long rv = strtol(s.c_str(),&endptr,10); |
131 | if((!endptr) || endptr==s.c_str()) | 106 | if((!endptr) || endptr==s.c_str()) |
132 | throw failed_conversion(OPKELE_CP_ "failed to strtol()"); | 107 | throw failed_conversion(OPKELE_CP_ "failed to strtol()"); |
133 | return rv; | 108 | return rv; |
134 | } | 109 | } |
135 | 110 | ||
136 | } | 111 | } |
137 | 112 | ||
138 | } | 113 | } |