Skip to content

Add support for rustls-platform-verifier #528

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
FrankenApps wants to merge 1 commit into
base: master
Choose a base branch
from
+56 −32
Open

Add support for rustls-platform-verifier #528

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
5 changes: 5 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ native-tls = ["native-tls-crate"]
native-tls-vendored = ["native-tls", "native-tls-crate/vendored"]
rustls-tls-native-roots = ["__rustls-tls", "rustls-native-certs"]
rustls-tls-webpki-roots = ["__rustls-tls", "webpki-roots"]
rustls-tls-native-platform-verifier = ["__rustls-tls", "rustls-platform-verifier"]
__rustls-tls = ["rustls", "rustls-pki-types"]

[dependencies]
Expand Down Expand Up @@ -61,6 +62,10 @@ version = "0.8.0"
optional = true
version = "0.26"

[dependencies.rustls-platform-verifier]
optional = true
version = "0.6"

[dev-dependencies]
criterion = "0.6"
env_logger = "0.11"
Expand Down
83 changes: 51 additions & 32 deletions src/tls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ mod encryption {

#[cfg(feature = "__rustls-tls")]
pub mod rustls {
use rustls::{ClientConfig, ClientConnection, RootCertStore, StreamOwned};
#[cfg(not(feature = "rustls-tls-native-platform-verifier"))]
use rustls::RootCertStore;
use rustls::{ClientConfig, ClientConnection, StreamOwned};
use rustls_pki_types::ServerName;

use std::{
Expand Down Expand Up @@ -99,43 +101,60 @@ mod encryption {
let config = match tls_connector {
Some(config) => config,
None => {
#[allow(unused_mut)]
let mut root_store = RootCertStore::empty();
#[cfg(feature = "rustls-tls-native-platform-verifier")]
{
use rustls_platform_verifier::BuilderVerifierExt;
Arc::new(
ClientConfig::builder()
.with_platform_verifier()
.map_err(TlsError::from)?
.with_no_client_auth(),
)
}

#[cfg(feature = "rustls-tls-native-roots")]
#[cfg(not(feature = "rustls-tls-native-platform-verifier"))]
{
let rustls_native_certs::CertificateResult {
certs, errors, ..
} = rustls_native_certs::load_native_certs();

if !errors.is_empty() {
log::warn!(
"native root CA certificate loading errors: {errors:?}"
);
}
#[allow(unused_mut)]
let mut root_store = RootCertStore::empty();

#[cfg(feature = "rustls-tls-native-roots")]
{
let rustls_native_certs::CertificateResult {
certs,
errors,
..
} = rustls_native_certs::load_native_certs();

if !errors.is_empty() {
log::warn!(
"native root CA certificate loading errors: {errors:?}"
);
}

// Not finding any native root CA certificates is not fatal if the
// "rustls-tls-webpki-roots" feature is enabled.
#[cfg(not(feature = "rustls-tls-webpki-roots"))]
if certs.is_empty() {
return Err(std::io::Error::new(std::io::ErrorKind::NotFound, format!("no native root CA certificates found (errors: {errors:?})")).into());
// Not finding any native root CA certificates is not fatal if the
// "rustls-tls-webpki-roots" feature is enabled.
#[cfg(not(feature = "rustls-tls-webpki-roots"))]
if certs.is_empty() {
return Err(std::io::Error::new(std::io::ErrorKind::NotFound, format!("no native root CA certificates found (errors: {errors:?})")).into());
}

let total_number = certs.len();
let (number_added, number_ignored) =
root_store.add_parsable_certificates(certs);
log::debug!("Added {number_added}/{total_number} native root certificates (ignored {number_ignored})");
}
#[cfg(feature = "rustls-tls-webpki-roots")]
{
root_store
.extend(webpki_roots::TLS_SERVER_ROOTS.iter().cloned());
}

let total_number = certs.len();
let (number_added, number_ignored) =
root_store.add_parsable_certificates(certs);
log::debug!("Added {number_added}/{total_number} native root certificates (ignored {number_ignored})");
Arc::new(
ClientConfig::builder()
.with_root_certificates(root_store)
.with_no_client_auth(),
)
}
#[cfg(feature = "rustls-tls-webpki-roots")]
{
root_store.extend(webpki_roots::TLS_SERVER_ROOTS.iter().cloned());
}

Arc::new(
ClientConfig::builder()
.with_root_certificates(root_store)
.with_no_client_auth(),
)
}
};
let domain = ServerName::try_from(domain)
Expand Down