-rw-r--r-- | lib/consumer.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/consumer.cc b/lib/consumer.cc index 30a5507..12866f0 100644 --- a/lib/consumer.cc +++ b/lib/consumer.cc | |||
@@ -121,56 +121,54 @@ namespace opkele { | |||
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 { | ||
146 | string ah = find_assoc(server)->handle(); | 145 | string ah = find_assoc(server)->handle(); |
147 | p["assoc_handle"] = ah; | 146 | p["assoc_handle"] = ah; |
148 | }catch(failed_lookup& fl) { | 147 | }catch(failed_lookup& fl) { |
149 | string ah = associate(server)->handle(); | 148 | string ah = associate(server)->handle(); |
150 | p["assoc_handle"] = ah; | 149 | p["assoc_handle"] = ah; |
151 | } | 150 | } |
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."); |