Skip to content

feat: add webpki roots support #23

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

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

feat: add webpki roots support #23

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
19 changes: 14 additions & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,8 @@ hyper-util = { version = "0.1", features = ["tokio"] }
hyper-tls = { version = "0.6", optional = true }

# `rustls` feature
hyper-rustls = { version = "0.26", optional = true }
rusttls = { package = "rustls", version = "0.22", optional = true }
rustls-native-certs = { version = "0.7", optional = true }
rusttls = { package = "rustls", version = "0.23", default-features = false, optional = true }
hyper-rustls = { version = "0.27", default-features = false, optional = true }

[dev-dependencies]
tokio = { version = "1.0", features = ["macros"] }
Expand All @@ -40,5 +39,15 @@ bytes = "1"

[features]
default = ["tls"]
tls = ["hyper-tls"]
rustls = ["hyper-rustls", "rusttls", "rustls-native-certs"]
tls = ["dep:hyper-tls"]
# for compatibility
rustls = ["rustls-native-roots"]
_rustls = ["dep:rusttls", "dep:hyper-rustls", "hyper-rustls?/http1", "tls12", "logging", "aws-lc-rs"]
rustls-native-roots = ["_rustls", "hyper-rustls?/native-tokio"]
rustls-webpki-roots = ["_rustls", "hyper-rustls?/webpki-tokio"]
# only available for hyper-rustls
tls12 = ["rusttls?/tls12", "hyper-rustls?/tls12"]
logging = ["rusttls?/logging", "hyper-rustls?/logging"]
aws-lc-rs = ["rusttls?/aws-lc-rs", "hyper-rustls?/aws-lc-rs"]
fips = ["rusttls?/fips", "hyper-rustls?/fips"]
ring = ["rusttls?/ring", "hyper-rustls?/ring"]
31 changes: 20 additions & 11 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
//! * `tls` feature is enabled by default. It adds TLS support using `hyper-tls`.
//! * `rustls` feature adds TLS support using `hyper-rustls`.

#[cfg(all(feature = "tls", feature = "rustls"))]
#[cfg(all(feature = "tls", feature = "_rustls"))]
compile_error!(
"`tls` and `rustls` features are mutually exclusive. You should enable only one of them"
);
Expand All @@ -45,7 +45,7 @@ use hyper::{
rt::{Read, Write},
Uri,
};
#[cfg(feature = "rustls")]
#[cfg(feature = "_rustls")]
use hyper_rustls::HttpsConnector;
#[cfg(feature = "tls")]
use hyper_tls::HttpsConnector;
Expand Down Expand Up @@ -112,19 +112,28 @@ impl<C> SocksConnector<C> {
}

/// Create a new connector with TLS support
#[cfg(feature = "rustls")]
#[cfg(feature = "_rustls")]
pub fn with_tls(self) -> Result<HttpsConnector<Self>, io::Error> {
let mut root_store = rusttls::RootCertStore::empty();
for cert in rustls_native_certs::load_native_certs()? {
root_store
.add(cert)
.map_err(|err| io::Error::new(io::ErrorKind::InvalidData, err))?;
}
Ok(self.with_rustls_root_cert_store(root_store))
use hyper_rustls::ConfigBuilderExt as _;
use rusttls::ClientConfig;
use std::sync::Arc;

let config = ClientConfig::builder();

#[cfg(feature = "rustls-webpki-roots")]
let config = config.with_webpki_roots();

#[cfg(feature = "rustls-native-roots")]
let config = config.with_native_roots()?;

let config = Arc::new(config.with_no_client_auth());

let args = (self, config);
Ok(HttpsConnector::from(args))
}

/// Create a new connector with TLS support using cert store
#[cfg(feature = "rustls")]
#[cfg(feature = "_rustls")]
pub fn with_rustls_root_cert_store(
self,
root_store: rusttls::RootCertStore,
Expand Down