-rw-r--r-- | lib/util.cc | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/lib/util.cc b/lib/util.cc index b7bc437..b85a377 100644 --- a/lib/util.cc +++ b/lib/util.cc | |||
@@ -1,402 +1,432 @@ | |||
1 | #include <errno.h> | 1 | #include <errno.h> |
2 | #include <cassert> | 2 | #include <cassert> |
3 | #include <cctype> | 3 | #include <cctype> |
4 | #include <cstring> | 4 | #include <cstring> |
5 | #include <vector> | 5 | #include <vector> |
6 | #include <string> | 6 | #include <string> |
7 | #include <stack> | 7 | #include <stack> |
8 | #include <algorithm> | ||
8 | #include <openssl/bio.h> | 9 | #include <openssl/bio.h> |
9 | #include <openssl/evp.h> | 10 | #include <openssl/evp.h> |
10 | #include <openssl/hmac.h> | 11 | #include <openssl/hmac.h> |
11 | #include <curl/curl.h> | 12 | #include <curl/curl.h> |
12 | #include "opkele/util.h" | 13 | #include "opkele/util.h" |
13 | #include "opkele/exception.h" | 14 | #include "opkele/exception.h" |
14 | 15 | ||
15 | #include <config.h> | 16 | #include <config.h> |
16 | #ifdef HAVE_DEMANGLE | 17 | #ifdef HAVE_DEMANGLE |
17 | # include <cxxabi.h> | 18 | # include <cxxabi.h> |
18 | #endif | 19 | #endif |
19 | 20 | ||
20 | namespace opkele { | 21 | namespace opkele { |
21 | using namespace std; | 22 | using namespace std; |
22 | 23 | ||
23 | namespace util { | 24 | namespace util { |
24 | 25 | ||
25 | /* | 26 | /* |
26 | * base64 | 27 | * base64 |
27 | */ | 28 | */ |
28 | string encode_base64(const void *data,size_t length) { | 29 | string encode_base64(const void *data,size_t length) { |
29 | BIO *b64 = 0, *bmem = 0; | 30 | BIO *b64 = 0, *bmem = 0; |
30 | try { | 31 | try { |
31 | b64 = BIO_new(BIO_f_base64()); | 32 | b64 = BIO_new(BIO_f_base64()); |
32 | if(!b64) | 33 | if(!b64) |
33 | throw exception_openssl(OPKELE_CP_ "failed to BIO_new() base64 encoder"); | 34 | throw exception_openssl(OPKELE_CP_ "failed to BIO_new() base64 encoder"); |
34 | BIO_set_flags(b64,BIO_FLAGS_BASE64_NO_NL); | 35 | BIO_set_flags(b64,BIO_FLAGS_BASE64_NO_NL); |
35 | bmem = BIO_new(BIO_s_mem()); | 36 | bmem = BIO_new(BIO_s_mem()); |
36 | BIO_set_flags(b64,BIO_CLOSE); | 37 | BIO_set_flags(b64,BIO_CLOSE); |
37 | if(!bmem) | 38 | if(!bmem) |
38 | throw exception_openssl(OPKELE_CP_ "failed to BIO_new() memory buffer"); | 39 | throw exception_openssl(OPKELE_CP_ "failed to BIO_new() memory buffer"); |
39 | BIO_push(b64,bmem); | 40 | BIO_push(b64,bmem); |
40 | if(((size_t)BIO_write(b64,data,length))!=length) | 41 | if(((size_t)BIO_write(b64,data,length))!=length) |
41 | throw exception_openssl(OPKELE_CP_ "failed to BIO_write()"); | 42 | throw exception_openssl(OPKELE_CP_ "failed to BIO_write()"); |
42 | if(BIO_flush(b64)!=1) | 43 | if(BIO_flush(b64)!=1) |
43 | throw exception_openssl(OPKELE_CP_ "failed to BIO_flush()"); | 44 | throw exception_openssl(OPKELE_CP_ "failed to BIO_flush()"); |
44 | char *rvd; | 45 | char *rvd; |
45 | long rvl = BIO_get_mem_data(bmem,&rvd); | 46 | long rvl = BIO_get_mem_data(bmem,&rvd); |
46 | string rv(rvd,rvl); | 47 | string rv(rvd,rvl); |
47 | BIO_free_all(b64); | 48 | BIO_free_all(b64); |
48 | return rv; | 49 | return rv; |
49 | }catch(...) { | 50 | }catch(...) { |
50 | if(b64) BIO_free_all(b64); | 51 | if(b64) BIO_free_all(b64); |
51 | throw; | 52 | throw; |
52 | } | 53 | } |
53 | } | 54 | } |
54 | 55 | ||
55 | void decode_base64(const string& data,vector<unsigned char>& rv) { | 56 | void decode_base64(const string& data,vector<unsigned char>& rv) { |
56 | BIO *b64 = 0, *bmem = 0; | 57 | BIO *b64 = 0, *bmem = 0; |
57 | rv.clear(); | 58 | rv.clear(); |
58 | try { | 59 | try { |
59 | bmem = BIO_new_mem_buf((void*)data.data(),data.size()); | 60 | bmem = BIO_new_mem_buf((void*)data.data(),data.size()); |
60 | if(!bmem) | 61 | if(!bmem) |
61 | throw exception_openssl(OPKELE_CP_ "failed to BIO_new_mem_buf()"); | 62 | throw exception_openssl(OPKELE_CP_ "failed to BIO_new_mem_buf()"); |
62 | b64 = BIO_new(BIO_f_base64()); | 63 | b64 = BIO_new(BIO_f_base64()); |
63 | if(!b64) | 64 | if(!b64) |
64 | throw exception_openssl(OPKELE_CP_ "failed to BIO_new() base64 decoder"); | 65 | throw exception_openssl(OPKELE_CP_ "failed to BIO_new() base64 decoder"); |
65 | BIO_set_flags(b64,BIO_FLAGS_BASE64_NO_NL); | 66 | BIO_set_flags(b64,BIO_FLAGS_BASE64_NO_NL); |
66 | BIO_push(b64,bmem); | 67 | BIO_push(b64,bmem); |
67 | unsigned char tmp[512]; | 68 | unsigned char tmp[512]; |
68 | size_t rb = 0; | 69 | size_t rb = 0; |
69 | while((rb=BIO_read(b64,tmp,sizeof(tmp)))>0) | 70 | while((rb=BIO_read(b64,tmp,sizeof(tmp)))>0) |
70 | rv.insert(rv.end(),tmp,&tmp[rb]); | 71 | rv.insert(rv.end(),tmp,&tmp[rb]); |
71 | BIO_free_all(b64); | 72 | BIO_free_all(b64); |
72 | }catch(...) { | 73 | }catch(...) { |
73 | if(b64) BIO_free_all(b64); | 74 | if(b64) BIO_free_all(b64); |
74 | throw; | 75 | throw; |
75 | } | 76 | } |
76 | } | 77 | } |
77 | 78 | ||
78 | /* | 79 | /* |
79 | * big numerics | 80 | * big numerics |
80 | */ | 81 | */ |
81 | 82 | ||
82 | BIGNUM *base64_to_bignum(const string& b64) { | 83 | BIGNUM *base64_to_bignum(const string& b64) { |
83 | vector<unsigned char> bin; | 84 | vector<unsigned char> bin; |
84 | decode_base64(b64,bin); | 85 | decode_base64(b64,bin); |
85 | BIGNUM *rv = BN_bin2bn(&(bin.front()),bin.size(),0); | 86 | BIGNUM *rv = BN_bin2bn(&(bin.front()),bin.size(),0); |
86 | if(!rv) | 87 | if(!rv) |
87 | throw failed_conversion(OPKELE_CP_ "failed to BN_bin2bn()"); | 88 | throw failed_conversion(OPKELE_CP_ "failed to BN_bin2bn()"); |
88 | return rv; | 89 | return rv; |
89 | } | 90 | } |
90 | 91 | ||
91 | BIGNUM *dec_to_bignum(const string& dec) { | 92 | BIGNUM *dec_to_bignum(const string& dec) { |
92 | BIGNUM *rv = 0; | 93 | BIGNUM *rv = 0; |
93 | if(!BN_dec2bn(&rv,dec.c_str())) | 94 | if(!BN_dec2bn(&rv,dec.c_str())) |
94 | throw failed_conversion(OPKELE_CP_ "failed to BN_dec2bn()"); | 95 | throw failed_conversion(OPKELE_CP_ "failed to BN_dec2bn()"); |
95 | return rv; | 96 | return rv; |
96 | } | 97 | } |
97 | 98 | ||
98 | string bignum_to_base64(const BIGNUM *bn) { | 99 | string bignum_to_base64(const BIGNUM *bn) { |
99 | vector<unsigned char> bin(BN_num_bytes(bn)+1); | 100 | vector<unsigned char> bin(BN_num_bytes(bn)+1); |
100 | unsigned char *binptr = &(bin.front())+1; | 101 | unsigned char *binptr = &(bin.front())+1; |
101 | int l = BN_bn2bin(bn,binptr); | 102 | int l = BN_bn2bin(bn,binptr); |
102 | if(l && (*binptr)&0x80){ | 103 | if(l && (*binptr)&0x80){ |
103 | (*(--binptr)) = 0; ++l; | 104 | (*(--binptr)) = 0; ++l; |
104 | } | 105 | } |
105 | return encode_base64(binptr,l); | 106 | return encode_base64(binptr,l); |
106 | } | 107 | } |
107 | 108 | ||
108 | /* | 109 | /* |
109 | * w3c times | 110 | * w3c times |
110 | */ | 111 | */ |
111 | 112 | ||
112 | string time_to_w3c(time_t t) { | 113 | string time_to_w3c(time_t t) { |
113 | struct tm tm_t; | 114 | struct tm tm_t; |
114 | if(!gmtime_r(&t,&tm_t)) | 115 | if(!gmtime_r(&t,&tm_t)) |
115 | throw failed_conversion(OPKELE_CP_ "failed to BN_dec2bn()"); | 116 | throw failed_conversion(OPKELE_CP_ "failed to BN_dec2bn()"); |
116 | char rv[25]; | 117 | char rv[25]; |
117 | if(!strftime(rv,sizeof(rv)-1,"%Y-%m-%dT%H:%M:%SZ",&tm_t)) | 118 | if(!strftime(rv,sizeof(rv)-1,"%Y-%m-%dT%H:%M:%SZ",&tm_t)) |
118 | throw failed_conversion(OPKELE_CP_ "failed to strftime()"); | 119 | throw failed_conversion(OPKELE_CP_ "failed to strftime()"); |
119 | return rv; | 120 | return rv; |
120 | } | 121 | } |
121 | 122 | ||
122 | time_t w3c_to_time(const string& w) { | 123 | time_t w3c_to_time(const string& w) { |
123 | int fraction; | 124 | int fraction; |
124 | struct tm tm_t; | 125 | struct tm tm_t; |
125 | memset(&tm_t,0,sizeof(tm_t)); | 126 | memset(&tm_t,0,sizeof(tm_t)); |
126 | if( ( | 127 | if( ( |
127 | sscanf( | 128 | sscanf( |
128 | w.c_str(), | 129 | w.c_str(), |
129 | "%04d-%02d-%02dT%02d:%02d:%02dZ", | 130 | "%04d-%02d-%02dT%02d:%02d:%02dZ", |
130 | &tm_t.tm_year,&tm_t.tm_mon,&tm_t.tm_mday, | 131 | &tm_t.tm_year,&tm_t.tm_mon,&tm_t.tm_mday, |
131 | &tm_t.tm_hour,&tm_t.tm_min,&tm_t.tm_sec | 132 | &tm_t.tm_hour,&tm_t.tm_min,&tm_t.tm_sec |
132 | ) != 6 | 133 | ) != 6 |
133 | ) && ( | 134 | ) && ( |
134 | sscanf( | 135 | sscanf( |
135 | w.c_str(), | 136 | w.c_str(), |
136 | "%04d-%02d-%02dT%02d:%02d:%02d.%03dZ", | 137 | "%04d-%02d-%02dT%02d:%02d:%02d.%03dZ", |
137 | &tm_t.tm_year,&tm_t.tm_mon,&tm_t.tm_mday, | 138 | &tm_t.tm_year,&tm_t.tm_mon,&tm_t.tm_mday, |
138 | &tm_t.tm_hour,&tm_t.tm_min,&tm_t.tm_sec, | 139 | &tm_t.tm_hour,&tm_t.tm_min,&tm_t.tm_sec, |
139 | &fraction | 140 | &fraction |
140 | ) != 7 | 141 | ) != 7 |
141 | ) ) | 142 | ) ) |
142 | throw failed_conversion(OPKELE_CP_ "failed to sscanf()"); | 143 | throw failed_conversion(OPKELE_CP_ "failed to sscanf()"); |
143 | tm_t.tm_mon--; | 144 | tm_t.tm_mon--; |
144 | tm_t.tm_year-=1900; | 145 | tm_t.tm_year-=1900; |
145 | time_t rv = mktime(&tm_t); | 146 | time_t rv = mktime(&tm_t); |
146 | if(rv==(time_t)-1) | 147 | if(rv==(time_t)-1) |
147 | throw failed_conversion(OPKELE_CP_ "failed to mktime()"); | 148 | throw failed_conversion(OPKELE_CP_ "failed to mktime()"); |
148 | return rv-timezone; | 149 | return rv-timezone; |
149 | } | 150 | } |
150 | 151 | ||
151 | /* | 152 | /* |
152 | * | 153 | * |
153 | */ | 154 | */ |
154 | 155 | ||
155 | string url_encode(const string& str) { | 156 | string url_encode(const string& str) { |
156 | char * t = curl_escape(str.c_str(),str.length()); | 157 | char * t = curl_escape(str.c_str(),str.length()); |
157 | if(!t) | 158 | if(!t) |
158 | throw failed_conversion(OPKELE_CP_ "failed to curl_escape()"); | 159 | throw failed_conversion(OPKELE_CP_ "failed to curl_escape()"); |
159 | string rv(t); | 160 | string rv(t); |
160 | curl_free(t); | 161 | curl_free(t); |
161 | return rv; | 162 | return rv; |
162 | } | 163 | } |
163 | 164 | ||
164 | string attr_escape(const string& str) { | 165 | string attr_escape(const string& str) { |
165 | static const char *unsafechars = "<>&\n\"'"; | 166 | static const char *unsafechars = "<>&\n\"'"; |
166 | string rv; | 167 | string rv; |
167 | string::size_type p=0; | 168 | string::size_type p=0; |
168 | while(true) { | 169 | while(true) { |
169 | string::size_type us = str.find_first_of(unsafechars,p); | 170 | string::size_type us = str.find_first_of(unsafechars,p); |
170 | if(us==string::npos) { | 171 | if(us==string::npos) { |
171 | if(p!=str.length()) | 172 | if(p!=str.length()) |
172 | rv.append(str,p,str.length()-p); | 173 | rv.append(str,p,str.length()-p); |
173 | return rv; | 174 | return rv; |
174 | } | 175 | } |
175 | rv.append(str,p,us-p); | 176 | rv.append(str,p,us-p); |
176 | rv += "&#"; | 177 | rv += "&#"; |
177 | rv += long_to_string((long)str[us]); | 178 | rv += long_to_string((long)str[us]); |
178 | rv += ';'; | 179 | rv += ';'; |
179 | p = us+1; | 180 | p = us+1; |
180 | } | 181 | } |
181 | } | 182 | } |
182 | 183 | ||
183 | string long_to_string(long l) { | 184 | string long_to_string(long l) { |
184 | char rv[32]; | 185 | char rv[32]; |
185 | int r=snprintf(rv,sizeof(rv),"%ld",l); | 186 | int r=snprintf(rv,sizeof(rv),"%ld",l); |
186 | if(r<0 || r>=(int)sizeof(rv)) | 187 | if(r<0 || r>=(int)sizeof(rv)) |
187 | throw failed_conversion(OPKELE_CP_ "failed to snprintf()"); | 188 | throw failed_conversion(OPKELE_CP_ "failed to snprintf()"); |
188 | return rv; | 189 | return rv; |
189 | } | 190 | } |
190 | 191 | ||
191 | long string_to_long(const string& s) { | 192 | long string_to_long(const string& s) { |
192 | char *endptr = 0; | 193 | char *endptr = 0; |
193 | long rv = strtol(s.c_str(),&endptr,10); | 194 | long rv = strtol(s.c_str(),&endptr,10); |
194 | if((!endptr) || endptr==s.c_str()) | 195 | if((!endptr) || endptr==s.c_str()) |
195 | throw failed_conversion(OPKELE_CP_ "failed to strtol()"); | 196 | throw failed_conversion(OPKELE_CP_ "failed to strtol()"); |
196 | return rv; | 197 | return rv; |
197 | } | 198 | } |
198 | 199 | ||
199 | /* | 200 | /* |
200 | * Normalize URL according to the rules, described in rfc 3986, section 6 | 201 | * Normalize URL according to the rules, described in rfc 3986, section 6 |
201 | * | 202 | * |
202 | * - uppercase hex triplets (e.g. %ab -> %AB) | 203 | * - uppercase hex triplets (e.g. %ab -> %AB) |
203 | * - lowercase scheme and host | 204 | * - lowercase scheme and host |
204 | * - decode %-encoded characters, specified as unreserved in rfc 3986, section 2.3, | 205 | * - decode %-encoded characters, specified as unreserved in rfc 3986, section 2.3, |
205 | * that is - [:alpha:][:digit:]._~- | 206 | * that is - [:alpha:][:digit:]._~- |
206 | * - remove dot segments | 207 | * - remove dot segments |
207 | * - remove empty and default ports | 208 | * - remove empty and default ports |
208 | * - if there's no path component, add '/' | 209 | * - if there's no path component, add '/' |
209 | */ | 210 | */ |
210 | string rfc_3986_normalize_uri(const string& uri) { | 211 | string rfc_3986_normalize_uri(const string& uri) { |
211 | static const char *whitespace = " \t\r\n"; | 212 | static const char *whitespace = " \t\r\n"; |
212 | string rv; | 213 | string rv; |
213 | string::size_type ns = uri.find_first_not_of(whitespace); | 214 | string::size_type ns = uri.find_first_not_of(whitespace); |
214 | if(ns==string::npos) | 215 | if(ns==string::npos) |
215 | throw bad_input(OPKELE_CP_ "Can't normalize empty URI"); | 216 | throw bad_input(OPKELE_CP_ "Can't normalize empty URI"); |
216 | string::size_type colon = uri.find(':',ns); | 217 | string::size_type colon = uri.find(':',ns); |
217 | if(colon==string::npos) | 218 | if(colon==string::npos) |
218 | throw bad_input(OPKELE_CP_ "No scheme specified in URI"); | 219 | throw bad_input(OPKELE_CP_ "No scheme specified in URI"); |
219 | transform( | 220 | transform( |
220 | uri.begin()+ns, uri.begin()+colon+1, | 221 | uri.begin()+ns, uri.begin()+colon+1, |
221 | back_inserter(rv), ::tolower ); | 222 | back_inserter(rv), ::tolower ); |
222 | bool s; | 223 | bool s; |
223 | string::size_type ul = uri.find_last_not_of(whitespace)+1; | 224 | string::size_type ul = uri.find_last_not_of(whitespace)+1; |
224 | if(ul <= (colon+3)) | 225 | if(ul <= (colon+3)) |
225 | throw bad_input(OPKELE_CP_ "Unexpected end of URI being normalized encountered"); | 226 | throw bad_input(OPKELE_CP_ "Unexpected end of URI being normalized encountered"); |
226 | if(uri[colon+1]!='/' || uri[colon+2]!='/') | 227 | if(uri[colon+1]!='/' || uri[colon+2]!='/') |
227 | throw bad_input(OPKELE_CP_ "Unexpected input in URI being normalized after scheme component"); | 228 | throw bad_input(OPKELE_CP_ "Unexpected input in URI being normalized after scheme component"); |
228 | if(rv=="http:") | 229 | if(rv=="http:") |
229 | s = false; | 230 | s = false; |
230 | else if(rv=="https:") | 231 | else if(rv=="https:") |
231 | s = true; | 232 | s = true; |
232 | else{ | 233 | else{ |
233 | /* TODO: support more schemes. e.g. xri. How do we normalize | 234 | /* TODO: support more schemes. e.g. xri. How do we normalize |
234 | * xri? | 235 | * xri? |
235 | */ | 236 | */ |
236 | rv.append(uri,colon+1,ul-colon-1); | 237 | rv.append(uri,colon+1,ul-colon-1); |
237 | return rv; | 238 | return rv; |
238 | } | 239 | } |
239 | rv += "//"; | 240 | rv += "//"; |
240 | string::size_type interesting = uri.find_first_of(":/#?",colon+3); | 241 | string::size_type interesting = uri.find_first_of(":/#?",colon+3); |
241 | if(interesting==string::npos) { | 242 | if(interesting==string::npos) { |
242 | transform( | 243 | transform( |
243 | uri.begin()+colon+3,uri.begin()+ul, | 244 | uri.begin()+colon+3,uri.begin()+ul, |
244 | back_inserter(rv), ::tolower ); | 245 | back_inserter(rv), ::tolower ); |
245 | rv += '/'; return rv; | 246 | rv += '/'; return rv; |
246 | } | 247 | } |
247 | transform( | 248 | transform( |
248 | uri.begin()+colon+3,uri.begin()+interesting, | 249 | uri.begin()+colon+3,uri.begin()+interesting, |
249 | back_inserter(rv), ::tolower ); | 250 | back_inserter(rv), ::tolower ); |
250 | bool qf = false; | 251 | bool qf = false; |
251 | char ic = uri[interesting]; | 252 | char ic = uri[interesting]; |
252 | if(ic==':') { | 253 | if(ic==':') { |
253 | string::size_type ni = uri.find_first_of("/#?%",interesting+1); | 254 | string::size_type ni = uri.find_first_of("/#?%",interesting+1); |
254 | const char *nptr = uri.data()+interesting+1; | 255 | const char *nptr = uri.data()+interesting+1; |
255 | char *eptr = 0; | 256 | char *eptr = 0; |
256 | long port = strtol(nptr,&eptr,10); | 257 | long port = strtol(nptr,&eptr,10); |
257 | if( (port>0) && (port<65535) && port!=(s?443:80) ) { | 258 | if( (port>0) && (port<65535) && port!=(s?443:80) ) { |
258 | char tmp[8]; | 259 | char tmp[8]; |
259 | snprintf(tmp,sizeof(tmp),":%ld",port); | 260 | snprintf(tmp,sizeof(tmp),":%ld",port); |
260 | rv += tmp; | 261 | rv += tmp; |
261 | } | 262 | } |
262 | if(ni==string::npos) { | 263 | if(ni==string::npos) { |
263 | rv += '/'; return rv; | 264 | rv += '/'; return rv; |
264 | } | 265 | } |
265 | interesting = ni; | 266 | interesting = ni; |
266 | }else if(ic!='/') { | 267 | }else if(ic!='/') { |
267 | rv += '/'; rv += ic; | 268 | rv += '/'; rv += ic; |
268 | qf = true; | 269 | qf = true; |
269 | ++interesting; | 270 | ++interesting; |
270 | } | 271 | } |
271 | string::size_type n = interesting; | 272 | string::size_type n = interesting; |
272 | char tmp[3] = { 0,0,0 }; | 273 | char tmp[3] = { 0,0,0 }; |
273 | stack<string::size_type> psegs; psegs.push(rv.length()); | 274 | stack<string::size_type> psegs; psegs.push(rv.length()); |
274 | string pseg; | 275 | string pseg; |
275 | for(;n<ul;) { | 276 | for(;n<ul;) { |
276 | string::size_type unsafe = uri.find_first_of(qf?"%":"%/?#",n); | 277 | string::size_type unsafe = uri.find_first_of(qf?"%":"%/?#",n); |
277 | if(unsafe==string::npos) { | 278 | if(unsafe==string::npos) { |
278 | pseg.append(uri,n,ul-n-1); n = ul-1; | 279 | pseg.append(uri,n,ul-n-1); n = ul-1; |
279 | }else{ | 280 | }else{ |
280 | pseg.append(uri,n,unsafe-n); | 281 | pseg.append(uri,n,unsafe-n); |
281 | n = unsafe; | 282 | n = unsafe; |
282 | } | 283 | } |
283 | char c = uri[n++]; | 284 | char c = uri[n++]; |
284 | if(c=='%') { | 285 | if(c=='%') { |
285 | if((n+1)>=ul) | 286 | if((n+1)>=ul) |
286 | throw bad_input(OPKELE_CP_ "Unexpected end of URI encountered while parsing percent-encoded character"); | 287 | throw bad_input(OPKELE_CP_ "Unexpected end of URI encountered while parsing percent-encoded character"); |
287 | tmp[0] = uri[n++]; | 288 | tmp[0] = uri[n++]; |
288 | tmp[1] = uri[n++]; | 289 | tmp[1] = uri[n++]; |
289 | if(!( isxdigit(tmp[0]) && isxdigit(tmp[1]) )) | 290 | if(!( isxdigit(tmp[0]) && isxdigit(tmp[1]) )) |
290 | throw bad_input(OPKELE_CP_ "Invalid percent-encoded character in URI being normalized"); | 291 | throw bad_input(OPKELE_CP_ "Invalid percent-encoded character in URI being normalized"); |
291 | int cc = strtol(tmp,0,16); | 292 | int cc = strtol(tmp,0,16); |
292 | if( isalpha(cc) || isdigit(cc) || strchr("._~-",cc) ) | 293 | if( isalpha(cc) || isdigit(cc) || strchr("._~-",cc) ) |
293 | pseg += cc; | 294 | pseg += cc; |
294 | else{ | 295 | else{ |
295 | pseg += '%'; | 296 | pseg += '%'; |
296 | pseg += toupper(tmp[0]); pseg += toupper(tmp[1]); | 297 | pseg += toupper(tmp[0]); pseg += toupper(tmp[1]); |
297 | } | 298 | } |
298 | }else if(qf) { | 299 | }else if(qf) { |
299 | rv += pseg; rv += c; | 300 | rv += pseg; rv += c; |
300 | pseg.clear(); | 301 | pseg.clear(); |
301 | }else if(n>=ul || strchr("?/#",c)) { | 302 | }else if(n>=ul || strchr("?/#",c)) { |
302 | if(pseg.empty() || pseg==".") { | 303 | if(pseg.empty() || pseg==".") { |
303 | }else if(pseg=="..") { | 304 | }else if(pseg=="..") { |
304 | if(psegs.size()>1) { | 305 | if(psegs.size()>1) { |
305 | rv.resize(psegs.top()); psegs.pop(); | 306 | rv.resize(psegs.top()); psegs.pop(); |
306 | } | 307 | } |
307 | }else{ | 308 | }else{ |
308 | psegs.push(rv.length()); | 309 | psegs.push(rv.length()); |
309 | if(c!='/') { | 310 | if(c!='/') { |
310 | pseg += c; | 311 | pseg += c; |
311 | qf = true; | 312 | qf = true; |
312 | } | 313 | } |
313 | rv += '/'; rv += pseg; | 314 | rv += '/'; rv += pseg; |
314 | } | 315 | } |
315 | if(c=='/' && (n>=ul || strchr("?#",uri[n])) ) { | 316 | if(c=='/' && (n>=ul || strchr("?#",uri[n])) ) { |
316 | rv += '/'; | 317 | rv += '/'; |
317 | if(n<ul) | 318 | if(n<ul) |
318 | qf = true; | 319 | qf = true; |
319 | }else if(strchr("?#",c)) { | 320 | }else if(strchr("?#",c)) { |
320 | if(psegs.size()==1 && psegs.top()==rv.length()) | 321 | if(psegs.size()==1 && psegs.top()==rv.length()) |
321 | rv += '/'; | 322 | rv += '/'; |
322 | if(pseg.empty()) | 323 | if(pseg.empty()) |
323 | rv += c; | 324 | rv += c; |
324 | qf = true; | 325 | qf = true; |
325 | } | 326 | } |
326 | pseg.clear(); | 327 | pseg.clear(); |
327 | }else{ | 328 | }else{ |
328 | pseg += c; | 329 | pseg += c; |
329 | } | 330 | } |
330 | } | 331 | } |
331 | if(!pseg.empty()) { | 332 | if(!pseg.empty()) { |
332 | if(!qf) rv += '/'; | 333 | if(!qf) rv += '/'; |
333 | rv += pseg; | 334 | rv += pseg; |
334 | } | 335 | } |
335 | return rv; | 336 | return rv; |
336 | } | 337 | } |
337 | 338 | ||
338 | string& strip_uri_fragment_part(string& u) { | 339 | string& strip_uri_fragment_part(string& u) { |
339 | string::size_type q = u.find('?'), f = u.find('#'); | 340 | string::size_type q = u.find('?'), f = u.find('#'); |
340 | if(q==string::npos) { | 341 | if(q==string::npos) { |
341 | if(f!=string::npos) | 342 | if(f!=string::npos) |
342 | u.erase(f); | 343 | u.erase(f); |
343 | }else{ | 344 | }else{ |
344 | if(f!=string::npos) { | 345 | if(f!=string::npos) { |
345 | if(f<q) | 346 | if(f<q) |
346 | u.erase(f,q-f); | 347 | u.erase(f,q-f); |
347 | else | 348 | else |
348 | u.erase(f); | 349 | u.erase(f); |
349 | } | 350 | } |
350 | } | 351 | } |
351 | return u; | 352 | return u; |
352 | } | 353 | } |
353 | 354 | ||
355 | bool uri_matches_realm(const string& uri,const string& realm) { | ||
356 | string nrealm = opkele::util::rfc_3986_normalize_uri(realm); | ||
357 | string nu = opkele::util::rfc_3986_normalize_uri(uri); | ||
358 | string::size_type pr = nrealm.find("://"); | ||
359 | string::size_type pu = nu.find("://"); | ||
360 | assert(!(pr==string::npos || pu==string::npos)); | ||
361 | pr += sizeof("://")-1; | ||
362 | pu += sizeof("://")-1; | ||
363 | if(!strncmp(nrealm.c_str()+pr,"*.",2)) { | ||
364 | pr = nrealm.find('.',pr); | ||
365 | pu = nu.find('.',pu); | ||
366 | assert(pr!=string::npos); | ||
367 | if(pu==string::npos) | ||
368 | return false; | ||
369 | // TODO: check for overgeneralized realm | ||
370 | } | ||
371 | string::size_type lr = nrealm.length(); | ||
372 | string::size_type lu = nu.length(); | ||
373 | if( (lu-pu) < (lr-pr) ) | ||
374 | return false; | ||
375 | pair<const char*,const char*> mp = mismatch( | ||
376 | nrealm.c_str()+pr,nrealm.c_str()+lr, | ||
377 | nu.c_str()+pu); | ||
378 | if( (*(mp.first-1))!='/' | ||
379 | && !strchr("/?#",*mp.second) ) | ||
380 | return false; | ||
381 | return true; | ||
382 | } | ||
383 | |||
354 | string abi_demangle(const char *mn) { | 384 | string abi_demangle(const char *mn) { |
355 | #ifndef HAVE_DEMANGLE | 385 | #ifndef HAVE_DEMANGLE |
356 | return mn; | 386 | return mn; |
357 | #else /* !HAVE_DEMANGLE */ | 387 | #else /* !HAVE_DEMANGLE */ |
358 | int dstat; | 388 | int dstat; |
359 | char *demangled = abi::__cxa_demangle(mn,0,0,&dstat); | 389 | char *demangled = abi::__cxa_demangle(mn,0,0,&dstat); |
360 | if(dstat) | 390 | if(dstat) |
361 | return mn; | 391 | return mn; |
362 | string rv = demangled; | 392 | string rv = demangled; |
363 | free(demangled); | 393 | free(demangled); |
364 | return rv; | 394 | return rv; |
365 | #endif /* !HAVE_DEMANGLE */ | 395 | #endif /* !HAVE_DEMANGLE */ |
366 | } | 396 | } |
367 | 397 | ||
368 | string base64_signature(const assoc_t& assoc,const basic_openid_message& om) { | 398 | string base64_signature(const assoc_t& assoc,const basic_openid_message& om) { |
369 | const string& slist = om.get_field("signed"); | 399 | const string& slist = om.get_field("signed"); |
370 | string kv; | 400 | string kv; |
371 | string::size_type p=0; | 401 | string::size_type p=0; |
372 | while(true) { | 402 | while(true) { |
373 | string::size_type co = slist.find(',',p); | 403 | string::size_type co = slist.find(',',p); |
374 | string f = (co==string::npos) | 404 | string f = (co==string::npos) |
375 | ?slist.substr(p):slist.substr(p,co-p); | 405 | ?slist.substr(p):slist.substr(p,co-p); |
376 | kv += f; | 406 | kv += f; |
377 | kv += ':'; | 407 | kv += ':'; |
378 | kv += om.get_field(f); | 408 | kv += om.get_field(f); |
379 | kv += '\n'; | 409 | kv += '\n'; |
380 | if(co==string::npos) break; | 410 | if(co==string::npos) break; |
381 | p = co+1; | 411 | p = co+1; |
382 | } | 412 | } |
383 | const secret_t& secret = assoc->secret(); | 413 | const secret_t& secret = assoc->secret(); |
384 | const EVP_MD *evpmd; | 414 | const EVP_MD *evpmd; |
385 | const string& at = assoc->assoc_type(); | 415 | const string& at = assoc->assoc_type(); |
386 | if(at=="HMAC-SHA256") | 416 | if(at=="HMAC-SHA256") |
387 | evpmd = EVP_sha256(); | 417 | evpmd = EVP_sha256(); |
388 | else if(at=="HMAC-SHA1") | 418 | else if(at=="HMAC-SHA1") |
389 | evpmd = EVP_sha1(); | 419 | evpmd = EVP_sha1(); |
390 | else | 420 | else |
391 | throw unsupported(OPKELE_CP_ "unknown association type"); | 421 | throw unsupported(OPKELE_CP_ "unknown association type"); |
392 | unsigned int md_len = 0; | 422 | unsigned int md_len = 0; |
393 | unsigned char *md = HMAC(evpmd, | 423 | unsigned char *md = HMAC(evpmd, |
394 | &(secret.front()),secret.size(), | 424 | &(secret.front()),secret.size(), |
395 | (const unsigned char*)kv.data(),kv.length(), | 425 | (const unsigned char*)kv.data(),kv.length(), |
396 | 0,&md_len); | 426 | 0,&md_len); |
397 | return encode_base64(md,md_len); | 427 | return encode_base64(md,md_len); |
398 | } | 428 | } |
399 | 429 | ||
400 | } | 430 | } |
401 | 431 | ||
402 | } | 432 | } |