Skip to content

fix(compression): reject non-empty data frames after codec is EOF #712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seanmonstar merged 1 commit into from
Jul 13, 2026
+61 −1
Merged

fix(compression): reject non-empty data frames after codec is EOF #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion tower-http/src/compression_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,9 +238,19 @@ where
// poll any remaining frames, such as trailers
let body = M::get_pin_mut(this.read).get_pin_mut().get_pin_mut();
match ready!(body.poll_frame(cx)) {
Some(Ok(frame)) => Poll::Ready(Some(Ok(
Some(Ok(frame)) if frame.is_trailers() => Poll::Ready(Some(Ok(
frame.map_data(|mut data| data.copy_to_bytes(data.remaining()))
))),
Some(Ok(frame)) => {
if let Ok(bytes) = frame.into_data() {
if bytes.has_remaining() {
return Poll::Ready(Some(Err(
"there are extra bytes after body has been decompressed".into(),
)));
}
}
Poll::Ready(None)
}
Some(Err(err)) => Poll::Ready(Some(Err(err.into()))),
None => Poll::Ready(None),
}
Expand Down
50 changes: 50 additions & 0 deletions tower-http/src/decompression/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,13 @@ pub use self::request::service::RequestDecompression;
mod tests {
use std::convert::Infallible;
use std::io::Write;
use std::time::Duration;

use super::*;
use crate::test_helpers::Body;
use crate::{compression::Compression, test_helpers::WithTrailers};
use bytes::Bytes;
use futures_util::StreamExt;
use http::Response;
use http::{HeaderMap, HeaderName, Request};
use http_body_util::BodyExt;
Expand Down Expand Up @@ -251,4 +254,51 @@ mod tests {
.body(body)
.unwrap())
}

#[cfg(feature = "decompression-br")]
#[tokio::test]
async fn brotli_rejects_extra_data_without_waiting_for_end_of_body() {
let mut compressed = Vec::new();
{
let mut encoder = brotli::CompressorWriter::new(&mut compressed, 4096, 5, 20);
encoder.write_all(b"Hello, World!").unwrap();
}

let svc = service_fn(move |_req: Request<Body>| {
let compressed = compressed.clone();
async move {
let stream = futures_util::stream::iter([
Ok::<_, Infallible>(Bytes::from(compressed)),
Ok(Bytes::from_static(b"extra")),
])
.chain(futures_util::stream::pending());

Ok::<_, Infallible>(
Response::builder()
.header("content-encoding", "br")
.body(Body::from_stream(stream))
.unwrap(),
)
}
});
let mut client = Decompression::new(svc);

let res = client
.ready()
.await
.unwrap()
.call(Request::new(Body::empty()))
.await
.unwrap();

let result = tokio::time::timeout(Duration::from_secs(1), res.into_body().collect())
.await
.expect("extra data should produce an error without waiting for the body to end");
let error = result.unwrap_err();

assert_eq!(
error.to_string(),
"there are extra bytes after body has been decompressed"
);
}
}