Deuxfleurs
/
garage
42
39
Fork 55
Code Issues 71 Pull Requests 7 Releases 29 Wiki Activity

Apply cargo fmt; add trace output when request signature is bad

This commit is contained in:
Alex 2020-07-08 13:33:02 +02:00
parent f22ecb60a8
commit 86fb7bbba5
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/api/api_server.rs
View File

@ -67,10 +67,7 @@ async fn handler(
}
}
async fn handler_inner(
garage: Arc<Garage>,
req: Request<Body>,
) -> Result<Response<Body>, Error> {
async fn handler_inner(garage: Arc<Garage>, req: Request<Body>) -> Result<Response<Body>, Error> {
let path = req.uri().path().to_string();
let path = percent_encoding::percent_decode_str(&path).decode_utf8()?;

4
src/api/s3_delete.rs
View File

@ -129,9 +129,7 @@ pub async fn handle_delete_objects(
writeln!(&mut retxml, "</DeleteObjectsOutput>").unwrap();
Ok(Response::new(Body::from(
retxml.into_bytes(),
)))
Ok(Response::new(Body::from(retxml.into_bytes())))
}
struct DeleteRequest {

10
src/api/s3_get.rs
View File

@ -146,7 +146,7 @@ pub async fn handle_get(
})
.buffered(2);
//let body: Body = Box::new(StreamBody::new(Box::pin(body_stream)));
let body = hyper::body::Body::wrap_stream(body_stream);
let body = hyper::body::Body::wrap_stream(body_stream);
Ok(resp_builder.body(body)?)
}
}
@ -176,9 +176,7 @@ pub async fn handle_get_range(
ObjectVersionData::DeleteMarker => Err(Error::NotFound),
ObjectVersionData::Inline(bytes) => {
if end as usize <= bytes.len() {
let body: Body = Body::from(
bytes[begin as usize..end as usize].to_vec(),
);
let body: Body = Body::from(bytes[begin as usize..end as usize].to_vec());
Ok(resp_builder.body(body)?)
} else {
Err(Error::Message(format!("Internal error: requested range not present in inline bytes when it should have been")))
@ -213,14 +211,14 @@ pub async fn handle_get_range(
} else {
end - block.offset
};
Result::<Bytes,Error>::Ok(Bytes::from(
Result::<Bytes, Error>::Ok(Bytes::from(
data[start_in_block as usize..end_in_block as usize].to_vec(),
))
}
})
.buffered(2);
//let body: Body = Box::new(StreamBody::new(Box::pin(body_stream)));
let body = hyper::body::Body::wrap_stream(body_stream);
let body = hyper::body::Body::wrap_stream(body_stream);
Ok(resp_builder.body(body)?)
}
}

3
src/api/signature.rs
View File

@ -91,6 +91,9 @@ pub async fn check_signature(garage: &Garage, request: &Request<Body>) -> Result
let signature = hex::encode(hmac.result().code());
if authorization.signature != signature {
trace!("Canonical request: ``{}``", canonical_request);
trace!("String to sign: ``{}``", string_to_sign);
trace!("Expected: {}, got: {}", signature, authorization.signature);
return Err(Error::Forbidden(format!("Invalid signature")));
}