Async

Cargo.toml

@@ -10,11 +10,11 @@ serde_derive = "1"
 serde_json = "1"
 openssl = "0"
 base64 = "0"
-acme-lib = { git = 'https://github.com/DBCDK/acme-lib', branch = 'dbc-fork' }
+acme-lib = { git = 'https://github.com/DBCDK/acme-lib', branch = 'dbc-fork-merge-upstream' }
 regex = "1"
 lazy_static = "1"
 walkdir = "2"
-trust-dns-resolver = "0"
+trust-dns-resolver = { version = "0", features = ["tokio-runtime"] }
 env_logger = "0"
 prometheus_exporter_base = { version = "=1.4.0", features = ["hyper_server"] }
 tokio = { version = "1", features = [ "full" ] }

nixos/vault-test.nix

@@ -92,17 +92,16 @@ nixos-lib.runTest (
                   }
                 ];
               }
-              # Multiple vaultmonitorconfigs break faythe currently, commented out
-              # {
-              #   inherit role_id_path secret_id_path vault_addr;
-              #   key_prefix = "path2";
-              #   specs = [
-              #     {
-              #       name = "path2-test";
-              #       cn = "path2.${domain}";
-              #     }
-              #   ];
-              # }
+              {
+                inherit role_id_path secret_id_path vault_addr;
+                key_prefix = "path2";
+                specs = [
+                  {
+                    name = "path2-test";
+                    cn = "path2.${domain}";
+                  }
+                ];
+              }
             ];
             lets_encrypt_url = "https://${nodes.acme.test-support.acme.caDomain}/dir";
             lets_encrypt_email = "test_mail@${domain}";
@@ -131,6 +130,7 @@ nixos-lib.runTest (
             dnsutils
             vault
             getent
+            lsof
           ];
 
           environment.variables.VAULT_ADDR = vault_addr;
@@ -215,6 +215,8 @@ nixos-lib.runTest (
               dnsutils
               dig
             ];
+            environment.RUST_BACKTRACE = "full";
+            environment.RUST_LOG = "warn,acme_lib=debug";
             wantedBy = [ "multi-user.target" ];
             wants = [ "vault-provision.service" ];
             after = [ "vault-provision.service" ];
@@ -241,8 +243,7 @@ nixos-lib.runTest (
 
       with subtest("Can get certs"):
           client.wait_until_succeeds("""
-            vault kv get kv/path1/path1-test/cert
-            # vault kv get kv/path2/path2-test/cert
+            vault kv get kv/path1/path1-test/cert && vault kv get kv/path2/path2-test/cert
           """)
 
       with subtest("No failed dispatch in vaultrs"):

src/common.rs

@@ -156,7 +156,7 @@ impl CertSpec {
 }
 
 pub trait Persistable {
-    fn persist(&self, cert: Certificate) -> Result<(), PersistError>;
+    async fn persist(&self, cert: Certificate) -> Result<(), PersistError>;
 }
 
 #[derive(Debug, Clone, Serialize)]
@@ -183,11 +183,11 @@ pub enum PersistSpec {
 }
 
 impl Persistable for CertSpec {
-    fn persist(&self, cert: Certificate) -> Result<(), PersistError> {
+    async fn persist(&self, cert: Certificate) -> Result<(), PersistError> {
         match &self.persist_spec {
             PersistSpec::KUBERNETES(spec) => Ok(kube::persist(&spec, &cert)?),
             PersistSpec::FILE(spec) => Ok(file::persist(&spec, &cert)?),
-            PersistSpec::VAULT(spec) => Ok(vault::persist(&spec, cert)?),
+            PersistSpec::VAULT(spec) => Ok(vault::persist(&spec, cert).await?),
             //PersistSpec::FILE(_spec) => { unimplemented!() },
             PersistSpec::DONTPERSIST => { Ok(()) }
         }
@@ -325,8 +325,8 @@ pub trait ValidityVerifier {
 
 pub trait CertSpecable: IssueSource {
     fn to_cert_spec(&self, config: &ConfigContainer) -> Result<CertSpec, SpecError>;
-    fn touch(&self, config: &ConfigContainer) -> Result<(), TouchError>;
-    fn should_retry(&self, config: &ConfigContainer) -> bool;
+    async fn touch(&self, config: &ConfigContainer) -> Result<(), TouchError>;
+    async fn should_retry(&self, config: &ConfigContainer) -> bool;
 }
 
 pub trait IssueSource {

src/dns/mod.rs

@@ -8,7 +8,7 @@ use std::convert::From;
 use crate::log;
 use crate::common::{CertSpec, DNSName, SpecError};
 use crate::config::Zone;
-use self::trust_dns_resolver::Resolver;
+use self::trust_dns_resolver::TokioAsyncResolver;
 use self::trust_dns_resolver::error::{ResolveError,ResolveErrorKind};
 use std::string::String;
 
@@ -77,9 +77,9 @@ pub fn delete(config: &FaytheConfig, spec: &CertSpec) -> Result<(), DNSError> {
     Ok(())
 }
 
-pub fn query(resolver: &Resolver, host: &DNSName, proof: &String) -> Result<(), DNSError> {
+pub async fn query(resolver: &TokioAsyncResolver, host: &DNSName, proof: &String) -> Result<(), DNSError> {
     let challenge_host = challenge_host(host, None);
-    match resolver.txt_lookup(&challenge_host) {
+    match resolver.txt_lookup(&challenge_host).await {
         Ok(res) => {
             let trim_chars: &[_] = &['"', '\n'];
             res.iter().find(|record_set|

src/file.rs

@@ -151,7 +151,7 @@ impl CertSpecable for FileSpec {
         })
     }
 
-    fn touch(&self, config: &ConfigContainer) -> Result<(), TouchError> {
+    async fn touch(&self, config: &ConfigContainer) -> Result<(), TouchError> {
         let monitor_config = config.get_file_monitor_config()?;
         let names = default_file_names(&self);
         let sub_dir = absolute_dir_path(&monitor_config, names.sub_directory.as_ref());
@@ -164,7 +164,7 @@ impl CertSpecable for FileSpec {
         Ok(())
     }
 
-    fn should_retry(&self, config: &ConfigContainer) -> bool {
+    async fn should_retry(&self, config: &ConfigContainer) -> bool {
         use std::time::Duration;
 
         match || -> Result<(), TouchError> {
@@ -212,6 +212,7 @@ impl FileNames {
     }
 }
 
+#[derive(Debug)]
 pub enum FileError {
     IO
 }