-rw-r--r-- | lib/util.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/util.cc b/lib/util.cc index 4600576..e5ca62d 100644 --- a/lib/util.cc +++ b/lib/util.cc | |||
@@ -135,65 +135,65 @@ namespace opkele { | |||
135 | /* | 135 | /* |
136 | * | 136 | * |
137 | */ | 137 | */ |
138 | 138 | ||
139 | string url_encode(const string& str) { | 139 | string url_encode(const string& str) { |
140 | char * t = curl_escape(str.c_str(),str.length()); | 140 | char * t = curl_escape(str.c_str(),str.length()); |
141 | if(!t) | 141 | if(!t) |
142 | throw failed_conversion(OPKELE_CP_ "failed to curl_escape()"); | 142 | throw failed_conversion(OPKELE_CP_ "failed to curl_escape()"); |
143 | string rv(t); | 143 | string rv(t); |
144 | curl_free(t); | 144 | curl_free(t); |
145 | return rv; | 145 | return rv; |
146 | } | 146 | } |
147 | 147 | ||
148 | string long_to_string(long l) { | 148 | string long_to_string(long l) { |
149 | char rv[32]; | 149 | char rv[32]; |
150 | int r=snprintf(rv,sizeof(rv),"%ld",l); | 150 | int r=snprintf(rv,sizeof(rv),"%ld",l); |
151 | if(r<0 || r>=(int)sizeof(rv)) | 151 | if(r<0 || r>=(int)sizeof(rv)) |
152 | throw failed_conversion(OPKELE_CP_ "failed to snprintf()"); | 152 | throw failed_conversion(OPKELE_CP_ "failed to snprintf()"); |
153 | return rv; | 153 | return rv; |
154 | } | 154 | } |
155 | 155 | ||
156 | long string_to_long(const string& s) { | 156 | long string_to_long(const string& s) { |
157 | char *endptr = 0; | 157 | char *endptr = 0; |
158 | long rv = strtol(s.c_str(),&endptr,10); | 158 | long rv = strtol(s.c_str(),&endptr,10); |
159 | if((!endptr) || endptr==s.c_str()) | 159 | if((!endptr) || endptr==s.c_str()) |
160 | throw failed_conversion(OPKELE_CP_ "failed to strtol()"); | 160 | throw failed_conversion(OPKELE_CP_ "failed to strtol()"); |
161 | return rv; | 161 | return rv; |
162 | } | 162 | } |
163 | 163 | ||
164 | /* | 164 | /* |
165 | * Normalize URL according to the rules, described in rfc 3986, section 6 | 165 | * Normalize URL according to the rules, described in rfc 3986, section 6 |
166 | * | 166 | * |
167 | * - uppercase hext triplets (e.g. %ab -> %AB) | 167 | * - uppercase hex triplets (e.g. %ab -> %AB) |
168 | * - lowercase scheme and host | 168 | * - lowercase scheme and host |
169 | * - decode %-encoded characters, specified as unreserved in rfc 3986, section 2.3, | 169 | * - decode %-encoded characters, specified as unreserved in rfc 3986, section 2.3, |
170 | * that is - [:alpha:][:digit:]._~- | 170 | * that is - [:alpha:][:digit:]._~- |
171 | * - remove dot segments | 171 | * - remove dot segments |
172 | * - remove empty and default ports | 172 | * - remove empty and default ports |
173 | * - if there's no path component, add '/' | 173 | * - if there's no path component, add '/' |
174 | */ | 174 | */ |
175 | string rfc_3986_normalize_uri(const string& uri) { | 175 | string rfc_3986_normalize_uri(const string& uri) { |
176 | static const char *whitespace = " \t\r\n"; | 176 | static const char *whitespace = " \t\r\n"; |
177 | string rv; | 177 | string rv; |
178 | string::size_type ns = uri.find_first_not_of(whitespace); | 178 | string::size_type ns = uri.find_first_not_of(whitespace); |
179 | if(ns==string::npos) | 179 | if(ns==string::npos) |
180 | throw bad_input(OPKELE_CP_ "Can't normalize empty URI"); | 180 | throw bad_input(OPKELE_CP_ "Can't normalize empty URI"); |
181 | string::size_type colon = uri.find(':',ns); | 181 | string::size_type colon = uri.find(':',ns); |
182 | if(colon==string::npos) | 182 | if(colon==string::npos) |
183 | throw bad_input(OPKELE_CP_ "No scheme specified in URI"); | 183 | throw bad_input(OPKELE_CP_ "No scheme specified in URI"); |
184 | transform( | 184 | transform( |
185 | uri.begin()+ns, uri.begin()+colon+1, | 185 | uri.begin()+ns, uri.begin()+colon+1, |
186 | back_inserter(rv), ::tolower ); | 186 | back_inserter(rv), ::tolower ); |
187 | bool s; | 187 | bool s; |
188 | string::size_type ul = uri.find_last_not_of(whitespace)+1; | 188 | string::size_type ul = uri.find_last_not_of(whitespace)+1; |
189 | if(ul <= (colon+3)) | 189 | if(ul <= (colon+3)) |
190 | throw bad_input(OPKELE_CP_ "Unexpected end of URI being normalized encountered"); | 190 | throw bad_input(OPKELE_CP_ "Unexpected end of URI being normalized encountered"); |
191 | if(uri[colon+1]!='/' || uri[colon+2]!='/') | 191 | if(uri[colon+1]!='/' || uri[colon+2]!='/') |
192 | throw bad_input(OPKELE_CP_ "Unexpected input in URI being normalized after scheme component"); | 192 | throw bad_input(OPKELE_CP_ "Unexpected input in URI being normalized after scheme component"); |
193 | if(rv=="http:") | 193 | if(rv=="http:") |
194 | s = false; | 194 | s = false; |
195 | else if(rv=="https:") | 195 | else if(rv=="https:") |
196 | s = true; | 196 | s = true; |
197 | else{ | 197 | else{ |
198 | /* TODO: support more schemes. | 198 | /* TODO: support more schemes. |
199 | * e.g. xri. How do we normalize | 199 | * e.g. xri. How do we normalize |