Skip to content
Open
Changes from all commits
Commits
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
20 changes: 19 additions & 1 deletion src/proto/h1/decode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,6 @@ impl ChunkedState {
}
}

// TODO: disallow Transfer-Encoding, Content-Length, Trailer, etc in trailers ??
fn decode_trailers(buf: &mut BytesMut, count: usize) -> Result<HeaderMap, io::Error> {
let mut trailers = HeaderMap::new();
let mut headers = vec![httparse::EMPTY_HEADER; count];
Expand All @@ -654,6 +653,16 @@ fn decode_trailers(buf: &mut BytesMut, count: usize) -> Result<HeaderMap, io::Er
}
};

if name == http::header::CONTENT_LENGTH
|| name == http::header::TRANSFER_ENCODING
|| name == http::header::TRAILER
{
return Err(io::Error::new(
io::ErrorKind::InvalidInput,
format!("Forbidden trailer field: {:?}", &header),
));
}

let value = match HeaderValue::from_bytes(header.value) {
Ok(value) => value,
Err(_) => {
Expand Down Expand Up @@ -1164,6 +1173,15 @@ mod tests {
assert_eq!(values, ["first", "second"]);
}

#[test]
fn test_decode_trailers_rejects_forbidden_fields() {
for name in ["Content-Length", "Transfer-Encoding", "Trailer"] {
let mut buf = BytesMut::from(format!("{name}: value\r\n\r\n").as_bytes());
let err = decode_trailers(&mut buf, 1).expect_err("forbidden trailer field");
assert_eq!(err.kind(), io::ErrorKind::InvalidInput);
}
}

#[tokio::test]
async fn test_trailer_max_headers_enforced() {
let h1_max_headers = 10;
Expand Down