refine danger:StifledCertificateVerifier

This commit is contained in:
nworbnhoj 2024-02-25 15:50:47 +10:00
parent 92d1b21caf
commit 1f6ec1fe69

View file

@ -42,49 +42,51 @@ impl ServerCertVerifier for StifledCertificateVerification {
ocsp: &[u8], ocsp: &[u8],
now: UnixTime, now: UnixTime,
) -> Result<ServerCertVerified, rustls::Error> { ) -> Result<ServerCertVerified, rustls::Error> {
if let Ok(rustls_default_verifier) = match WebPkiServerVerifier::builder(Arc::new(self.roots.clone())).build() {
WebPkiServerVerifier::builder(Arc::new(self.roots.clone())).build() Ok(rustls_default_verifier) => {
{ match rustls_default_verifier.verify_server_cert(
match rustls_default_verifier.verify_server_cert( end_entity,
end_entity, intermediates,
intermediates, server_name,
server_name, ocsp,
ocsp, now,
now, ) {
) { Ok(ok) => Ok(ok),
Ok(ok) => Ok(ok), Err(Error::InvalidCertificate(e)) => {
Err(Error::InvalidCertificate(e)) => { let xns = XousNames::new().unwrap();
let xns = XousNames::new().unwrap(); let modals = Modals::new(&xns).unwrap();
let modals = Modals::new(&xns).unwrap(); match e {
match e { CertificateError::UnknownIssuer => Ok(ServerCertVerified::assertion()),
CertificateError::UnknownIssuer => Ok(ServerCertVerified::assertion()), CertificateError::NotValidYet => {
CertificateError::NotValidYet => { modals
modals .show_notification(t!("tls.probe_help_not_valid_yet", locales::LANG), None)
.show_notification(t!("tls.probe_help_not_valid_yet", locales::LANG), None) .expect("modal failed");
.expect("modal failed"); Err(Error::InvalidCertificate(e))
Err(Error::InvalidCertificate(e)) }
} _ => {
_ => { modals
modals .show_notification(
.show_notification( format!(
format!( "{}\n{:?}",
"{}\n{:?}", t!("tls.probe_invalid_certificate", locales::LANG),
t!("tls.probe_invalid_certificate", locales::LANG), e
e )
.as_str(),
None,
) )
.as_str(), .expect("modal failed");
None,
)
.expect("modal failed");
Err(Error::InvalidCertificate(e)) Err(Error::InvalidCertificate(e))
}
} }
} }
Err(e) => Err(e),
} }
Err(e) => Err(e), },
Err(e) => {
log::warn!("failed to build WebPkiServerVerifier: {e}");
Err(Error::General("failed to build WebPkiServerVerifier".to_string()))
} }
} else {
Err(Error::General("failed to build WebPkiServerVerifier".to_string()))
} }
} }