AcmeActor extracts primary/secondary URLs; Consul KV client for strings

Also rearranged imports throughout the project, because I couldn't resist, sorry.

.rustfmt.toml

@@ -0,0 +1,2 @@
+hard_tabs = false
+tab_spaces = 2

README.md

@@ -40,10 +40,13 @@ cargo build
 consul agent -dev # in a separate terminal
 
 # adapt following values to your configuration
-export DIPLONAT_PRIVATE_IP="192.168.0.18"
-export DIPLONAT_REFRESH_TIME="60"
-export DIPLONAT_EXPIRATION_TIME="300"
 export DIPLONAT_CONSUL_NODE_NAME="lheureduthe"
+export DIPLONAT_FIREWALL_ENABLE="true"
+export DIPLONAT_FIREWALL_REFRESH_TIME="300"
+export DIPLONAT_IGD_ENABLE="true"
+export DIPLONAT_IGD_PRIVATE_IP="192.168.0.18"
+export DIPLONAT_IGD_REFRESH_TIME="60"
+export DIPLONAT_IGD_EXPIRATION_TIME="300"
 export RUST_LOG=debug
 cargo run
 ```

docker-compose.yml

@@ -5,10 +5,13 @@ services:
     image: darkgallium/amd64_diplonat:v2
     network_mode: host # required by UPNP/IGD
     environment:
-      DIPLONAT_PRIVATE_IP: 192.168.0.18
-      DIPLONAT_REFRESH_TIME: 60
-      DIPLONAT_EXPIRATION_TIME: 300
       DIPLONAT_CONSUL_NODE_NAME: lheureduthe
+      DIPLONAT_FIREWALL_ENABLE: true
+      DIPLONAT_FIREWALL_REFRESH_TIME: 60
+      DIPLONAT_IGD_ENABLE: true
+      DIPLONAT_IGD_PRIVATE_IP: 192.168.0.18
+      DIPLONAT_IGD_EXPIRATION_TIME: 300
+      DIPLONAT_IGD_REFRESH_TIME: 60
       RUST_LOG: debug
 
 

src/acme_actor.rs

@@ -0,0 +1,72 @@
+use anyhow::Result;
+use log::*;
+use tokio::{
+  select,
+  sync::watch,
+  time::{self, Duration},
+};
+
+use crate::config::RuntimeConfigAcme;
+use crate::messages;
+
+pub struct AcmeActor {
+  email: String,
+  //last_ports: messages::PublicExposedPorts,
+  refresh: Duration,
+
+  rx_ports: watch::Receiver<messages::PublicExposedPorts>,
+}
+
+impl AcmeActor {
+  pub async fn new(
+    config: Option<RuntimeConfigAcme>,
+    rxp: &watch::Receiver<messages::PublicExposedPorts>,
+  ) -> Result<Option<Self>> {
+    if config.is_none() {
+      return Ok(None);
+    }
+    let config = config.unwrap();
+
+    let ctx = Self {
+      email: config.email,
+      //last_ports: messages::PublicExposedPorts::new(),
+      refresh: config.refresh_time,
+      rx_ports: rxp.clone(),
+    };
+
+    Ok(Some(ctx))
+  }
+
+  pub async fn listen(&mut self) -> Result<()> {
+    let mut interval = time::interval(self.refresh);
+    loop {
+      select! {
+        Some(ports) = self.rx_ports.recv() => {
+          match self.do_acme(ports).await {
+            Ok(()) => debug!("Successfully updated ACME"),
+            Err(e) => error!("An error occured while updating ACME. {}", e),
+          }
+        },
+        _ = interval.tick() => continue,
+        else => break // Sender dropped, terminate loop.
+      }
+    }
+
+    Ok(())
+  }
+
+  pub async fn do_acme(&self, ports: messages::PublicExposedPorts) -> Result<()> {
+    if ports.acme.is_empty() {
+      return Ok(());
+    }
+
+    let primary_url = &ports.acme[0];
+    let secondary_urls = &ports.acme[1..];
+
+    println!("Doing ACME!!!");
+    println!("Primary URL: {:?}", primary_url);
+    println!("Secondary URLs: {:?}", secondary_urls);
+
+    Ok(())
+  }
+}

src/config/mod.rs

@@ -3,8 +3,12 @@ mod options;
 mod options_test;
 mod runtime;
 
-pub use options::{ConfigOpts, ConfigOptsAcme, ConfigOptsBase, ConfigOptsConsul};
-pub use runtime::{RuntimeConfig, RuntimeConfigAcme, RuntimeConfigConsul, RuntimeConfigFirewall, RuntimeConfigIgd};
+pub use options::{
+  ConfigOpts, ConfigOptsAcme, ConfigOptsConsul, ConfigOptsFirewall, ConfigOptsIgd,
+};
+pub use runtime::{
+  RuntimeConfig, RuntimeConfigAcme, RuntimeConfigConsul, RuntimeConfigFirewall, RuntimeConfigIgd,
+};
 
 pub const EXPIRATION_TIME: u16 = 300;
 pub const REFRESH_TIME: u16 = 60;

src/config/options.rs

@@ -8,27 +8,12 @@ use crate::config::RuntimeConfig;
 // This file parses the options that can be declared in the environment.
 // runtime.rs applies business logic and builds RuntimeConfig structs.
 
-/// Base configuration options
-#[derive(Clone, Default, Deserialize)]
-pub struct ConfigOptsBase {
-	/// This node's private IP address [default: None]
-	pub private_ip: Option<String>,
-	/// Expiration time for IGD rules [default: 60]
-	pub expiration_time: Option<u16>,
-	/// Refresh time for IGD and Firewall rules [default: 300]
-	pub refresh_time: Option<u16>,
-}
-
-/// ACME configuration options
-#[derive(Clone, Default, Deserialize)]
-pub struct ConfigOptsAcme {
-	/// Whether ACME is enabled [default: false]
-	#[serde(default)]
-	pub enable: bool,
-
-	/// The default domain holder's e-mail [default: None]
-	pub email: Option<String>,
-}
+// - Note for the future -
+// There is no *need* to have a 'DIPLONAT_XXX_*' prefix for all config options.
+// If some config options are shared by several modules, a ConfigOptsBase could
+// contain them, and parse the 'DIPLONAT_*' prefix directly.
+// Only in runtime.rs would these options find their proper location in each
+// module's struct.
 
 /// Consul configuration options
 #[derive(Clone, Default, Deserialize)]
@@ -39,38 +24,85 @@ pub struct ConfigOptsConsul {
   pub url: Option<String>,
 }
 
+/// ACME configuration options
+#[derive(Clone, Default, Deserialize)]
+pub struct ConfigOptsAcme {
+  /// Whether the ACME module is enabled [default: false]
+  #[serde(default)]
+  pub enable: bool,
+
+  /// The default domain holder's e-mail [default: None]
+  pub email: Option<String>,
+  /// Refresh time for firewall rules [default: 300]
+  pub refresh_time: Option<u16>,
+}
+
+/// Firewall configuration options
+#[derive(Clone, Default, Deserialize)]
+pub struct ConfigOptsFirewall {
+  /// Whether the firewall module is enabled [default: false]
+  #[serde(default)]
+  pub enable: bool,
+
+  /// Refresh time for firewall rules [default: 300]
+  pub refresh_time: Option<u16>,
+}
+
+/// IGD configuration options
+#[derive(Clone, Default, Deserialize)]
+pub struct ConfigOptsIgd {
+  /// Whether the IGD module is enabled [default: false]
+  #[serde(default)]
+  pub enable: bool,
+
+  /// This node's private IP address [default: None]
+  pub private_ip: Option<String>,
+  /// Expiration time for IGD rules [default: 60]
+  pub expiration_time: Option<u16>,
+  /// Refresh time for IGD rules [default: 300]
+  pub refresh_time: Option<u16>,
+}
+
 /// Model of all potential configuration options
 pub struct ConfigOpts {
-	pub base: ConfigOptsBase,
-	pub acme: ConfigOptsAcme,
   pub consul: ConfigOptsConsul,
+  pub acme: ConfigOptsAcme,
+  pub firewall: ConfigOptsFirewall,
+  pub igd: ConfigOptsIgd,
 }
 
 impl ConfigOpts {
   pub fn from_env() -> Result<RuntimeConfig> {
-		let base: ConfigOptsBase = envy::prefixed("DIPLONAT_").from_env()?;
     let consul: ConfigOptsConsul = envy::prefixed("DIPLONAT_CONSUL_").from_env()?;
     let acme: ConfigOptsAcme = envy::prefixed("DIPLONAT_ACME_").from_env()?;
+    let firewall: ConfigOptsFirewall = envy::prefixed("DIPLONAT_FIREWALL_").from_env()?;
+    let igd: ConfigOptsIgd = envy::prefixed("DIPLONAT_IGD_").from_env()?;
 
     RuntimeConfig::new(Self {
-			base: base,
-			consul: consul,
-			acme: acme,
+      consul,
+      acme,
+      firewall,
+      igd,
     })
   }
 
   // Currently only used in tests
   #[allow(dead_code)]
   pub fn from_iter<Iter: Clone>(iter: Iter) -> Result<RuntimeConfig>
-	where Iter: IntoIterator<Item = (String, String)> {
-		let base: ConfigOptsBase = envy::prefixed("DIPLONAT_").from_iter(iter.clone())?;
+  where
+    Iter: IntoIterator<Item = (String, String)>,
+  {
     let consul: ConfigOptsConsul = envy::prefixed("DIPLONAT_CONSUL_").from_iter(iter.clone())?;
     let acme: ConfigOptsAcme = envy::prefixed("DIPLONAT_ACME_").from_iter(iter.clone())?;
+    let firewall: ConfigOptsFirewall =
+      envy::prefixed("DIPLONAT_FIREWALL_").from_iter(iter.clone())?;
+    let igd: ConfigOptsIgd = envy::prefixed("DIPLONAT_IGD_").from_iter(iter.clone())?;
 
     RuntimeConfig::new(Self {
-			base: base,
-			consul: consul,
-			acme: acme,
+      consul,
+      acme,
+      firewall,
+      igd,
     })
   }
 }

src/config/options_test.rs

@@ -11,44 +11,68 @@ use crate::config::*;
 
 fn minimal_valid_options() -> HashMap<String, String> {
   let mut opts = HashMap::new();
-	opts.insert("DIPLONAT_PRIVATE_IP".to_string(), "172.123.43.555".to_string());
-    opts.insert("DIPLONAT_CONSUL_NODE_NAME".to_string(), "consul_node".to_string());
+  opts.insert(
+    "DIPLONAT_CONSUL_NODE_NAME".to_string(),
+    "consul_node".to_string(),
+  );
   opts
 }
 
 fn all_valid_options() -> HashMap<String, String> {
   let mut opts = minimal_valid_options();
-	opts.insert("DIPLONAT_EXPIRATION_TIME".to_string(), "30".to_string());
-	opts.insert("DIPLONAT_REFRESH_TIME".to_string(), "10".to_string());
-    opts.insert("DIPLONAT_CONSUL_URL".to_string(), "http://127.0.0.1:9999".to_string());
+  opts.insert(
+    "DIPLONAT_CONSUL_URL".to_string(),
+    "http://127.0.0.1:9999".to_string(),
+  );
   opts.insert("DIPLONAT_ACME_ENABLE".to_string(), "true".to_string());
-	opts.insert("DIPLONAT_ACME_EMAIL".to_string(), "bozo@bozo.net".to_string());
+  opts.insert(
+    "DIPLONAT_ACME_EMAIL".to_string(),
+    "bozo@bozo.net".to_string(),
+  );
+  opts.insert("DIPLONAT_FIREWALL_ENABLE".to_string(), "true".to_string());
+  opts.insert(
+    "DIPLONAT_FIREWALL_REFRESH_TIME".to_string(),
+    "20".to_string(),
+  );
+  opts.insert("DIPLONAT_IGD_ENABLE".to_string(), "true".to_string());
+  opts.insert(
+    "DIPLONAT_IGD_PRIVATE_IP".to_string(),
+    "172.123.43.555".to_string(),
+  );
+  opts.insert("DIPLONAT_IGD_EXPIRATION_TIME".to_string(), "60".to_string());
+  opts.insert("DIPLONAT_IGD_REFRESH_TIME".to_string(), "10".to_string());
   opts
 }
 
+// #[test]
+// #[should_panic]
+// fn err_empty_env() {
+// 	 std::env::remove_var("DIPLONAT_CONSUL_NODE_NAME");
+// 	 ConfigOpts::from_env().unwrap();
+// }
+
 #[test]
 #[should_panic]
 fn err_empty_env() {
-	std::env::remove_var("DIPLONAT_PRIVATE_IP");
   std::env::remove_var("DIPLONAT_CONSUL_NODE_NAME");
-	ConfigOpts::from_env().unwrap();
+  let opts: HashMap<String, String> = HashMap::new();
+  ConfigOpts::from_iter(opts).unwrap();
 }
 
 #[test]
-fn ok_from_iter_minimal_valid_options() {
+fn ok_minimal_valid_options() {
   let opts = minimal_valid_options();
   let rt_config = ConfigOpts::from_iter(opts.clone()).unwrap();
 
-	assert!(rt_config.acme.is_none());
   assert_eq!(
     &rt_config.consul.node_name,
     opts.get(&"DIPLONAT_CONSUL_NODE_NAME".to_string()).unwrap()
   );
-	assert_eq!(
-		rt_config.consul.url, 
-		CONSUL_URL.to_string()
-	);
-	assert_eq!(
+  assert_eq!(rt_config.consul.url, CONSUL_URL.to_string());
+  assert!(rt_config.acme.is_none());
+  assert!(rt_config.firewall.is_none());
+  assert!(rt_config.igd.is_none());
+  /*assert_eq!(
     rt_config.firewall.refresh_time,
     Duration::from_secs(REFRESH_TIME.into())
   );
@@ -63,36 +87,49 @@ fn ok_from_iter_minimal_valid_options() {
   assert_eq!(
     rt_config.igd.refresh_time,
     Duration::from_secs(REFRESH_TIME.into())
-	);
+  );*/
 }
 
 #[test]
 #[should_panic]
-fn err_from_iter_invalid_refresh_time() {
+fn err_invalid_igd_options() {
   let mut opts = minimal_valid_options();
-	opts.insert("DIPLONAT_EXPIRATION_TIME".to_string(), "60".to_string());
-	opts.insert("DIPLONAT_REFRESH_TIME".to_string(), "60".to_string());
+  opts.insert("DIPLONAT_IGD_ENABLE".to_string(), "true".to_string());
+  opts.insert("DIPLONAT_IGD_EXPIRATION_TIME".to_string(), "60".to_string());
+  opts.insert("DIPLONAT_IGD_REFRESH_TIME".to_string(), "60".to_string());
   ConfigOpts::from_iter(opts).unwrap();
 }
 
 #[test]
-fn ok_from_iter_all_valid_options() {
+fn ok_all_valid_options() {
   let opts = all_valid_options();
   let rt_config = ConfigOpts::from_iter(opts.clone()).unwrap();
 
-	let expiration_time = Duration::from_secs(
-		opts.get(&"DIPLONAT_EXPIRATION_TIME".to_string()).unwrap()
-			.parse::<u64>().unwrap()
-			.into());
-	let refresh_time = Duration::from_secs(
-		opts.get(&"DIPLONAT_REFRESH_TIME".to_string()).unwrap()
-			.parse::<u64>().unwrap()
-			.into());
+  let firewall_refresh_time = Duration::from_secs(
+    opts
+      .get(&"DIPLONAT_FIREWALL_REFRESH_TIME".to_string())
+      .unwrap()
+      .parse::<u64>()
+      .unwrap()
+      .into(),
+  );
+  let igd_expiration_time = Duration::from_secs(
+    opts
+      .get(&"DIPLONAT_IGD_EXPIRATION_TIME".to_string())
+      .unwrap()
+      .parse::<u64>()
+      .unwrap()
+      .into(),
+  );
+  let igd_refresh_time = Duration::from_secs(
+    opts
+      .get(&"DIPLONAT_IGD_REFRESH_TIME".to_string())
+      .unwrap()
+      .parse::<u64>()
+      .unwrap()
+      .into(),
+  );
 
-	assert!(rt_config.acme.is_some());
-	assert_eq!(
-		&rt_config.acme.unwrap().email,
-		opts.get(&"DIPLONAT_ACME_EMAIL".to_string()).unwrap());
   assert_eq!(
     &rt_config.consul.node_name,
     opts.get(&"DIPLONAT_CONSUL_NODE_NAME".to_string()).unwrap()
@@ -101,20 +138,24 @@ fn ok_from_iter_all_valid_options() {
     &rt_config.consul.url,
     opts.get(&"DIPLONAT_CONSUL_URL".to_string()).unwrap()
   );
+
+  assert!(rt_config.acme.is_some());
+  let acme = rt_config.acme.unwrap();
   assert_eq!(
-		rt_config.firewall.refresh_time,
-		refresh_time
+    &acme.email,
+    opts.get(&"DIPLONAT_ACME_EMAIL".to_string()).unwrap()
   );
+
+  assert!(rt_config.firewall.is_some());
+  let firewall = rt_config.firewall.unwrap();
+  assert_eq!(firewall.refresh_time, firewall_refresh_time);
+
+  assert!(rt_config.igd.is_some());
+  let igd = rt_config.igd.unwrap();
   assert_eq!(
-		&rt_config.igd.private_ip,
-		opts.get(&"DIPLONAT_PRIVATE_IP".to_string()).unwrap()
-	);
-	assert_eq!(
-		rt_config.igd.expiration_time,
-		expiration_time
-	);
-	assert_eq!(
-		rt_config.igd.refresh_time,
-		refresh_time
+    &igd.private_ip,
+    opts.get(&"DIPLONAT_IGD_PRIVATE_IP".to_string()).unwrap()
   );
+  assert_eq!(igd.expiration_time, igd_expiration_time);
+  assert_eq!(igd.refresh_time, igd_refresh_time);
 }

src/config/runtime.rs

@@ -1,18 +1,17 @@
 use std::time::Duration;
 
-use anyhow::{Result, anyhow};
+use anyhow::{anyhow, Result};
 
-use crate::config::{ConfigOpts, ConfigOptsAcme, ConfigOptsBase, ConfigOptsConsul};
+use crate::config::{
+  ConfigOpts, ConfigOptsAcme, ConfigOptsConsul, ConfigOptsFirewall, ConfigOptsIgd,
+};
 
 // This code is inspired by the Trunk crate (https://github.com/thedodd/trunk)
 
 // In this file, we take ConfigOpts and transform them into ready-to-use RuntimeConfig.
 // We apply default values and business logic.
 
-#[derive(Debug)]
-pub struct RuntimeConfigAcme {
-	pub email: String,
-}
+// Consul config is mandatory, all the others are optional.
 
 #[derive(Debug)]
 pub struct RuntimeConfigConsul {
@@ -20,6 +19,12 @@ pub struct RuntimeConfigConsul {
   pub url: String,
 }
 
+#[derive(Debug)]
+pub struct RuntimeConfigAcme {
+  pub email: String,
+  pub refresh_time: Duration,
+}
+
 #[derive(Debug)]
 pub struct RuntimeConfigFirewall {
   pub refresh_time: Duration,
@@ -34,18 +39,18 @@ pub struct RuntimeConfigIgd {
 
 #[derive(Debug)]
 pub struct RuntimeConfig {
-	pub acme: Option<RuntimeConfigAcme>,
   pub consul: RuntimeConfigConsul,
-	pub firewall: RuntimeConfigFirewall,
-	pub igd: RuntimeConfigIgd,
+  pub acme: Option<RuntimeConfigAcme>,
+  pub firewall: Option<RuntimeConfigFirewall>,
+  pub igd: Option<RuntimeConfigIgd>,
 }
 
 impl RuntimeConfig {
   pub fn new(opts: ConfigOpts) -> Result<Self> {
-		let acme = RuntimeConfigAcme::new(opts.acme.clone())?;
     let consul = RuntimeConfigConsul::new(opts.consul.clone())?;
-		let firewall = RuntimeConfigFirewall::new(opts.base.clone())?;
-		let igd = RuntimeConfigIgd::new(opts.base.clone())?;
+    let acme = RuntimeConfigAcme::new(opts.acme.clone())?;
+    let firewall = RuntimeConfigFirewall::new(opts.firewall.clone())?;
+    let igd = RuntimeConfigIgd::new(opts.igd.clone())?;
 
     Ok(Self {
       acme,
@@ -56,54 +61,63 @@ impl RuntimeConfig {
   }
 }
 
+impl RuntimeConfigConsul {
+  pub(super) fn new(opts: ConfigOptsConsul) -> Result<Self> {
+    let node_name = opts
+      .node_name
+      .expect("'DIPLONAT_CONSUL_NODE_NAME' is required");
+    let url = opts.url.unwrap_or(super::CONSUL_URL.to_string());
+
+    Ok(Self { node_name, url })
+  }
+}
+
 impl RuntimeConfigAcme {
   pub fn new(opts: ConfigOptsAcme) -> Result<Option<Self>> {
     if !opts.enable {
       return Ok(None);
     }
 
-		let email = opts.email.expect(
-			"'DIPLONAT_ACME_EMAIL' environment variable is required \
-			if 'DIPLONAT_ACME_ENABLE' == 'true'");
+    let email = opts
+      .email
+      .expect("'DIPLONAT_ACME_EMAIL' is required if ACME is enabled");
+    let refresh_time = Duration::from_secs(opts.refresh_time.unwrap_or(super::REFRESH_TIME).into());
 
     Ok(Some(Self {
       email,
+      refresh_time,
     }))
   }
 }
 
-impl RuntimeConfigConsul {
-	pub(super) fn new(opts: ConfigOptsConsul) -> Result<Self> {
-		let node_name = opts.node_name.expect(
-			"'DIPLONAT_CONSUL_NODE_NAME' environment variable is required");
-		let url = opts.url.unwrap_or(super::CONSUL_URL.to_string());
-
-		Ok(Self {
-			node_name,
-			url,
-		})
-	}
-}
-
 impl RuntimeConfigFirewall {
-	pub(super) fn new(opts: ConfigOptsBase) -> Result<Self> {
-		let refresh_time = Duration::from_secs(
-				opts.refresh_time.unwrap_or(super::REFRESH_TIME).into());
+  pub(super) fn new(opts: ConfigOptsFirewall) -> Result<Option<Self>> {
+    if !opts.enable {
+      return Ok(None);
+    }
 
-		Ok(Self {
-			refresh_time,
-		})
+    let refresh_time = Duration::from_secs(opts.refresh_time.unwrap_or(super::REFRESH_TIME).into());
+
+    Ok(Some(Self { refresh_time }))
   }
 }
 
 impl RuntimeConfigIgd {
-	pub(super) fn new(opts: ConfigOptsBase) -> Result<Self> {
-		let private_ip = opts.private_ip.expect(
-			"'DIPLONAT_PRIVATE_IP' environment variable is required");
+  pub(super) fn new(opts: ConfigOptsIgd) -> Result<Option<Self>> {
+    if !opts.enable {
+      return Ok(None);
+    }
+
+    let private_ip = opts
+      .private_ip
+      .expect("'DIPLONAT_IGD_PRIVATE_IP' is required if IGD is enabled");
     let expiration_time = Duration::from_secs(
-				opts.expiration_time.unwrap_or(super::EXPIRATION_TIME).into());
-		let refresh_time = Duration::from_secs(
-				opts.refresh_time.unwrap_or(super::REFRESH_TIME).into());
+      opts
+        .expiration_time
+        .unwrap_or(super::EXPIRATION_TIME)
+        .into(),
+    );
+    let refresh_time = Duration::from_secs(opts.refresh_time.unwrap_or(super::REFRESH_TIME).into());
 
     if refresh_time.as_secs() * 2 > expiration_time.as_secs() {
       return Err(anyhow!(
@@ -112,10 +126,10 @@ impl RuntimeConfigIgd {
 	        refresh_time.as_secs()));
     }
 
-		Ok(Self {
+    Ok(Some(Self {
       private_ip,
       expiration_time,
       refresh_time,
-		})
+    }))
   }
 }

src/consul.rs

@@ -1,21 +1,22 @@
-use serde::{Serialize, Deserialize};
 use std::collections::HashMap;
-use anyhow::{Result, anyhow};
+
+use anyhow::{anyhow, Result};
+use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct ServiceEntry {
-  pub Tags: Vec<String>
+  pub Tags: Vec<String>,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct CatalogNode {
-  pub Services: HashMap<String, ServiceEntry>
+  pub Services: HashMap<String, ServiceEntry>,
 }
 
 pub struct Consul {
   client: reqwest::Client,
   url: String,
-  idx: Option<u64>
+  idx: Option<u64>,
 }
 
 impl Consul {
@@ -23,7 +24,7 @@ impl Consul {
     return Self {
       client: reqwest::Client::new(),
       url: url.to_string(),
-      idx: None
+      idx: None,
     };
   }
 
@@ -34,16 +35,16 @@ impl Consul {
   pub async fn watch_node(&mut self, host: &str) -> Result<CatalogNode> {
     let url = match self.idx {
       Some(i) => format!("{}/v1/catalog/node/{}?index={}", self.url, host, i),
-      None => format!("{}/v1/catalog/node/{}", self.url, host)
+      None => format!("{}/v1/catalog/node/{}", self.url, host),
     };
 
     let http = self.client.get(&url).send().await?;
     self.idx = match http.headers().get("X-Consul-Index") {
       Some(v) => Some(v.to_str()?.parse::<u64>()?),
-      None => return Err(anyhow!("X-Consul-Index header not found"))
+      None => return Err(anyhow!("X-Consul-Index header not found")),
     };
 
     let resp: CatalogNode = http.json().await?;
-    return Ok(resp)
+    return Ok(resp);
   }
 }

src/consul_actor.rs

@@ -1,24 +1,29 @@
 use std::cmp;
+use std::collections::HashSet;
 use std::time::Duration;
+
+use anyhow::Result;
 use log::*;
+use serde::{Deserialize, Serialize};
+use serde_lexpr::{error, from_str};
 use tokio::sync::watch;
 use tokio::time::delay_for;
-use anyhow::Result;
-use serde::{Serialize, Deserialize};
-use serde_lexpr::{from_str,error};
-use crate::messages;
+
+use crate::config::RuntimeConfigConsul;
 use crate::consul;
-use std::collections::HashSet;
+use crate::messages;
 
 #[derive(Serialize, Deserialize, Debug)]
+#[serde(rename_all = "snake_case")]
 pub enum DiplonatParameter {
-  tcp_port(HashSet<u16>),
-  udp_port(HashSet<u16>)
+  TcpPort(HashSet<u16>),
+  UdpPort(HashSet<u16>),
+  Acme(Vec<String>),
 }
 
 #[derive(Serialize, Deserialize, Debug)]
 pub enum DiplonatConsul {
-  diplonat(Vec<DiplonatParameter>)
+  diplonat(Vec<DiplonatParameter>),
 }
 
 pub struct ConsulActor {
@@ -27,13 +32,17 @@ pub struct ConsulActor {
   consul: consul::Consul,
   node: String,
   retries: u32,
-  tx_open_ports: watch::Sender<messages::PublicExposedPorts>
+
+  tx_open_ports: watch::Sender<messages::PublicExposedPorts>,
 }
 
 fn retry_to_time(retries: u32, max_time: Duration) -> Duration {
   // 1.2^x seems to be a good value to exponentially increase time at a good pace
   // eg. 1.2^32 = 341 seconds ~= 5 minutes - ie. after 32 retries we wait 5 minutes
-  return Duration::from_secs(cmp::min(max_time.as_secs(), 1.2f64.powf(retries as f64) as u64))
+  return Duration::from_secs(cmp::min(
+    max_time.as_secs(),
+    1.2f64.powf(retries as f64) as u64,
+  ));
 }
 
 fn to_parameters(catalog: &consul::CatalogNode) -> Vec<DiplonatConsul> {
@@ -53,17 +62,15 @@ fn to_parameters(catalog: &consul::CatalogNode) -> Vec<DiplonatConsul> {
 }
 
 fn to_open_ports(params: &Vec<DiplonatConsul>) -> messages::PublicExposedPorts {
-  let mut op = messages::PublicExposedPorts { 
-    tcp_ports: HashSet::new(),
-    udp_ports: HashSet::new()
-  };
+  let mut op = messages::PublicExposedPorts::new();
 
   for conf in params {
     let DiplonatConsul::diplonat(c) = conf;
     for parameter in c {
       match parameter {
-        DiplonatParameter::tcp_port(p) => op.tcp_ports.extend(p),
-        DiplonatParameter::udp_port(p) => op.udp_ports.extend(p),
+        DiplonatParameter::TcpPort(p) => op.tcp_ports.extend(p),
+        DiplonatParameter::UdpPort(p) => op.udp_ports.extend(p),
+        DiplonatParameter::Acme(urls) => op.acme.extend_from_slice(urls.as_slice()),
       };
     }
   }
@@ -72,18 +79,15 @@ fn to_open_ports(params: &Vec<DiplonatConsul>) -> messages::PublicExposedPorts {
 }
 
 impl ConsulActor {
-  pub fn new(url: &str, node: &str) -> Self {
-    let (tx, rx) = watch::channel(messages::PublicExposedPorts{
-      tcp_ports: HashSet::new(),
-      udp_ports: HashSet::new()
-    });
+  pub fn new(config: RuntimeConfigConsul) -> Self {
+    let (tx, rx) = watch::channel(messages::PublicExposedPorts::new());
 
     return Self {
-      consul: consul::Consul::new(url),
+      consul: consul::Consul::new(&config.url),
+      node: config.node_name,
+      retries: 0,
       rx_open_ports: rx,
       tx_open_ports: tx,
-      node: node.to_string(),
-      retries: 0,
     };
   }
 
@@ -95,14 +99,18 @@ impl ConsulActor {
           self.consul.watch_node_reset();
           self.retries = cmp::min(std::u32::MAX - 1, self.retries) + 1;
           let will_retry_in = retry_to_time(self.retries, Duration::from_secs(600));
-          error!("Failed to query consul. Will retry in {}s. {}", will_retry_in.as_secs(), e);
+          error!(
+            "Failed to query consul. Will retry in {}s. {}",
+            will_retry_in.as_secs(),
+            e
+          );
           delay_for(will_retry_in).await;
           continue;
         }
       };
       self.retries = 0;
       let msg = to_open_ports(&to_parameters(&catalog));
-      debug!("Extracted configuration: {:#?}", msg);
+      debug!("Extracted configuration:\n{:#?}", msg);
 
       self.tx_open_ports.broadcast(msg)?;
     }

src/consul_kv.rs

@@ -0,0 +1,41 @@
+use anyhow::{anyhow, Result};
+
+pub struct ConsulKV {
+  client: reqwest::Client,
+  url: String,
+}
+
+impl ConsulKV {
+  pub fn new(url: &str) -> Self {
+    Self {
+      client: reqwest::Client::new(),
+      url: url.to_string(),
+    }
+  }
+
+  pub async fn get_string(&self, key: &str) -> Result<String> {
+    let url = format!("{}/v1/kv/{}?raw", self.url, key);
+
+    let resp = self.client.get(&url).send().await?;
+
+    if resp.status() != reqwest::StatusCode::OK {
+      return Err(anyhow!("{} returned {}", url, resp.status()));
+    }
+
+    match resp.text().await {
+      Ok(s) => Ok(s),
+      Err(e) => Err(anyhow!("{}", e)),
+    }
+  }
+
+  pub async fn put_string(&self, key: &str, value: String) -> Result<()> {
+    let url = format!("{}/v1/kv/{}", self.url, key);
+
+    let resp = self.client.put(&url).body(value).send().await?;
+
+    match resp.status() {
+      reqwest::StatusCode::OK => Ok(()),
+      s => Err(anyhow!("{} returned {}", url, s)),
+    }
+  }
+}

src/diplonat.rs

@@ -1,6 +1,8 @@
-use anyhow::Result;
+use anyhow::{anyhow, Result};
+use log::debug;
 use tokio::try_join;
 
+use crate::acme_actor::AcmeActor;
 use crate::config::ConfigOpts;
 use crate::consul_actor::ConsulActor;
 use crate::fw_actor::FirewallActor;
@@ -8,43 +10,66 @@ use crate::igd_actor::IgdActor;
 
 pub struct Diplonat {
   consul: ConsulActor,
-  firewall: FirewallActor,
-  igd: IgdActor,
+
+  acme: Option<AcmeActor>,
+  firewall: Option<FirewallActor>,
+  igd: Option<IgdActor>,
 }
 
 impl Diplonat {
   pub async fn new() -> Result<Self> {
-    let rt_cfg = ConfigOpts::from_env()?;
-    println!("{:#?}", rt_cfg);
+    let config = ConfigOpts::from_env()?;
+    debug!("{:#?}", config);
 
-    let ca = ConsulActor::new(&rt_cfg.consul.url, &rt_cfg.consul.node_name);
+    let consul_actor = ConsulActor::new(config.consul);
 
-    let fw = FirewallActor::new(
-        rt_cfg.firewall.refresh_time,
-        &ca.rx_open_ports
-    ).await?;
+    let acme_actor = AcmeActor::new(config.acme, &consul_actor.rx_open_ports).await?;
 
-    let ia = IgdActor::new(
-      &rt_cfg.igd.private_ip, 
-      rt_cfg.igd.refresh_time, 
-      rt_cfg.igd.expiration_time, 
-      &ca.rx_open_ports
-    ).await?;
+    let firewall_actor = FirewallActor::new(config.firewall, &consul_actor.rx_open_ports).await?;
+
+    let igd_actor = IgdActor::new(config.igd, &consul_actor.rx_open_ports).await?;
+
+    if acme_actor.is_none() && firewall_actor.is_none() && igd_actor.is_none() {
+      return Err(anyhow!(
+        "At least enable *one* module, otherwise it's boring!"
+      ));
+    }
 
     let ctx = Self {
-      consul: ca,
-      igd: ia,
-      firewall: fw
+      consul: consul_actor,
+      acme: acme_actor,
+      firewall: firewall_actor,
+      igd: igd_actor,
     };
 
     return Ok(ctx);
   }
 
   pub async fn listen(&mut self) -> Result<()> {
+    let acme = &mut self.acme;
+    let firewall = &mut self.firewall;
+    let igd = &mut self.igd;
+
     try_join!(
       self.consul.listen(),
-      self.igd.listen(),
-      self.firewall.listen()
+      async {
+        match acme {
+          Some(x) => x.listen().await,
+          None => Ok(()),
+        }
+      },
+      async {
+        match firewall {
+          Some(x) => x.listen().await,
+          None => Ok(()),
+        }
+      },
+      async {
+        match igd {
+          Some(x) => x.listen().await,
+          None => Ok(()),
+        }
+      },
     )?;
 
     return Ok(());

src/fw.rs

@@ -1,48 +1,65 @@
+// use std::collections::HashSet;
+
+use anyhow::{Context, Result};
 use iptables;
-use regex::Regex;
-use std::collections::HashSet;
-use crate::messages;
-use anyhow::{Result,Context};
 use log::*;
+use regex::Regex;
+
+use crate::messages;
 
 pub fn setup(ipt: &iptables::IPTables) -> Result<()> {
-
   // ensure we start from a clean state without any rule already set
   cleanup(ipt)?;
 
-    ipt.new_chain("filter", "DIPLONAT").context("Failed to create new chain")?;
-    ipt.insert_unique("filter", "INPUT", "-j DIPLONAT", 1).context("Failed to insert jump rule")?;
+  ipt
+    .new_chain("filter", "DIPLONAT")
+    .context("Failed to create new chain")?;
+  ipt
+    .insert_unique("filter", "INPUT", "-j DIPLONAT", 1)
+    .context("Failed to insert jump rule")?;
 
   Ok(())
 }
 
 pub fn open_ports(ipt: &iptables::IPTables, ports: messages::PublicExposedPorts) -> Result<()> {
   for p in ports.tcp_ports {
-        ipt.append("filter", "DIPLONAT", &format!("-p tcp --dport {} -j ACCEPT", p)).context("Failed to insert port rule")?;
+    ipt
+      .append(
+        "filter",
+        "DIPLONAT",
+        &format!("-p tcp --dport {} -j ACCEPT", p),
+      )
+      .context("Failed to insert port rule")?;
   }
 
   for p in ports.udp_ports {
-        ipt.append("filter", "DIPLONAT", &format!("-p udp --dport {} -j ACCEPT", p)).context("Failed to insert port rule")?;
+    ipt
+      .append(
+        "filter",
+        "DIPLONAT",
+        &format!("-p udp --dport {} -j ACCEPT", p),
+      )
+      .context("Failed to insert port rule")?;
   }
 
   Ok(())
 }
 
 pub fn get_opened_ports(ipt: &iptables::IPTables) -> Result<messages::PublicExposedPorts> {
-    let mut ports = messages::PublicExposedPorts {
-        tcp_ports: HashSet::new(),
-        udp_ports: HashSet::new()
-    };
+  let mut ports = messages::PublicExposedPorts::new();
+  // let mut ports = messages::PublicExposedPorts {
+  //     tcp_ports: HashSet::new(),
+  //     udp_ports: HashSet::new()
+  // };
 
   let list = ipt.list("filter", "DIPLONAT")?;
-    let re = Regex::new(r"\-A.*? \-p (\w+).*\-\-dport (\d+).*?\-j ACCEPT").context("Regex matching open ports encountered an unexpected rule")?;
+  let re = Regex::new(r"\-A.*? \-p (\w+).*\-\-dport (\d+).*?\-j ACCEPT")
+    .context("Regex matching open ports encountered an unexpected rule")?;
   for i in list {
     let caps = re.captures(&i);
     match caps {
       Some(c) => {
-           
         if let (Some(raw_proto), Some(raw_port)) = (c.get(1), c.get(2)) {
-
           let proto = String::from(raw_proto.as_str());
           let number = String::from(raw_port.as_str()).parse::<u16>()?;
 
@@ -51,12 +68,10 @@ pub fn get_opened_ports(ipt: &iptables::IPTables) -> Result<messages::PublicExpo
           } else {
             ports.udp_ports.insert(number);
           }
-
         } else {
           error!("Unexpected rule found in DIPLONAT chain")
         }
-
-            },
+      }
       _ => {}
     }
   }
@@ -65,17 +80,21 @@ pub fn get_opened_ports(ipt: &iptables::IPTables) -> Result<messages::PublicExpo
 }
 
 pub fn cleanup(ipt: &iptables::IPTables) -> Result<()> {
-    
   if ipt.chain_exists("filter", "DIPLONAT")? {
-        ipt.flush_chain("filter", "DIPLONAT").context("Failed to flush the DIPLONAT chain")?;
+    ipt
+      .flush_chain("filter", "DIPLONAT")
+      .context("Failed to flush the DIPLONAT chain")?;
 
     if ipt.exists("filter", "INPUT", "-j DIPLONAT")? {
-            ipt.delete("filter", "INPUT", "-j DIPLONAT").context("Failed to delete jump rule")?;
+      ipt
+        .delete("filter", "INPUT", "-j DIPLONAT")
+        .context("Failed to delete jump rule")?;
     }
 
-        ipt.delete_chain("filter", "DIPLONAT").context("Failed to delete chain")?;
+    ipt
+      .delete_chain("filter", "DIPLONAT")
+      .context("Failed to delete chain")?;
   }
 
   Ok(())
 }
-

src/fw_actor.rs

@@ -1,37 +1,47 @@
+use std::collections::HashSet;
+
 use anyhow::Result;
+use iptables;
+use log::*;
 use tokio::{
   select,
   sync::watch,
-  time::{
-    self, 
-    Duration
-}};
-use log::*;
+  time::{self, Duration},
+};
 
-use iptables;
-use crate::messages;
+use crate::config::RuntimeConfigFirewall;
 use crate::fw;
-use std::collections::HashSet;
+use crate::messages;
 
 pub struct FirewallActor {
   pub ipt: iptables::IPTables,
-  rx_ports: watch::Receiver<messages::PublicExposedPorts>,
+
   last_ports: messages::PublicExposedPorts,
-  refresh: Duration
+  refresh: Duration,
+
+  rx_ports: watch::Receiver<messages::PublicExposedPorts>,
 }
 
 impl FirewallActor {
-  pub async fn new(_refresh: Duration, rxp: &watch::Receiver<messages::PublicExposedPorts>) -> Result<Self> {
+  pub async fn new(
+    config: Option<RuntimeConfigFirewall>,
+    rxp: &watch::Receiver<messages::PublicExposedPorts>,
+  ) -> Result<Option<Self>> {
+    if config.is_none() {
+      return Ok(None);
+    }
+    let config = config.unwrap();
+
     let ctx = Self {
       ipt: iptables::new(false)?,
-      rx_ports: rxp.clone(),
       last_ports: messages::PublicExposedPorts::new(),
-      refresh: _refresh,
+      refresh: config.refresh_time,
+      rx_ports: rxp.clone(),
     };
 
     fw::setup(&ctx.ipt)?;
 
-    return Ok(ctx);
+    return Ok(Some(ctx));
   }
 
   pub async fn listen(&mut self) -> Result<()> {
@@ -45,7 +55,9 @@ impl FirewallActor {
       };
 
       // 2. Update last ports if needed
-      if let Some(p) = new_ports { self.last_ports = p; }
+      if let Some(p) = new_ports {
+        self.last_ports = p;
+      }
 
       // 3. Update firewall rules
       match self.do_fw_update().await {
@@ -58,18 +70,27 @@ impl FirewallActor {
   pub async fn do_fw_update(&self) -> Result<()> {
     let curr_opened_ports = fw::get_opened_ports(&self.ipt)?;
 
-    let diff_tcp = self.last_ports.tcp_ports.difference(&curr_opened_ports.tcp_ports).copied().collect::<HashSet<u16>>();
-    let diff_udp = self.last_ports.udp_ports.difference(&curr_opened_ports.udp_ports).copied().collect::<HashSet<u16>>();
+    let diff_tcp = self
+      .last_ports
+      .tcp_ports
+      .difference(&curr_opened_ports.tcp_ports)
+      .copied()
+      .collect::<HashSet<u16>>();
+    let diff_udp = self
+      .last_ports
+      .udp_ports
+      .difference(&curr_opened_ports.udp_ports)
+      .copied()
+      .collect::<HashSet<u16>>();
 
     let ports_to_open = messages::PublicExposedPorts {
       tcp_ports: diff_tcp,
-        udp_ports: diff_udp
+      udp_ports: diff_udp,
+      acme: Vec::new(),
     };
 
     fw::open_ports(&self.ipt, ports_to_open)?;
 
     return Ok(());
   }
-
 }
-

src/igd_actor.rs

@@ -1,43 +1,53 @@
+use std::net::SocketAddrV4;
+
+use anyhow::{Context, Result};
 use igd::aio::*;
 use igd::PortMappingProtocol;
-use std::net::SocketAddrV4;
 use log::*;
-use anyhow::{Result, Context};
 use tokio::{
   select,
   sync::watch,
-  time::{
-    self, 
-    Duration
-}};
+  time::{self, Duration},
+};
+
+use crate::config::RuntimeConfigIgd;
 use crate::messages;
 
 pub struct IgdActor {
-  last_ports: messages::PublicExposedPorts,
-  rx_ports: watch::Receiver<messages::PublicExposedPorts>,
-  gateway: Gateway,
-  refresh: Duration,
   expire: Duration,
-  private_ip: String
+  gateway: Gateway,
+  last_ports: messages::PublicExposedPorts,
+  private_ip: String,
+  refresh: Duration,
+
+  rx_ports: watch::Receiver<messages::PublicExposedPorts>,
 }
 
 impl IgdActor {
-  pub async fn new(priv_ip: &str, refresh: Duration, expire: Duration, rxp: &watch::Receiver<messages::PublicExposedPorts>) -> Result<Self> {
+  pub async fn new(
+    config: Option<RuntimeConfigIgd>,
+    rxp: &watch::Receiver<messages::PublicExposedPorts>,
+  ) -> Result<Option<Self>> {
+    if config.is_none() {
+      return Ok(None);
+    }
+    let config = config.unwrap();
+
     let gw = search_gateway(Default::default())
       .await
       .context("Failed to find IGD gateway")?;
     info!("IGD gateway: {}", gw);
 
     let ctx = Self {
+      expire: config.expiration_time,
       gateway: gw,
+      last_ports: messages::PublicExposedPorts::new(),
+      private_ip: config.private_ip,
+      refresh: config.refresh_time,
       rx_ports: rxp.clone(),
-      private_ip: priv_ip.to_string(),
-      refresh: refresh,
-      expire: expire,
-      last_ports: messages::PublicExposedPorts::new()
     };
 
-    return Ok(ctx);
+    return Ok(Some(ctx));
   }
 
   pub async fn listen(&mut self) -> Result<()> {
@@ -51,7 +61,9 @@ impl IgdActor {
       };
 
       // 2. Update last ports if needed
-      if let Some(p) = new_ports { self.last_ports = p; }
+      if let Some(p) = new_ports {
+        self.last_ports = p;
+      }
 
       // 3. Flush IGD requests
       match self.do_igd().await {
@@ -64,14 +76,25 @@ impl IgdActor {
   pub async fn do_igd(&self) -> Result<()> {
     let actions = [
       (PortMappingProtocol::TCP, &self.last_ports.tcp_ports),
-      (PortMappingProtocol::UDP, &self.last_ports.udp_ports)
+      (PortMappingProtocol::UDP, &self.last_ports.udp_ports),
     ];
 
     for (proto, list) in actions.iter() {
       for port in *list {
         let service_str = format!("{}:{}", self.private_ip, port);
-        let service  = service_str.parse::<SocketAddrV4>().context("Invalid socket address")?;
-        self.gateway.add_port(*proto, *port, service, self.expire.as_secs() as u32, "diplonat").await?;
+        let service = service_str
+          .parse::<SocketAddrV4>()
+          .context("Invalid socket address")?;
+        self
+          .gateway
+          .add_port(
+            *proto,
+            *port,
+            service,
+            self.expire.as_secs() as u32,
+            "diplonat",
+          )
+          .await?;
         debug!("IGD request successful for {:#?} {}", proto, service);
       }
     }

src/main.rs

@@ -1,14 +1,16 @@
+mod acme_actor;
 mod config;
 mod consul;
 mod consul_actor;
+mod consul_kv;
 mod diplonat;
 mod fw;
 mod fw_actor;
 mod igd_actor;
 mod messages;
 
-use log::*;
 use diplonat::Diplonat;
+use log::*;
 
 #[tokio::main]
 async fn main() {

src/messages.rs

@@ -3,14 +3,16 @@ use std::collections::HashSet;
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct PublicExposedPorts {
   pub tcp_ports: HashSet<u16>,
-  pub udp_ports: HashSet<u16>
+  pub udp_ports: HashSet<u16>,
+  pub acme: Vec<String>,
 }
 
 impl PublicExposedPorts {
   pub fn new() -> Self {
     return Self {
       tcp_ports: HashSet::new(),
-      udp_ports: HashSet::new()
-    }
+      udp_ports: HashSet::new(),
+      acme: Vec::new(),
+    };
   }
 }