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

fix(http client): use https connector for https #750

Merged
merged 3 commits into from
May 3, 2022
Merged

fix(http client): use https connector for https #750

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc31042
fix: use https conn for https
niklasad1 Apr 30, 2022
da579d9
enable integration tests for https and wss
niklasad1 Apr 30, 2022
5457bde
remove socket options of http client
niklasad1 May 3, 2022
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
17 changes: 8 additions & 9 deletions client/http-client/src/transport.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@ impl HttpTransportClient {
return Err(Error::Url("Port number is missing in the URL".into()));
}

let mut connector = HttpConnector::new();

connector.set_reuse_address(true);
connector.set_nodelay(true);

let client = match target.scheme_str() {
Some("http") => {
let mut connector = HttpConnector::new();

connector.set_reuse_address(true);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove these to more "similar" to `HTTPs connector?

Copy link
Collaborator

@jsdw jsdw May 3, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does removing them have any obvious impact on anything? I did a bit of reading up on them and they both sound like optimisations anyway (I wasn't sure that nodelay would actually help anything much here; it sounds like it trades a little throughput for lower latency, and reuseaddress sounds like an optimisation around freeing up an address a little quicker mainly).

I'd vote to either remove them if no real difference is observed, or add a comment above them saying why they are important to have here. (I'd have thought you could set them for the https connector too but it wasn't so obvious to me how!)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nah, no real difference might reduce the number of file descriptors for the benchmarks.

let's remove it.

connector.set_nodelay(true);

let client = Client::builder().build::<_, hyper::Body>(connector);
HyperClient::Http(client)
}
Expand All @@ -74,16 +74,15 @@ impl HttpTransportClient {
.with_native_roots()
.https_or_http()
.enable_http1()
.wrap_connector(connector),
.build(),
CertificateStore::WebPki => hyper_rustls::HttpsConnectorBuilder::new()
.with_webpki_roots()
.https_or_http()
.enable_http1()
.wrap_connector(connector),
.build(),
_ => return Err(Error::InvalidCertficateStore),
};
let client = Client::builder().build::<_, hyper::Body>(connector);
HyperClient::Https(client)
HyperClient::Https(Client::builder().build::<_, hyper::Body>(connector))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not really sure what the impact of this change is; was wrapping the HttpConnector causing an issue?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah I see; I just read rustls/hyper-rustls#169. Interesting!

My reading/assumption was that the wrapping would work as we had expected!

}
_ => {
#[cfg(feature = "tls")]
Expand Down
6 changes: 2 additions & 4 deletions tests/tests/integration_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,17 +251,15 @@ async fn http_making_more_requests_than_allowed_should_not_deadlock() {
}

#[tokio::test]
#[ignore]
async fn https_works() {
let client = HttpClientBuilder::default().build("https://kusama-rpc.polkadot.io").unwrap();
let client = HttpClientBuilder::default().build("https://kusama-rpc.polkadot.io:443").unwrap();
jsdw marked this conversation as resolved.
Show resolved Hide resolved
let response: String = client.request("system_chain", None).await.unwrap();
assert_eq!(&response, "Kusama");
}

#[tokio::test]
#[ignore]
async fn wss_works() {
let client = WsClientBuilder::default().build("wss://kusama-rpc.polkadot.io").await.unwrap();
let client = WsClientBuilder::default().build("wss://kusama-rpc.polkadot.io:443").await.unwrap();
let response: String = client.request("system_chain", None).await.unwrap();
assert_eq!(&response, "Kusama");
}
Expand Down