Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Allow http/1.0 responses to have content-length #625

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
merged 2 commits into from
Jun 14, 2023
Merged

Allow http/1.0 responses to have content-length #625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ae523b
Allow http/1.0 responses to have content-length
jsha Jun 14, 2023
7bc5ea2
Add connection option handling
jsha Jun 14, 2023
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
206 changes: 185 additions & 21 deletions src/response.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,13 @@ const INTO_STRING_LIMIT: usize = 10 * 1_024 * 1_024;
const MAX_HEADER_SIZE: usize = 100 * 1_024;
const MAX_HEADER_COUNT: usize = 100;

#[derive(Copy, Clone, Debug)]
#[derive(Copy, Clone, Debug, PartialEq)]
enum ConnectionOption {
KeepAlive,
Close,
}

#[derive(Copy, Clone, Debug, PartialEq)]
enum BodyType {
LengthDelimited(usize),
Chunked,
Expand Down Expand Up @@ -279,16 +285,38 @@ impl Response {
self.reader
}

// Determine what to do with the connection after we've read the body.
fn connection_option(
response_version: &str,
connection_header: Option<&str>,
) -> ConnectionOption {
// https://datatracker.ietf.org/doc/html/rfc9112#name-tear-down
// "A client that receives a "close" connection option MUST cease sending requests on that
// connection and close the connection after reading the response message containing the "close"
// connection option"
//
// Per https://www.rfc-editor.org/rfc/rfc2068#section-19.7.1, an HTTP/1.0 response can explicitly
// say "Connection: keep-alive" in response to a request with "Connection: keep-alive". We don't
// send "Connection: keep-alive" in the request but are willing to accept in the response anyhow.
use ConnectionOption::*;
let is_http10 = response_version.eq_ignore_ascii_case("HTTP/1.0");
match (is_http10, connection_header) {
(true, Some(c)) if c.eq_ignore_ascii_case("keep-alive") => KeepAlive,
(true, _) => Close,
(false, Some(c)) if c.eq_ignore_ascii_case("close") => Close,
(false, _) => KeepAlive,
}
}

/// Determine how the body should be read, based on
/// <https://datatracker.ietf.org/doc/html/rfc9112#name-message-body-length>
fn body_type(
request_method: &str,
response_status: u16,
response_version: &str,
headers: &[Header],
) -> BodyType {
let is_http10 = response_version.eq_ignore_ascii_case("HTTP/1.0");
let is_close = get_header(headers, "connection")
.map(|c| c.eq_ignore_ascii_case("close"))
.unwrap_or(false);

let is_head = request_method.eq_ignore_ascii_case("head");
let has_no_body = is_head
Expand All @@ -297,41 +325,41 @@ impl Response {
_ => false,
};

if has_no_body {
return BodyType::LengthDelimited(0);
}

let is_chunked = get_header(headers, "transfer-encoding")
.map(|enc| !enc.is_empty()) // whatever it says, do chunked
.unwrap_or(false);

let use_chunked = !is_http10 && !has_no_body && is_chunked;
// https://www.rfc-editor.org/rfc/rfc2068#page-161
// > a persistent connection with an HTTP/1.0 client cannot make
// > use of the chunked transfer-coding
let use_chunked = !is_http10 && is_chunked;

if use_chunked {
return BodyType::Chunked;
}

if has_no_body {
return BodyType::LengthDelimited(0);
}

let length = get_header(headers, "content-length").and_then(|v| v.parse::<usize>().ok());

if is_http10 || is_close {
BodyType::CloseDelimited
} else if has_no_body {
// head requests never have a body
BodyType::LengthDelimited(0)
} else {
match length {
Some(n) => BodyType::LengthDelimited(n),
None => BodyType::CloseDelimited,
}
match length {
Some(n) => BodyType::LengthDelimited(n),
None => BodyType::CloseDelimited,
}
}

fn stream_to_reader(
stream: DeadlineStream,
mut stream: DeadlineStream,
unit: &Unit,
body_type: BodyType,
compression: Option<Compression>,
connection_option: ConnectionOption,
) -> Box<dyn Read + Send + Sync + 'static> {
if connection_option == ConnectionOption::Close {
stream.inner_mut().set_unpoolable();
}
let inner = stream.inner_ref();
let result = inner.set_read_timeout(unit.agent.config.timeout_read);
if let Err(e) = result {
Expand Down Expand Up @@ -575,14 +603,18 @@ impl Response {
let compression =
get_header(&headers, "content-encoding").and_then(Compression::from_header_value);

let connection_option =
Self::connection_option(http_version, get_header(&headers, "connection"));

let body_type = Self::body_type(&unit.method, status, http_version, &headers);

// remove Content-Encoding and length due to automatic decompression
if compression.is_some() {
headers.retain(|h| !h.is_name("content-encoding") && !h.is_name("content-length"));
}

let reader = Self::stream_to_reader(stream, &unit, body_type, compression);
let reader =
Self::stream_to_reader(stream, &unit, body_type, compression, connection_option);

let url = unit.url.clone();

Expand Down Expand Up @@ -1224,4 +1256,136 @@ mod tests {
let body = resp.into_string().unwrap();
assert_eq!(body, "hi\n");
}

#[test]
fn connection_option() {
use ConnectionOption::*;
assert_eq!(Response::connection_option("HTTP/1.0", None), Close);
assert_eq!(Response::connection_option("HtTp/1.0", None), Close);
assert_eq!(Response::connection_option("HTTP/1.0", Some("blah")), Close);
assert_eq!(
Response::connection_option("HTTP/1.0", Some("keep-ALIVE")),
KeepAlive
);
assert_eq!(
Response::connection_option("http/1.0", Some("keep-alive")),
KeepAlive
);

assert_eq!(Response::connection_option("http/1.1", None), KeepAlive);
assert_eq!(
Response::connection_option("http/1.1", Some("blah")),
KeepAlive
);
assert_eq!(
Response::connection_option("http/1.1", Some("keep-alive")),
KeepAlive
);
assert_eq!(
Response::connection_option("http/1.1", Some("CLOSE")),
Close
);
}

#[test]
fn body_type() {
use BodyType::*;
assert_eq!(
Response::body_type("GET", 200, "HTTP/1.1", &[]),
CloseDelimited
);
assert_eq!(
Response::body_type("HEAD", 200, "HTTP/1.1", &[]),
LengthDelimited(0)
);
assert_eq!(
Response::body_type("hEaD", 200, "HTTP/1.1", &[]),
LengthDelimited(0)
);
assert_eq!(
Response::body_type("head", 200, "HTTP/1.1", &[]),
LengthDelimited(0)
);
assert_eq!(
Response::body_type("GET", 304, "HTTP/1.1", &[]),
LengthDelimited(0)
);
assert_eq!(
Response::body_type("GET", 204, "HTTP/1.1", &[]),
LengthDelimited(0)
);
assert_eq!(
Response::body_type(
"GET",
200,
"HTTP/1.1",
&[Header::new("Transfer-Encoding", "chunked"),]
),
Chunked
);
assert_eq!(
Response::body_type(
"GET",
200,
"HTTP/1.1",
&[Header::new("Content-Length", "123"),]
),
LengthDelimited(123)
);
assert_eq!(
Response::body_type(
"GET",
200,
"HTTP/1.1",
&[
Header::new("Content-Length", "123"),
Header::new("Transfer-Encoding", "chunked"),
]
),
Chunked
);
assert_eq!(
Response::body_type(
"GET",
200,
"HTTP/1.1",
&[
Header::new("Transfer-Encoding", "chunked"),
Header::new("Content-Length", "123"),
]
),
Chunked
);
assert_eq!(
Response::body_type(
"HEAD",
200,
"HTTP/1.1",
&[
Header::new("Transfer-Encoding", "chunked"),
Header::new("Content-Length", "123"),
]
),
LengthDelimited(0)
);
assert_eq!(
Response::body_type(
"GET",
200,
"HTTP/1.0",
&[Header::new("Transfer-Encoding", "chunked"),]
),
CloseDelimited,
"HTTP/1.0 did not support chunked encoding"
);
assert_eq!(
Response::body_type(
"GET",
200,
"HTTP/1.0",
&[Header::new("Content-Length", "123"),]
),
LengthDelimited(123)
);
}
}
8 changes: 8 additions & 0 deletions src/stream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ impl DeadlineStream {
pub(crate) fn inner_ref(&self) -> &Stream {
&self.stream
}

pub(crate) fn inner_mut(&mut self) -> &mut Stream {
&mut self.stream
}
}

impl From<DeadlineStream> for Stream {
Expand Down Expand Up @@ -240,6 +244,10 @@ impl Stream {
}
}

pub(crate) fn set_unpoolable(&mut self) {
self.pool_returner = PoolReturner::none();
}

pub(crate) fn return_to_pool(mut self) -> io::Result<()> {
// ensure stream can be reused
self.reset()?;
Expand Down