aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin <quentin@deuxfleurs.fr>2020-11-08 15:53:33 +0100
committerQuentin <quentin@deuxfleurs.fr>2020-11-08 15:53:33 +0100
commit71721f5bcf943dcc3ffe0c3db02add4af335ab7a (patch)
tree5b0f89cb61cd3de5b63304f7c727dabaaf9cd28c
parent0791e7164e77147b785232adfe91ec01f5c6c6af (diff)
parent54166d2a09f488bff080469160d4df6a78db1a3f (diff)
downloadgarage-71721f5bcf943dcc3ffe0c3db02add4af335ab7a.tar.gz
garage-71721f5bcf943dcc3ffe0c3db02add4af335ab7a.zip
Merge branch 'master' into feature/website
-rw-r--r--src/api/api_server.rs55
1 files changed, 46 insertions, 9 deletions
diff --git a/src/api/api_server.rs b/src/api/api_server.rs
index 6221d784..9dc74dac 100644
--- a/src/api/api_server.rs
+++ b/src/api/api_server.rs
@@ -72,11 +72,6 @@ async fn handler_inner(garage: Arc<Garage>, req: Request<Body>) -> Result<Respon
let path = percent_encoding::percent_decode_str(&path).decode_utf8()?;
let (bucket, key) = parse_bucket_key(&path)?;
- if bucket.len() == 0 {
- return Err(Error::Forbidden(format!(
- "Operations on buckets not allowed"
- )));
- }
let (api_key, content_sha256) = check_signature(&garage, &req).await?;
let allowed = match req.method() {
@@ -250,18 +245,60 @@ async fn handler_inner(garage: Arc<Garage>, req: Request<Body>) -> Result<Respon
}
}
+/// Extract the bucket name and the key name from an HTTP path
+///
+/// S3 internally manages only buckets and keys. This function splits
+/// an HTTP path to get the corresponding bucket name and key.
fn parse_bucket_key(path: &str) -> Result<(&str, Option<&str>), Error> {
let path = path.trim_start_matches('/');
- match path.find('/') {
+ let (bucket, key) = match path.find('/') {
Some(i) => {
let key = &path[i + 1..];
if key.len() > 0 {
- Ok((&path[..i], Some(key)))
+ (&path[..i], Some(key))
} else {
- Ok((&path[..i], None))
+ (&path[..i], None)
}
}
- None => Ok((path, None)),
+ None => (path, None),
+ };
+ if bucket.len() == 0 {
+ return Err(Error::BadRequest(format!("No bucket specified")));
+ }
+ Ok((bucket, key))
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ #[test]
+ fn parse_bucket_containing_a_key() -> Result<(), Error> {
+ let (bucket, key) = parse_bucket_key("/my_bucket/a/super/file.jpg")?;
+ assert_eq!(bucket, "my_bucket");
+ assert_eq!(key.expect("key must be set"), "a/super/file.jpg");
+ Ok(())
+ }
+
+ #[test]
+ fn parse_bucket_containing_no_key() -> Result<(), Error> {
+ let (bucket, key) = parse_bucket_key("/my_bucket/")?;
+ assert_eq!(bucket, "my_bucket");
+ assert!(key.is_none());
+ let (bucket, key) = parse_bucket_key("/my_bucket")?;
+ assert_eq!(bucket, "my_bucket");
+ assert!(key.is_none());
+ Ok(())
+ }
+
+ #[test]
+ fn parse_bucket_containing_no_bucket() {
+ let parsed = parse_bucket_key("");
+ assert!(parsed.is_err());
+ let parsed = parse_bucket_key("/");
+ assert!(parsed.is_err());
+ let parsed = parse_bucket_key("////");
+ assert!(parsed.is_err());
}
}