Skip to content

💥 Only enable native roots if CA override not specified #1007

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

Merged
Sushisource merged 1 commit into from
Sep 10, 2025
Merged

💥 Only enable native roots if CA override not specified #1007

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
4 changes: 3 additions & 1 deletion client/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,11 +607,13 @@ impl ClientOptions {
/// Passes it through if TLS options not set.
async fn add_tls_to_channel(&self, mut channel: Endpoint) -> Result<Endpoint, ClientInitError> {
if let Some(tls_cfg) = &self.tls_cfg {
let mut tls = tonic::transport::ClientTlsConfig::new().with_native_roots();
let mut tls = tonic::transport::ClientTlsConfig::new();

if let Some(root_cert) = &tls_cfg.server_root_ca_cert {
let server_root_ca_cert = Certificate::from_pem(root_cert);
tls = tls.ca_certificate(server_root_ca_cert);
} else {
tls = tls.with_native_roots();
}

if let Some(domain) = &tls_cfg.domain {
Expand Down
Loading