summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2008-02-03 20:12:50 (UTC)
committer Michael Krelin <hacker@klever.net>2008-02-03 20:12:50 (UTC)
commitc0eeee1cfd41d0f5f6ff6ac3d6fe021421376a69 (patch) (unidiff)
tree56e8cfa835f63d1c9f9938ff851d54dbbad0b861
parent7ee5acb351f43fa650de138f8d2a3bda73ab27a0 (diff)
downloadlibopkele-c0eeee1cfd41d0f5f6ff6ac3d6fe021421376a69.zip
libopkele-c0eeee1cfd41d0f5f6ff6ac3d6fe021421376a69.tar.gz
libopkele-c0eeee1cfd41d0f5f6ff6ac3d6fe021421376a69.tar.bz2
openid 1 compatibility fix in OP
I shouldn't be failing if there's no claimed_id field for OpenID 1 request. Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--lib/basic_op.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/basic_op.cc b/lib/basic_op.cc
index 11ffb48..c89d1d7 100644
--- a/lib/basic_op.cc
+++ b/lib/basic_op.cc
@@ -164,48 +164,49 @@ namespace opkele {
164 if(return_to.empty()) 164 if(return_to.empty())
165 throw bad_input(OPKELE_CP_ 165 throw bad_input(OPKELE_CP_
166 "Both realm and return_to are unset"); 166 "Both realm and return_to are unset");
167 realm = return_to; 167 realm = return_to;
168 } 168 }
169 } 169 }
170 }else{ 170 }else{
171 try { 171 try {
172 realm = inm.get_field("trust_root"); 172 realm = inm.get_field("trust_root");
173 }catch(failed_lookup&) { 173 }catch(failed_lookup&) {
174 if(return_to.empty()) 174 if(return_to.empty())
175 throw bad_input(OPKELE_CP_ 175 throw bad_input(OPKELE_CP_
176 "Both realm and return_to are unset"); 176 "Both realm and return_to are unset");
177 realm = return_to; 177 realm = return_to;
178 } 178 }
179 } 179 }
180 try { 180 try {
181 identity = inm.get_field("identity"); 181 identity = inm.get_field("identity");
182 try { 182 try {
183 claimed_id = inm.get_field("claimed_id"); 183 claimed_id = inm.get_field("claimed_id");
184 }catch(failed_lookup&) { 184 }catch(failed_lookup&) {
185 if(openid2) 185 if(openid2)
186 throw bad_input(OPKELE_CP_ 186 throw bad_input(OPKELE_CP_
187 "claimed_id and identity must be either both present or both absent"); 187 "claimed_id and identity must be either both present or both absent");
188 claimed_id = identity;
188 } 189 }
189 }catch(failed_lookup&) { 190 }catch(failed_lookup&) {
190 if(openid2 && inm.has_field("claimed_id")) 191 if(openid2 && inm.has_field("claimed_id"))
191 throw bad_input(OPKELE_CP_ 192 throw bad_input(OPKELE_CP_
192 "claimed_id and identity must be either both present or both absent"); 193 "claimed_id and identity must be either both present or both absent");
193 } 194 }
194 verify_return_to(); 195 verify_return_to();
195 } 196 }
196 197
197 basic_openid_message& basic_op::id_res(basic_openid_message& om) { 198 basic_openid_message& basic_op::id_res(basic_openid_message& om) {
198 assert(assoc); 199 assert(assoc);
199 assert(!return_to.empty()); 200 assert(!return_to.empty());
200 assert(!is_id_select()); 201 assert(!is_id_select());
201 time_t now = time(0); 202 time_t now = time(0);
202 struct tm gmt; gmtime_r(&now,&gmt); 203 struct tm gmt; gmtime_r(&now,&gmt);
203 char w3timestr[24]; 204 char w3timestr[24];
204 if(!strftime(w3timestr,sizeof(w3timestr),"%Y-%m-%dT%H:%M:%SZ",&gmt)) 205 if(!strftime(w3timestr,sizeof(w3timestr),"%Y-%m-%dT%H:%M:%SZ",&gmt))
205 throw failed_conversion(OPKELE_CP_ 206 throw failed_conversion(OPKELE_CP_
206 "Failed to build time string for nonce" ); 207 "Failed to build time string for nonce" );
207 om.set_field("ns",OIURI_OPENID20); 208 om.set_field("ns",OIURI_OPENID20);
208 om.set_field("mode","id_res"); 209 om.set_field("mode","id_res");
209 om.set_field("op_endpoint",get_op_endpoint()); 210 om.set_field("op_endpoint",get_op_endpoint());
210 string ats = "ns,mode,op_endpoint,return_to,response_nonce," 211 string ats = "ns,mode,op_endpoint,return_to,response_nonce,"
211 "assoc_handle,signed"; 212 "assoc_handle,signed";