gsadmin/garage
1
0
Fork 0
mirror of https://github.com/deuxfleurs-org/garage.git synced 2026-08-25 20:06:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[dep-upgrade-202402] refactor use of BodyStream

Browse Source
This commit is contained in:
Alex Auvolat
2024-02-07 15:25:49 +01:00
parent 53746b59e5
commit e011941964
5 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/signature/streaming.rs
+3 -5
View File
@@ -5,7 +5,7 @@ use futures::prelude::*;
use futures::task;
use garage_model::key_table::Key;
use hmac::Mac;
use http_body_util::{BodyStream, StreamBody};
use http_body_util::StreamBody;
use hyper::body::{Bytes, Incoming as IncomingBody};
use hyper::Request;
@@ -51,11 +51,9 @@ pub fn parse_streaming_body(
.ok_or_internal_error("Unable to build signing HMAC")?;
Ok(req.map(move |body| {
let body_stream = BodyStream::new(body)
.map(|x| x.map(|f| f.into_data().unwrap())) //TODO remove unwrap
.map_err(Error::from);
let stream = body_stream::<_, Error>(body);
let signed_payload_stream =
SignedPayloadStream::new(body_stream, signing_hmac, date, &scope, signature)
SignedPayloadStream::new(stream, signing_hmac, date, &scope, signature)
.map(|x| x.map(hyper::body::Frame::data))
.map_err(Error::from);
ReqBody::new(StreamBody::new(signed_payload_stream))