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

Jump to bottom

Fix panic in building h3 client when udp is forbidden #1945

Merged
merged 2 commits into from
Aug 21, 2023
Merged

Fix panic in building h3 client when udp is forbidden #1945

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
757f226
Fix panic in building h3 client when udp is forbidden
NobodyXu Aug 19, 2023
2cee5d5
Merge branch 'master' into fix/http3
seanmonstar Aug 21, 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
144 changes: 87 additions & 57 deletions src/async_impl/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,55 @@ impl ClientBuilder {
}
let http = HttpConnector::new_with_resolver(DynResolver::new(resolver.clone()));

#[cfg(all(feature = "http3", feature = "__rustls"))]
let build_h3_connector =
|resolver,
tls,
quic_max_idle_timeout: Option<Duration>,
quic_stream_receive_window,
quic_receive_window,
quic_send_window,
local_address,
http_version_pref: &HttpVersionPref| {
let mut transport_config = TransportConfig::default();

if let Some(max_idle_timeout) = quic_max_idle_timeout {
transport_config.max_idle_timeout(Some(
max_idle_timeout.try_into().map_err(error::builder)?,
));
}

if let Some(stream_receive_window) = quic_stream_receive_window {
transport_config.stream_receive_window(stream_receive_window);
}

if let Some(receive_window) = quic_receive_window {
transport_config.receive_window(receive_window);
}

if let Some(send_window) = quic_send_window {
transport_config.send_window(send_window);
}

let res = H3Connector::new(
DynResolver::new(resolver),
tls,
local_address,
transport_config,
);

match res {
Ok(connector) => Ok(Some(connector)),
Err(err) => {
if let HttpVersionPref::Http3 = http_version_pref {
Err(error::builder(err))
} else {
Ok(None)
}
}
}
};

#[cfg(feature = "__tls")]
match config.tls {
#[cfg(feature = "default-tls")]
Expand Down Expand Up @@ -367,32 +416,16 @@ impl ClientBuilder {
TlsBackend::BuiltRustls(conn) => {
#[cfg(feature = "http3")]
{
let mut transport_config = TransportConfig::default();

if let Some(max_idle_timeout) = config.quic_max_idle_timeout {
transport_config.max_idle_timeout(Some(
max_idle_timeout.try_into().map_err(error::builder)?,
));
}

if let Some(stream_receive_window) = config.quic_stream_receive_window {
transport_config.stream_receive_window(stream_receive_window);
}

if let Some(receive_window) = config.quic_receive_window {
transport_config.receive_window(receive_window);
}

if let Some(send_window) = config.quic_send_window {
transport_config.send_window(send_window);
}

h3_connector = Some(H3Connector::new(
DynResolver::new(resolver),
h3_connector = build_h3_connector(
resolver,
conn.clone(),
config.quic_max_idle_timeout,
config.quic_stream_receive_window,
config.quic_receive_window,
config.quic_send_window,
config.local_address,
transport_config,
));
&config.http_version_pref,
)?;
}

Connector::new_rustls_tls(
Expand Down Expand Up @@ -527,32 +560,16 @@ impl ClientBuilder {
{
tls.enable_early_data = config.tls_enable_early_data;

let mut transport_config = TransportConfig::default();

if let Some(max_idle_timeout) = config.quic_max_idle_timeout {
transport_config.max_idle_timeout(Some(
max_idle_timeout.try_into().map_err(error::builder)?,
));
}

if let Some(stream_receive_window) = config.quic_stream_receive_window {
transport_config.stream_receive_window(stream_receive_window);
}

if let Some(receive_window) = config.quic_receive_window {
transport_config.receive_window(receive_window);
}

if let Some(send_window) = config.quic_send_window {
transport_config.send_window(send_window);
}

h3_connector = Some(H3Connector::new(
DynResolver::new(resolver),
h3_connector = build_h3_connector(
resolver,
tls.clone(),
config.quic_max_idle_timeout,
config.quic_stream_receive_window,
config.quic_receive_window,
config.quic_send_window,
config.local_address,
transport_config,
));
&config.http_version_pref,
)?;
}

Connector::new_rustls_tls(
Expand Down Expand Up @@ -639,11 +656,15 @@ impl ClientBuilder {
accepts: config.accepts,
#[cfg(feature = "cookies")]
cookie_store: config.cookie_store,
// Use match instead of map since config is partially moved
// and it cannot be used in closure
#[cfg(feature = "http3")]
h3_client: H3Client::new(
h3_connector.expect("missing HTTP/3 connector"),
config.pool_idle_timeout,
),
h3_client: match h3_connector {
Some(h3_connector) => {
Some(H3Client::new(h3_connector, config.pool_idle_timeout))
}
None => None,
},
hyper: builder.build(connector),
headers: config.headers,
redirect_policy: config.redirect_policy,
Expand Down Expand Up @@ -1759,10 +1780,10 @@ impl Client {

let in_flight = match version {
#[cfg(feature = "http3")]
http::Version::HTTP_3 => {
http::Version::HTTP_3 if self.inner.h3_client.is_some() => {
let mut req = builder.body(body).expect("valid request parts");
*req.headers_mut() = headers.clone();
ResponseFuture::H3(self.inner.h3_client.request(req))
ResponseFuture::H3(self.inner.h3_client.as_ref().unwrap().request(req))
}
_ => {
let mut req = builder
Expand Down Expand Up @@ -1986,7 +2007,7 @@ struct ClientRef {
headers: HeaderMap,
hyper: HyperClient,
#[cfg(feature = "http3")]
h3_client: H3Client,
h3_client: Option<H3Client>,
redirect_policy: redirect::Policy,
referer: bool,
request_timeout: Option<Duration>,
Expand Down Expand Up @@ -2117,7 +2138,13 @@ impl PendingRequest {
.body(body)
.expect("valid request parts");
*req.headers_mut() = self.headers.clone();
ResponseFuture::H3(self.client.h3_client.request(req))
ResponseFuture::H3(
self.client
.h3_client
.as_ref()
.expect("H3 client must exists, otherwise we can't have a h3 request here")
.request(req),
)
}
_ => {
let mut req = hyper::Request::builder()
Expand Down Expand Up @@ -2339,7 +2366,10 @@ impl Future for PendingRequest {
.expect("valid request parts");
*req.headers_mut() = headers.clone();
std::mem::swap(self.as_mut().headers(), &mut headers);
ResponseFuture::H3(self.client.h3_client.request(req))
ResponseFuture::H3(self.client.h3_client
.as_ref()
.expect("H3 client must exists, otherwise we can't have a h3 request here")
.request(req))
}
_ => {
let mut req = hyper::Request::builder()
Expand Down
6 changes: 3 additions & 3 deletions src/async_impl/h3_client/connect.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ impl H3Connector {
tls: rustls::ClientConfig,
local_addr: Option<IpAddr>,
transport_config: TransportConfig,
) -> H3Connector {
) -> Result<H3Connector, BoxError> {
let mut config = ClientConfig::new(Arc::new(tls));
// FIXME: Replace this when there is a setter.
config.transport_config(Arc::new(transport_config));
Expand All @@ -38,10 +38,10 @@ impl H3Connector {
None => "[::]:0".parse::<SocketAddr>().unwrap(),
};

let mut endpoint = Endpoint::client(socket_addr).expect("unable to create QUIC endpoint");
let mut endpoint = Endpoint::client(socket_addr)?;
endpoint.set_default_client_config(config);

Self { resolver, endpoint }
Ok(Self { resolver, endpoint })
}

pub async fn connect(&mut self, dest: Uri) -> Result<H3Connection, BoxError> {
Expand Down
Loading