Skip to content

Commit

Permalink
fix: set error to Payload before dispatcher disconnect
Browse files Browse the repository at this point in the history
  • Loading branch information
ihciah committed Jul 27, 2023
1 parent ff8fd2f commit 0e70a31
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 0 deletions.
1 change: 1 addition & 0 deletions actix-http/src/h1/dispatcher.rs
Expand Up @@ -1115,6 +1115,7 @@ where
let inner = inner.as_mut().project();
inner.flags.insert(Flags::READ_DISCONNECT);
if let Some(mut payload) = inner.payload.take() {
payload.set_error(io::Error::from(io::ErrorKind::UnexpectedEof).into());
payload.feed_eof();
}
};
Expand Down
53 changes: 53 additions & 0 deletions actix-http/tests/test_server.rs
Expand Up @@ -17,6 +17,7 @@ use bytes::Bytes;
use derive_more::{Display, Error};
use futures_util::{stream::once, FutureExt as _, StreamExt as _};
use regex::Regex;
use tokio::io::{AsyncReadExt, AsyncWriteExt};

#[actix_rt::test]
async fn h1_basic() {
Expand Down Expand Up @@ -439,6 +440,58 @@ async fn content_length() {
srv.stop().await;
}

#[actix_rt::test]
async fn content_length_truncated() {
let mut srv = test_server(|| {
HttpService::build()
.h1(|mut req: Request| async move {
let expect_length: usize = req.uri().path()[1..].parse().unwrap();
let mut payload = req.take_payload();

let mut length = 0;
let mut seen_error = false;
while let Some(chunk) = payload.next().await {
match chunk {
Ok(b) => length += b.len(),
Err(_) => {
seen_error = true;
break;
}
}
}
if seen_error {
return Result::<_, Infallible>::Ok(Response::bad_request());
}

assert_eq!(length, expect_length, "length must match when no error");
Result::<_, Infallible>::Ok(Response::ok())
})
.tcp()
})
.await;

let addr = srv.addr();
let mut buf = [0; 12];

let mut conn = TcpStream::connect(&addr).await.unwrap();
conn.write_all(b"POST /10000 HTTP/1.1\r\nContent-Length: 10000\r\n\r\ndata_truncated")
.await
.unwrap();
conn.shutdown().await.unwrap();
conn.read_exact(&mut buf).await.unwrap();
assert_eq!(&buf, b"HTTP/1.1 400");

let mut conn = TcpStream::connect(&addr).await.unwrap();
conn.write_all(b"POST /4 HTTP/1.1\r\nContent-Length: 4\r\n\r\ndata")
.await
.unwrap();
conn.shutdown().await.unwrap();
conn.read_exact(&mut buf).await.unwrap();
assert_eq!(&buf, b"HTTP/1.1 200");

srv.stop().await;
}

#[actix_rt::test]
async fn h1_headers() {
let data = STR.repeat(10);
Expand Down

0 comments on commit 0e70a31

Please sign in to comment.