Skip to content
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.

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

fix(http1): fix intermitent panic parsing partial headers #3812

Merged
merged 1 commit into from
Dec 16, 2024
Merged
Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions src/proto/h1/io.rs
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,11 @@ where
return Poll::Ready(Err(crate::Error::new_too_large()));
}
if curr_len > 0 {
trace!("partial headers; {} bytes so far", curr_len);
self.partial_len = Some(curr_len);
} else {
// 1xx gobled some bytes
self.partial_len = None;
}
}
}
Expand Down
57 changes: 57 additions & 0 deletions tests/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2041,6 +2041,63 @@ mod conn {
assert_eq!(vec, b"bar=foo");
}

#[tokio::test]
async fn client_100_then_http09() {
let (server, addr) = setup_std_test_server();

thread::spawn(move || {
let mut sock = server.accept().unwrap().0;
sock.set_read_timeout(Some(Duration::from_secs(5))).unwrap();
sock.set_write_timeout(Some(Duration::from_secs(5)))
.unwrap();
let mut buf = [0; 4096];
sock.read(&mut buf).expect("read 1");
sock.write_all(
b"\
HTTP/1.1 100 Continue\r\n\
Content-Type: text/plain\r\n\
Server: BaseHTTP/0.6 Python/3.12.5\r\n\
Date: Mon, 16 Dec 2024 03:08:27 GMT\r\n\
",
)
.unwrap();
// That it's separate writes is important to this test
thread::sleep(Duration::from_millis(50));
sock.write_all(
b"\
\r\n\
",
)
.expect("write 2");
thread::sleep(Duration::from_millis(50));
sock.write_all(
b"\
This is a sample text/plain document, without final headers.\
\n\n\
",
)
.expect("write 3");
});

let tcp = tcp_connect(&addr).await.unwrap();

let (mut client, conn) = conn::http1::Builder::new()
.http09_responses(true)
.handshake(tcp)
.await
.unwrap();

tokio::spawn(async move {
let _ = conn.await;
});

let req = Request::builder()
.uri("/a")
.body(Empty::<Bytes>::new())
.unwrap();
let _res = client.send_request(req).await.expect("send_request");
}

#[tokio::test]
async fn test_try_send_request() {
use std::future::Future;
Expand Down
Loading