Skip to content
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.

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

Clarify search through trust anchors and intermediates in path building. #197

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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
44 changes: 16 additions & 28 deletions src/verify_cert.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ pub fn build_chain(

// TODO: revocation.

match loop_while_non_fatal_error(trust_anchors, |trust_anchor: &TrustAnchor| {
let found_trust_anchor = try_any(trust_anchors, |trust_anchor: &TrustAnchor| {
let trust_anchor_subject = untrusted::Input::from(trust_anchor.subject);
if cert.issuer != trust_anchor_subject {
return Err(Error::UnknownIssuer);
Expand All @@ -72,16 +72,13 @@ pub fn build_chain(
check_signatures(supported_sig_algs, cert, trust_anchor_spki)?;

Ok(())
}) {
Ok(()) => {
return Ok(());
}
Err(..) => {
// If the error is not fatal, then keep going.
}
});

if found_trust_anchor {
return Ok(());
}

loop_while_non_fatal_error(intermediate_certs, |cert_der| {
let found_chain = try_any(intermediate_certs, |cert_der| {
let potential_issuer =
cert::parse_cert(untrusted::Input::from(*cert_der), EndEntityOrCA::CA(&cert))?;

Expand Down Expand Up @@ -125,7 +122,13 @@ pub fn build_chain(
time,
next_sub_ca_count,
)
})
});

if found_chain {
return Ok(());
}

Err(Error::UnknownIssuer)
}

fn check_signatures(
Expand Down Expand Up @@ -331,22 +334,7 @@ fn check_eku(
}
}

fn loop_while_non_fatal_error<V>(
values: V,
f: impl Fn(V::Item) -> Result<(), Error>,
) -> Result<(), Error>
where
V: IntoIterator,
{
for v in values {
match f(v) {
Ok(()) => {
return Ok(());
}
Err(..) => {
// If the error is not fatal, then keep going.
}
}
}
Err(Error::UnknownIssuer)
/// Returns true if `f(value)` succeeds for any value in `values`.
fn try_any<I, T, E>(values: impl IntoIterator<Item = I>, f: impl Fn(I) -> Result<T, E>) -> bool {
values.into_iter().any(|value| f(value).is_ok())
}