-rw-r--r-- | lib/util.cc | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/lib/util.cc b/lib/util.cc index 69d37b5..83f0eef 100644 --- a/lib/util.cc +++ b/lib/util.cc | |||
@@ -176,39 +176,41 @@ namespace opkele { | |||
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 | if(rv=="http:") | ||
189 | s = false; | ||
190 | else if(rv=="https:") | ||
191 | s = true; | ||
192 | #ifndef NDEBUG | ||
193 | else if(rv=="file:") | ||
194 | s = false; | ||
195 | #endif /* XXX: or try to make tests work some other way */ | ||
196 | else | ||
197 | throw not_implemented(OPKELE_CP_ "Only http(s) URIs can be normalized here"); | ||
198 | string::size_type ul = uri.find_last_not_of(whitespace)+1; | 188 | string::size_type ul = uri.find_last_not_of(whitespace)+1; |
199 | if(ul <= (colon+3)) | 189 | if(ul <= (colon+3)) |
200 | 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"); |
201 | if(uri[colon+1]!='/' || uri[colon+2]!='/') | 191 | if(uri[colon+1]!='/' || uri[colon+2]!='/') |
202 | 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:") | ||
194 | s = false; | ||
195 | else if(rv=="https:") | ||
196 | s = true; | ||
197 | else{ | ||
198 | /* TODO: support more schemes. | ||
199 | * e.g. xri. How do we normalize | ||
200 | * xri? | ||
201 | */ | ||
202 | rv.append(uri,colon+1,ul-colon-1); | ||
203 | return rv; | ||
204 | } | ||
203 | rv += "//"; | 205 | rv += "//"; |
204 | string::size_type interesting = uri.find_first_of(":/#?",colon+3); | 206 | string::size_type interesting = uri.find_first_of(":/#?",colon+3); |
205 | if(interesting==string::npos) { | 207 | if(interesting==string::npos) { |
206 | transform( | 208 | transform( |
207 | uri.begin()+colon+3,uri.begin()+ul, | 209 | uri.begin()+colon+3,uri.begin()+ul, |
208 | back_inserter(rv), ::tolower ); | 210 | back_inserter(rv), ::tolower ); |
209 | rv += '/'; return rv; | 211 | rv += '/'; return rv; |
210 | } | 212 | } |
211 | transform( | 213 | transform( |
212 | uri.begin()+colon+3,uri.begin()+interesting, | 214 | uri.begin()+colon+3,uri.begin()+interesting, |
213 | back_inserter(rv), ::tolower ); | 215 | back_inserter(rv), ::tolower ); |
214 | bool qf = false; | 216 | bool qf = false; |