-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 | |||
@@ -124,56 +124,56 @@ namespace opkele { | |||
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 += ':'; |
@@ -300,17 +300,42 @@ namespace opkele { | |||
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 | |||
@@ -70,57 +70,32 @@ namespace opkele { | |||
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 | } |