aboutsummaryrefslogtreecommitdiff
path: root/src/web
diff options
context:
space:
mode:
authorQuentin <quentin@deuxfleurs.fr>2020-11-21 12:01:02 +0100
committerQuentin <quentin@deuxfleurs.fr>2020-11-21 12:01:02 +0100
commitd4c7f4e3745f38b060052cddec01bf37b989f96d (patch)
treedf422d05e121a85d24133b81fc5f48ad06704efd /src/web
parent2f6eca4ef36b662be841454774af55fe84f42d6a (diff)
downloadgarage-d4c7f4e3745f38b060052cddec01bf37b989f96d.tar.gz
garage-d4c7f4e3745f38b060052cddec01bf37b989f96d.zip
Fix host to key
Diffstat (limited to 'src/web')
-rw-r--r--src/web/web_server.rs24
1 files changed, 19 insertions, 5 deletions
diff --git a/src/web/web_server.rs b/src/web/web_server.rs
index 1c5619fa..7172f222 100644
--- a/src/web/web_server.rs
+++ b/src/web/web_server.rs
@@ -152,17 +152,29 @@ fn host_to_bucket<'a>(host: &'a str, root: &str) -> &'a str {
/// which is also AWS S3 behavior.
fn path_to_key<'a>(path: &'a str, index: &str) -> Result<Cow<'a, str>, Error> {
let path_utf8 = percent_encoding::percent_decode_str(&path).decode_utf8()?;
+
+ if path_utf8.chars().next() != Some('/') {
+ return Err(Error::BadRequest(format!(
+ "Path must start with a / (slash)"
+ )))
+ }
+
match path_utf8.chars().last() {
None => Err(Error::BadRequest(format!(
"Path must have at least a character"
))),
Some('/') => {
let mut key = String::with_capacity(path_utf8.len() + index.len());
- key.push_str(&path_utf8);
+ key.push_str(&path_utf8[1..]);
key.push_str(index);
Ok(key.into())
}
- Some(_) => Ok(path_utf8.into()),
+ Some(_) => {
+ match path_utf8 {
+ Cow::Borrowed(pu8) => Ok((&pu8[1..]).into()),
+ Cow::Owned(pu8) => Ok((&pu8[1..]).to_string().into()),
+ }
+ }
}
}
@@ -218,10 +230,12 @@ mod tests {
#[test]
fn path_to_key_test() -> Result<(), Error> {
- assert_eq!(path_to_key("/file%20.jpg", "index.html")?, "/file .jpg");
- assert_eq!(path_to_key("/%20t/", "index.html")?, "/ t/index.html");
- assert_eq!(path_to_key("/", "index.html")?, "/index.html");
+ assert_eq!(path_to_key("/file%20.jpg", "index.html")?, "file .jpg");
+ assert_eq!(path_to_key("/%20t/", "index.html")?, " t/index.html");
+ assert_eq!(path_to_key("/", "index.html")?, "index.html");
+ assert_eq!(path_to_key("/hello", "index.html")?, "hello");
assert!(path_to_key("", "index.html").is_err());
+ assert!(path_to_key("i/am/relative", "index.html").is_err());
Ok(())
}
}