Support fetching intermediates

upki-cli/src/bin/upki.rs

@@ -14,8 +14,10 @@ use tracing_subscriber::layer::SubscriberExt;
 use tracing_subscriber::util::SubscriberInitExt;
 use upki::revocation::{Index, RevocationCheckInput};
 #[cfg(feature = "__fetch")]
-use upki::revocation::{Manifest, fetch};
+use upki::revocation::Manifest;
 use upki::{Config, ConfigPath};
+#[cfg(feature = "__fetch")]
+use upki::{intermediates, revocation};
 
 #[tokio::main(flavor = "current_thread")]
 async fn main() -> Result<ExitCode, Report> {
@@ -47,7 +49,15 @@ async fn main() -> Result<ExitCode, Report> {
 
     Ok(match args.command {
         #[cfg(feature = "__fetch")]
-        Command::Fetch { dry_run } => fetch(dry_run, &config).await?,
+        Command::Fetch { dry_run } => {
+            match (
+                revocation::fetch(dry_run, &config).await?,
+                intermediates::fetch(dry_run, &config).await?,
+            ) {
+                (ExitCode::SUCCESS, ExitCode::SUCCESS) => ExitCode::SUCCESS,
+                (..) => ExitCode::FAILURE,
+            }
+        }
         #[cfg(feature = "__fetch")]
         Command::Verify => Manifest::from_config(&config)?.verify(&config)?,
         Command::ShowConfigPath => unreachable!(),

upki-cli/tests/integration.rs

@@ -49,7 +49,7 @@ fn config_unknown_fields() {
           |
         1 | cache_dir = "tests/data/config_unknown_fields/"
           | ^^^^^^^^^
-        unknown field `cache_dir`, expected `cache-dir` or `revocation`
+        unknown field `cache_dir`, expected one of `cache-dir`, `revocation`, `intermediates`
 
 
     Location:

upki-mirror/src/bin/intermediates.rs

@@ -10,7 +10,7 @@ use eyre::{Context, Report, anyhow};
 use rustls_pki_types::CertificateDer;
 use rustls_pki_types::pem::PemObject;
 use serde::Deserialize;
-use upki::revocation::{Manifest, ManifestFile};
+use upki::data::{Manifest, ManifestFile};
 
 #[tokio::main(flavor = "current_thread")]
 async fn main() -> Result<(), Report> {

upki-mirror/src/bin/mozilla-crlite.rs

@@ -7,7 +7,7 @@ use std::time::SystemTime;
 use aws_lc_rs::digest::{SHA256, digest};
 use clap::{Parser, ValueEnum};
 use eyre::{Context, Report, anyhow};
-use upki::revocation::{Manifest, ManifestFile};
+use upki::data::{Manifest, ManifestFile};
 
 #[tokio::main(flavor = "current_thread")]
 async fn main() -> Result<(), Report> {