Skip to content

fix: Don't panic if failed to add system certificate #24823

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
merged 2 commits into from
Aug 1, 2024
Merged

fix: Don't panic if failed to add system certificate #24823

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
082a93a
fix: Don't panic if failed to add system certificate
bartlomieju Jul 31, 2024
d715978
fmt
bartlomieju Jul 31, 2024
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
6 changes: 5 additions & 1 deletion cli/args/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,8 @@ pub enum RootCertStoreLoadError {
UnknownStore(String),
#[error("Unable to add pem file to certificate store: {0}")]
FailedAddPemFile(String),
#[error("Unable to add system certificate to certificate store: {0}")]
FailedAddSystemCert(String),
#[error("Failed opening CA file: {0}")]
CaFileOpenError(String),
}
Expand Down Expand Up @@ -658,7 +660,9 @@ pub fn get_root_cert_store(
for root in roots {
root_cert_store
.add(rustls::pki_types::CertificateDer::from(root.0))
.expect("Failed to add platform cert to root cert store");
.map_err(|e| {
RootCertStoreLoadError::FailedAddSystemCert(e.to_string())
})?;
}
}
_ => {
Expand Down