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.

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

feat(client): support Expect: 100-continue #3472

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(client): support Expect: 100-continue #3472

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
18 changes: 18 additions & 0 deletions src/proto/h1/conn.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ where
// We assume a modern world where the remote speaks HTTP/1.1.
// If they tell us otherwise, we'll downgrade in `read_head`.
version: Version::HTTP_11,
#[cfg(feature = "client")]
awaiting_100_continue: false,
},
_marker: PhantomData,
}
Expand Down Expand Up @@ -103,6 +105,18 @@ where
self.io.set_read_buf_exact_size(sz);
}

#[cfg(feature = "client")]
pub(crate) fn set_awaiting_100_continue(&mut self, awaiting: bool) {
self.state.awaiting_100_continue = awaiting;
}

pub(crate) fn is_awaiting_100_continue(&self) -> bool {
#[cfg(feature = "client")]
return self.state.awaiting_100_continue;
#[cfg(not(feature = "client"))]
return false;
}

pub(crate) fn set_write_strategy_flatten(&mut self) {
self.io.set_write_strategy_flatten();
}
Expand Down Expand Up @@ -219,6 +233,8 @@ where
h09_responses: self.state.h09_responses,
#[cfg(feature = "ffi")]
on_informational: &mut self.state.on_informational,
#[cfg(feature = "client")]
awaiting_100_continue: &mut self.state.awaiting_100_continue,
}
)) {
Ok(msg) => msg,
Expand Down Expand Up @@ -842,6 +858,8 @@ struct State {
upgrade: Option<crate::upgrade::Pending>,
/// Either HTTP/1.0 or 1.1 connection
version: Version,
#[cfg(feature = "client")]
awaiting_100_continue: bool,
}

#[derive(Debug)]
Expand Down
9 changes: 9 additions & 0 deletions src/proto/h1/dispatch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,11 @@ where
{
if let Some(msg) = ready!(Pin::new(&mut self.dispatch).poll_msg(cx)) {
let (head, body) = msg.map_err(crate::Error::new_user_service)?;
let expect_100_continue = T::is_client()
&& head.headers.get(http::header::EXPECT).map_or(false, |h| {
h.as_bytes().eq_ignore_ascii_case(b"100-continue")
});


let body_type = if body.is_end_stream() {
self.body_rx.set(None);
Expand All @@ -324,10 +329,14 @@ where
btype
};
self.conn.write_head(head, body_type);
#[cfg(feature = "client")]
self.conn.set_awaiting_100_continue(expect_100_continue);
} else {
self.close();
return Poll::Ready(Ok(()));
}
} else if self.conn.is_awaiting_100_continue() {
ready!(self.poll_read(cx))?;
} else if !self.conn.can_buffer_body() {
ready!(self.poll_flush(cx))?;
} else {
Expand Down
4 changes: 4 additions & 0 deletions src/proto/h1/io.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,8 @@ where
h09_responses: parse_ctx.h09_responses,
#[cfg(feature = "ffi")]
on_informational: parse_ctx.on_informational,
#[cfg(feature = "client")]
awaiting_100_continue: parse_ctx.awaiting_100_continue,
},
)? {
Some(msg) => {
Expand Down Expand Up @@ -734,6 +736,8 @@ mod tests {
h09_responses: false,
#[cfg(feature = "ffi")]
on_informational: &mut None,
#[cfg(feature = "client")]
awaiting_100_continue: &mut false,
};
assert!(buffered
.parse::<ClientTransaction>(cx, parse_ctx)
Expand Down
2 changes: 2 additions & 0 deletions src/proto/h1/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ pub(crate) struct ParseContext<'a> {
h09_responses: bool,
#[cfg(feature = "ffi")]
on_informational: &'a mut Option<crate::ffi::OnInformational>,
#[cfg(feature = "client")]
awaiting_100_continue: &'a mut bool,
}

/// Passed to Http1Transaction::encode
Expand Down
36 changes: 36 additions & 0 deletions src/proto/h1/role.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1073,6 +1073,10 @@ impl Http1Transaction for Client {
}));
}

if head.subject == StatusCode::CONTINUE {
*ctx.awaiting_100_continue = false;
}

#[cfg(feature = "ffi")]
if head.subject.is_informational() {
if let Some(callback) = ctx.on_informational {
Expand Down Expand Up @@ -1574,6 +1578,8 @@ mod tests {
h09_responses: false,
#[cfg(feature = "ffi")]
on_informational: &mut None,
#[cfg(feature = "client")]
awaiting_100_continue: &mut false,
},
)
.unwrap()
Expand Down Expand Up @@ -1605,6 +1611,8 @@ mod tests {
h09_responses: false,
#[cfg(feature = "ffi")]
on_informational: &mut None,
#[cfg(feature = "client")]
awaiting_100_continue: &mut false,
};
let msg = Client::parse(&mut raw, ctx).unwrap().unwrap();
assert_eq!(raw.len(), 0);
Expand All @@ -1631,6 +1639,8 @@ mod tests {
h09_responses: false,
#[cfg(feature = "ffi")]
on_informational: &mut None,
#[cfg(feature = "client")]
awaiting_100_continue: &mut false,
};
Server::parse(&mut raw, ctx).unwrap_err();
}
Expand All @@ -1655,6 +1665,8 @@ mod tests {
h09_responses: true,
#[cfg(feature = "ffi")]
on_informational: &mut None,
#[cfg(feature = "client")]
awaiting_100_continue: &mut false,
};
let msg = Client::parse(&mut raw, ctx).unwrap().unwrap();
assert_eq!(raw, H09_RESPONSE);
Expand All @@ -1681,6 +1693,8 @@ mod tests {
h09_responses: false,
#[cfg(feature = "ffi")]
on_informational: &mut None,
#[cfg(feature = "client")]
awaiting_100_continue: &mut false,
};
Client::parse(&mut raw, ctx).unwrap_err();
assert_eq!(raw, H09_RESPONSE);
Expand Down Expand Up @@ -1711,6 +1725,8 @@ mod tests {
h09_responses: false,
#[cfg(feature = "ffi")]
on_informational: &mut None,
#[cfg(feature = "client")]
awaiting_100_continue: &mut false,
};
let msg = Client::parse(&mut raw, ctx).unwrap().unwrap();
assert_eq!(raw.len(), 0);
Expand Down Expand Up @@ -1738,6 +1754,8 @@ mod tests {
h09_responses: false,
#[cfg(feature = "ffi")]
on_informational: &mut None,
#[cfg(feature = "client")]
awaiting_100_continue: &mut false,
};
Client::parse(&mut raw, ctx).unwrap_err();
}
Expand All @@ -1760,6 +1778,8 @@ mod tests {
h09_responses: false,
#[cfg(feature = "ffi")]
on_informational: &mut None,
#[cfg(feature = "client")]
awaiting_100_continue: &mut false,
};
let parsed_message = Server::parse(&mut raw, ctx).unwrap().unwrap();
let orig_headers = parsed_message
Expand Down Expand Up @@ -1803,6 +1823,8 @@ mod tests {
h09_responses: false,
#[cfg(feature = "ffi")]
on_informational: &mut None,
#[cfg(feature = "client")]
awaiting_100_continue: &mut false,
},
)
.expect("parse ok")
Expand All @@ -1827,6 +1849,8 @@ mod tests {
h09_responses: false,
#[cfg(feature = "ffi")]
on_informational: &mut None,
#[cfg(feature = "client")]
awaiting_100_continue: &mut false,
},
)
.expect_err(comment)
Expand Down Expand Up @@ -2060,6 +2084,8 @@ mod tests {
h09_responses: false,
#[cfg(feature = "ffi")]
on_informational: &mut None,
#[cfg(feature = "client")]
awaiting_100_continue: &mut false,
}
)
.expect("parse ok")
Expand All @@ -2084,6 +2110,8 @@ mod tests {
h09_responses: false,
#[cfg(feature = "ffi")]
on_informational: &mut None,
#[cfg(feature = "client")]
awaiting_100_continue: &mut false,
},
)
.expect("parse ok")
Expand All @@ -2108,6 +2136,8 @@ mod tests {
h09_responses: false,
#[cfg(feature = "ffi")]
on_informational: &mut None,
#[cfg(feature = "client")]
awaiting_100_continue: &mut false,
},
)
.expect_err("parse should err")
Expand Down Expand Up @@ -2627,6 +2657,8 @@ mod tests {
h09_responses: false,
#[cfg(feature = "ffi")]
on_informational: &mut None,
#[cfg(feature = "client")]
awaiting_100_continue: &mut false,
},
)
.expect("parse ok")
Expand Down Expand Up @@ -2715,6 +2747,8 @@ mod tests {
h09_responses: false,
#[cfg(feature = "ffi")]
on_informational: &mut None,
#[cfg(feature = "client")]
awaiting_100_continue: &mut false,
},
)
.unwrap()
Expand Down Expand Up @@ -2759,6 +2793,8 @@ mod tests {
h09_responses: false,
#[cfg(feature = "ffi")]
on_informational: &mut None,
#[cfg(feature = "client")]
awaiting_100_continue: &mut false,
},
)
.unwrap()
Expand Down
49 changes: 49 additions & 0 deletions tests/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2318,6 +2318,55 @@ mod conn {
assert!(error.is_user());
}

#[tokio::test]
async fn test_await_100_continue() {
let (listener, addr) = setup_tk_test_server().await;

let server = async move {
let mut sock = listener.accept().await.unwrap().0;
let mut buf = [0; 4096];
let n = sock.read(&mut buf).await.expect("read 1");

// we should have received just the headers
let expected = "PUT /a HTTP/1.1\r\nexpect: 100-continue\r\ncontent-length: 8\r\n\r\n";
assert_eq!(s(&buf[..n]), expected);

sock.write_all(b"HTTP/1.1 100 Continue\r\n\r\n")
.await
.unwrap();

let n = sock.read(&mut buf).await.expect("read 2");

// the next read should hold the body
let expected = "baguette";
assert_eq!(s(&buf[..n]), expected);

sock.write_all(b"HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n")
.await
.unwrap();
};

let client = async move {
let tcp = tcp_connect(&addr).await.expect("connect");
let (mut client, conn) = conn::http1::handshake(tcp).await.expect("handshake");

tokio::task::spawn(async move {
conn.await.expect("http conn");
});

let req = Request::builder()
.method(Method::PUT)
.header(http::header::EXPECT, "100-continue")
.uri("/a")
.body(String::from("baguette"))
.unwrap();
let res = client.send_request(req).await.expect("send_request");
assert_eq!(res.status(), hyper::StatusCode::OK);
};

future::join(server, client).await;
}

async fn drain_til_eof<T: tokio::io::AsyncRead + Unpin>(mut sock: T) -> io::Result<()> {
let mut buf = [0u8; 1024];
loop {
Expand Down
Loading