Add a simple "update keyserver" command to check for updates from hagrid for each cert.

4 files changed, 48 insertions, 12 deletions

diff --git a/src/bin.rs b/src/bin.rs
index 338a6f5..7205f43 100644
--- a/src/bin.rs
+++ b/src/bin.rs
@@ -140,6 +140,9 @@ fn main() -> Result<()> {
                 ca.export_keylist(path, signature_uri, force)?;
             }
         },
+        Command::Update { cmd } => match cmd {
+            UpdateCommand::Keyserver {} => ca.update_from_keyserver()?,
+        },
     }
 
     Ok(())
diff --git a/src/ca.rs b/src/ca.rs
index 44276ee..9ce8d7c 100644
--- a/src/ca.rs
+++ b/src/ca.rs
@@ -803,10 +803,23 @@ impl OpenpgpCa {
             .transaction(|| update::update_from_wkd(&self, cert))
     }
 
+    /// Update all certs from keyserver
+    pub fn update_from_keyserver(&self) -> Result<()> {
+        for c in self.user_certs_get_all()? {
+            let updated = self.update_from_hagrid(&c)?;
+            if updated {
+                println!("Got update for cert {}", c.fingerprint);
+            }
+        }
+        Ok(())
+    }
+
     /// Pull updates for a cert from the hagrid keyserver
     /// (https://keys.openpgp.org/) and merge any updates into our local
     /// storage for this cert.
-    pub fn update_from_hagrid(&self, cert: &models::Cert) -> Result<()> {
+    ///
+    /// Returns "true" if updated data was received, false if not.
+    pub fn update_from_hagrid(&self, cert: &models::Cert) -> Result<bool> {
         self.db()
             .transaction(|| update::update_from_hagrid(&self, cert))
     }
diff --git a/src/cli.rs b/src/cli.rs
index 5fa0d76..41f02ec 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -52,13 +52,18 @@ pub enum Command {
         #[structopt(subcommand)]
         cmd: KeyListCommand,
     },
+    /// Update
+    Update {
+        #[structopt(subcommand)]
+        cmd: UpdateCommand,
+    },
     //    /// Manage Directories
     //    Directory {
     //        #[structopt(subcommand)]
     //        cmd: DirCommand,
     //    },
     //    /// Manage key-profiles
-    //    KeyProfile {},
+    //    KeyProfile {}
 }
 
 #[derive(StructOpt, Debug)]
@@ -283,3 +288,9 @@ pub enum KeyListCommand {
         force: bool,
     },
 }
+
+#[derive(StructOpt, Debug)]
+pub enum UpdateCommand {
+    /// Update certificates from a keyserver
+    Keyserver {},
+}
diff --git a/src/update.rs b/src/update.rs
index 9568bc0..0987004 100644
--- a/src/update.rs
+++ b/src/update.rs
@@ -55,7 +55,10 @@ pub fn update_from_wkd(oca: &OpenpgpCa, cert: &models::Cert) -> Result<()> {
 
 /// Update a cert in the OpenPGP CA database from the "Hagrid" keyserver at
 /// `keys.openpgp.org`
-pub fn update_from_hagrid(oca: &OpenpgpCa, cert: &models::Cert) -> Result<()> {
+pub fn update_from_hagrid(
+    oca: &OpenpgpCa,
+    cert: &models::Cert,
+) -> Result<bool> {
     let fp = (cert.fingerprint).parse::<Fingerprint>()?;
 
     let c = Pgp::armored_to_cert(&cert.pub_cert)?;
@@ -68,15 +71,21 @@ pub fn update_from_hagrid(oca: &OpenpgpCa, cert: &models::Cert) -> Result<()> {
     let update =
         rt.block_on(async move { hagrid.get(&KeyID::from(fp)).await })?;
 
-    // Merge new certificate information into existing cert
-    if let Ok(merged) = c.merge_public(update) {
-        // Store merged cert in DB
-        let mut db_update = cert.clone();
-        db_update.pub_cert = Pgp::cert_to_armored(&merged)?;
+    // Merge new certificate information into existing cert.
+    // (Silently ignore potential errors from merge_public())
+    if let Ok(merged) = c.clone().merge_public(update) {
+        if merged != c {
+            // Store merged cert in DB
+            let mut db_update = cert.clone();
+            db_update.pub_cert = Pgp::cert_to_armored(&merged)?;
 
-        oca.db().cert_update(&db_update)
-    } else {
-        // Silently ignore potential errors from merge_public().
-        Ok(())
+            oca.db().cert_update(&db_update)?;
+
+            // An update for this cert was received
+            return Ok(true);
+        }
     }
+
+    // No update was received
+    Ok(false)
 }