aboutsummaryrefslogtreecommitdiff
path: root/src/api/s3_put.rs
diff options
context:
space:
mode:
authorAlex <alex@adnab.me>2020-12-06 15:27:58 +0100
committerAlex <alex@adnab.me>2020-12-06 15:27:58 +0100
commit857440f19215422798dcda44cf85bfce439e9032 (patch)
treeb62af2c15d29e9fd061d884ff9856962bef6cf2a /src/api/s3_put.rs
parent39f45b3058e0d6705bdd94037c0876a2af6d5a74 (diff)
parent4a5bbbb81088c9bd25bbe142f67daf4669b6538e (diff)
downloadgarage-857440f19215422798dcda44cf85bfce439e9032.tar.gz
garage-857440f19215422798dcda44cf85bfce439e9032.zip
Merge pull request 'Propose ETag fix' (#23) from bug/etag into master
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/23
Diffstat (limited to 'src/api/s3_put.rs')
-rw-r--r--src/api/s3_put.rs17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/api/s3_put.rs b/src/api/s3_put.rs
index 9c4d625c..c42309b2 100644
--- a/src/api/s3_put.rs
+++ b/src/api/s3_put.rs
@@ -428,6 +428,21 @@ pub async fn handle_complete_multipart_upload(
_ => unreachable!(),
};
+ // ETag calculation: we produce ETags that have the same form as
+ // those of S3 multipart uploads, but we don't use their actual
+ // calculation for the first part (we use random bytes). This
+ // shouldn't impact compatibility as the S3 docs specify that
+ // the ETag is an opaque value in case of a multipart upload.
+ // See also: https://teppen.io/2018/06/23/aws_s3_etags/
+ let num_parts = version.blocks().last().unwrap().part_number
+ - version.blocks().first().unwrap().part_number
+ + 1;
+ let etag = format!(
+ "{}-{}",
+ hex::encode(&rand::random::<[u8; 16]>()[..]),
+ num_parts
+ );
+
// TODO: check that all the parts that they pretend they gave us are indeed there
// TODO: when we read the XML from _req, remember to check the sha256 sum of the payload
// against the signed x-amz-content-sha256
@@ -442,7 +457,7 @@ pub async fn handle_complete_multipart_upload(
ObjectVersionMeta {
headers,
size: total_size,
- etag: "".to_string(), // TODO
+ etag: etag,
},
version.blocks()[0].hash,
));