Deuxfleurs/garage
32
61
Fork 80
Code Issues 91 Pull requests 14 Releases 31 Wiki Activity

api: PutObject: save trailer checksum in metadata
Some checks failed
ci/woodpecker/push/debug Pipeline failed
Details
ci/woodpecker/pr/debug Pipeline was successful
Details

Browse source
This commit is contained in:
Alex 2025-02-18 21:55:48 +01:00
parent f6e805e7db
commit cfe8e8d45c
1 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/api/s3/put.rs
View file

@ -49,7 +49,10 @@ pub(crate) struct SaveStreamResult {
pub(crate) enum ChecksumMode<'a> { pub(crate) enum ChecksumMode<'a> {
Verify(&'a ExpectedChecksums), Verify(&'a ExpectedChecksums),
VerifyFrom(StreamingChecksumReceiver), VerifyFrom {
checksummer: StreamingChecksumReceiver,
trailer_algo: Option<ChecksumAlgorithm>,
},
Calculate(Option<ChecksumAlgorithm>), Calculate(Option<ChecksumAlgorithm>),
} }
@ -70,6 +73,7 @@ pub async fn handle_put(
sha256: None, sha256: None,
extra: request_checksum_value(req.headers())?, extra: request_checksum_value(req.headers())?,
}; };
let trailer_checksum_algorithm = request_trailer_checksum_algorithm(req.headers())?;
let meta = ObjectVersionMetaInner { let meta = ObjectVersionMetaInner {
headers, headers,
@ -90,7 +94,7 @@ pub async fn handle_put(
req_body.add_md5(); req_body.add_md5();
} }
let (stream, checksums) = req_body.streaming_with_checksums(); let (stream, checksummer) = req_body.streaming_with_checksums();
let stream = stream.map_err(Error::from); let stream = stream.map_err(Error::from);
let res = save_stream( let res = save_stream(
@ -99,7 +103,10 @@ pub async fn handle_put(
encryption, encryption,
stream, stream,
key, key,
ChecksumMode::VerifyFrom(checksums), ChecksumMode::VerifyFrom {
checksummer,
trailer_algo: trailer_checksum_algorithm,
},
) )
.await?; .await?;
@ -140,7 +147,7 @@ pub(crate) async fn save_stream<S: Stream<Item = Result<Bytes, Error>> + Unpin>(
ChecksumMode::Calculate(algo) => { ChecksumMode::Calculate(algo) => {
Checksummer::init(&Default::default(), !encryption.is_encrypted()).add(*algo) Checksummer::init(&Default::default(), !encryption.is_encrypted()).add(*algo)
} }
ChecksumMode::VerifyFrom(_) => { ChecksumMode::VerifyFrom { .. } => {
// Checksums are calculated by the garage_api_common::signature module // Checksums are calculated by the garage_api_common::signature module
// so here we can just have an empty checksummer that does nothing // so here we can just have an empty checksummer that does nothing
Checksummer::new() Checksummer::new()
@ -160,11 +167,17 @@ pub(crate) async fn save_stream<S: Stream<Item = Result<Bytes, Error>> + Unpin>(
ChecksumMode::Calculate(algo) => { ChecksumMode::Calculate(algo) => {
meta.checksum = checksums.extract(algo); meta.checksum = checksums.extract(algo);
} }
ChecksumMode::VerifyFrom(checksummer) => { ChecksumMode::VerifyFrom {
checksummer,
trailer_algo,
} => {
drop(chunker); drop(chunker);
checksums = checksummer checksums = checksummer
.await .await
.ok_or_internal_error("checksum calculation")??; .ok_or_internal_error("checksum calculation")??;
if let Some(algo) = trailer_algo {
meta.checksum = checksums.extract(Some(algo));
}
} }
}; };
@ -256,10 +269,16 @@ pub(crate) async fn save_stream<S: Stream<Item = Result<Bytes, Error>> + Unpin>(
ChecksumMode::Calculate(algo) => { ChecksumMode::Calculate(algo) => {
meta.checksum = checksums.extract(algo); meta.checksum = checksums.extract(algo);
} }
ChecksumMode::VerifyFrom(checksummer) => { ChecksumMode::VerifyFrom {
checksummer,
trailer_algo,
} => {
checksums = checksummer checksums = checksummer
.await .await
.ok_or_internal_error("checksum calculation")??; .ok_or_internal_error("checksum calculation")??;
if let Some(algo) = trailer_algo {
meta.checksum = checksums.extract(Some(algo));
}
} }
}; };