-rw-r--r-- | lib/consumer.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/consumer.cc b/lib/consumer.cc index 12866f0..282f0cc 100644 --- a/lib/consumer.cc +++ b/lib/consumer.cc | |||
@@ -54,105 +54,106 @@ namespace opkele { | |||
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)); | 102 | vector<unsigned char> ck(DH_size(dh)+1); |
103 | int cklen = DH_compute_key(&(ck.front()),s_pub,dh); | 103 | unsigned char *ckptr = &(ck.front())+1; |
104 | int cklen = DH_compute_key(ckptr,s_pub,dh); | ||
104 | if(cklen<0) | 105 | if(cklen<0) |
105 | throw exception_openssl(OPKELE_CP_ "failed to DH_compute_key()"); | 106 | throw exception_openssl(OPKELE_CP_ "failed to DH_compute_key()"); |
106 | ck.resize(cklen); | 107 | if(cklen && (*ckptr)&0x80) { |
107 | // OpenID algorithm requires extra zero in case of set bit here | 108 | (*(--ckptr)) = 0; ++cklen; |
108 | if(ck[0]&0x80) ck.insert(ck.begin(),1,0); | 109 | } |
109 | unsigned char key_sha1[SHA_DIGEST_LENGTH]; | 110 | unsigned char key_sha1[SHA_DIGEST_LENGTH]; |
110 | SHA1(&(ck.front()),ck.size(),key_sha1); | 111 | SHA1(ckptr,cklen,key_sha1); |
111 | 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")); |
112 | } | 113 | } |
113 | int expires_in = 0; | 114 | int expires_in = 0; |
114 | if(p.has_param("expires_in")) { | 115 | if(p.has_param("expires_in")) { |
115 | expires_in = util::string_to_long(p.get_param("expires_in")); | 116 | expires_in = util::string_to_long(p.get_param("expires_in")); |
116 | }else if(p.has_param("issued") && p.has_param("expiry")) { | 117 | }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")); | 118 | expires_in = util::w3c_to_time(p.get_param("expiry"))-util::w3c_to_time(p.get_param("issued")); |
118 | }else | 119 | }else |
119 | throw bad_input(OPKELE_CP_ "no expiration information"); | 120 | throw bad_input(OPKELE_CP_ "no expiration information"); |
120 | 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); |
121 | } | 122 | } |
122 | 123 | ||
123 | 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) { |
124 | return checkid_(mode_checkid_immediate,identity,return_to,trust_root,ext); | 125 | return checkid_(mode_checkid_immediate,identity,return_to,trust_root,ext); |
125 | } | 126 | } |
126 | 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) { |
127 | return checkid_(mode_checkid_setup,identity,return_to,trust_root,ext); | 128 | return checkid_(mode_checkid_setup,identity,return_to,trust_root,ext); |
128 | } | 129 | } |
129 | 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) { |
130 | params_t p; | 131 | params_t p; |
131 | if(mode==mode_checkid_immediate) | 132 | if(mode==mode_checkid_immediate) |
132 | p["mode"]="checkid_immediate"; | 133 | p["mode"]="checkid_immediate"; |
133 | else if(mode==mode_checkid_setup) | 134 | else if(mode==mode_checkid_setup) |
134 | p["mode"]="checkid_setup"; | 135 | p["mode"]="checkid_setup"; |
135 | else | 136 | else |
136 | throw bad_input(OPKELE_CP_ "unknown checkid_* mode"); | 137 | throw bad_input(OPKELE_CP_ "unknown checkid_* mode"); |
137 | string iurl = canonicalize(identity); | 138 | string iurl = canonicalize(identity); |
138 | string server, delegate; | 139 | string server, delegate; |
139 | retrieve_links(iurl,server,delegate); | 140 | retrieve_links(iurl,server,delegate); |
140 | p["identity"] = delegate.empty()?iurl:delegate; | 141 | p["identity"] = delegate.empty()?iurl:delegate; |
141 | if(!trust_root.empty()) | 142 | if(!trust_root.empty()) |
142 | p["trust_root"] = trust_root; | 143 | p["trust_root"] = trust_root; |
143 | p["return_to"] = return_to; | 144 | p["return_to"] = return_to; |
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 | } |
151 | if(ext) ext->checkid_hook(p,identity); | 152 | if(ext) ext->checkid_hook(p,identity); |
152 | return p.append_query(server); | 153 | return p.append_query(server); |
153 | } | 154 | } |
154 | 155 | ||
155 | void consumer_t::id_res(const params_t& pin,const string& identity,extension_t *ext) { | 156 | void consumer_t::id_res(const params_t& pin,const string& identity,extension_t *ext) { |
156 | if(pin.has_param("openid.user_setup_url")) | 157 | if(pin.has_param("openid.user_setup_url")) |
157 | throw id_res_setup(OPKELE_CP_ "assertion failed, setup url provided",pin.get_param("openid.user_setup_url")); | 158 | throw id_res_setup(OPKELE_CP_ "assertion failed, setup url provided",pin.get_param("openid.user_setup_url")); |
158 | string server,delegate; | 159 | string server,delegate; |