gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-31 01:09:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: avoid mutating signed request headers (#3378)

Browse Source
This commit is contained in:
安正超
2026-06-12 11:13:34 +08:00
committed by GitHub
parent 559bf9d9d7
commit fc32b76c0e
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rustfs/src/server/layer.rs
+5 -13
View File
@@ -79,8 +79,8 @@ impl<'a> opentelemetry::propagation::Extractor for HeaderMapCarrier<'a> {
/// This layer must be placed after `SetRequestIdLayer` in the middleware stack, /// This layer must be placed after `SetRequestIdLayer` in the middleware stack,
/// as it reads the `x-request-id` header that `SetRequestIdLayer` generates. /// as it reads the `x-request-id` header that `SetRequestIdLayer` generates.
/// ///
/// Additionally, it sets the `x-amz-request-id` request header for S3 compatibility /// Additionally, it stores the S3-compatible request ID alias in the request context
/// if not already present. /// without mutating signed request headers.
#[derive(Clone, Default)] #[derive(Clone, Default)]
pub struct RequestContextLayer; pub struct RequestContextLayer;
@@ -138,7 +138,7 @@ where
.unwrap_or_else(|| request_id.clone()); .unwrap_or_else(|| request_id.clone());
let ctx = RequestContext { let ctx = RequestContext {
request_id: request_id.clone(), request_id,
x_amz_request_id, x_amz_request_id,
trace_id, trace_id,
span_id, span_id,
@@ -147,14 +147,6 @@ where
req.extensions_mut().insert(ctx); req.extensions_mut().insert(ctx);
// Set x-amz-request-id for S3 compatibility downstream
if !req.headers().contains_key(AMZ_REQUEST_ID)
&& let Ok(val) = HeaderValue::from_str(&request_id)
{
req.headers_mut()
.insert(http::header::HeaderName::from_static(AMZ_REQUEST_ID), val);
}
self.inner.call(req) self.inner.call(req)
} }
} }
@@ -2234,7 +2226,7 @@ mod tests {
} }
#[test] #[test]
fn request_context_layer_populates_context_and_s3_request_id_from_x_request_id() { fn request_context_layer_populates_context_without_mutating_signed_headers() {
let mut service = RequestContextLayer.layer(CaptureService); let mut service = RequestContextLayer.layer(CaptureService);
let request = Request::builder() let request = Request::builder()
.uri("/bucket/object") .uri("/bucket/object")
@@ -2252,7 +2244,7 @@ mod tests {
assert_eq!(context.x_amz_request_id, "req-123"); assert_eq!(context.x_amz_request_id, "req-123");
assert!(context.trace_id.is_none()); assert!(context.trace_id.is_none());
assert!(context.span_id.is_none()); assert!(context.span_id.is_none());
assert_eq!(request.headers().get(AMZ_REQUEST_ID).unwrap(), "req-123"); assert!(request.headers().get(AMZ_REQUEST_ID).is_none());
} }
#[test] #[test]
rustfs/src/storage/request_context.rs
+1 -1
View File
@@ -21,7 +21,7 @@
//! → generates x-request-id UUID //! → generates x-request-id UUID
//! → RequestContextLayer creates RequestContext //! → RequestContextLayer creates RequestContext
//! → stores in request.extensions() //! → stores in request.extensions()
//! → sets x-amz-request-id header //! → stores the S3-compatible request-id alias without changing signed headers
//! Auth (FS::check) //! Auth (FS::check)
//! → copies RequestContext into ReqInfo.request_context //! → copies RequestContext into ReqInfo.request_context
//! Storage (FS methods) //! Storage (FS methods)