adrien/diplonat
1
0
Fork 0
forked from Deuxfleurs/diplonat
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: adrien:feature/acme
Branches Tags
adrien:main
adrien:feature/modular-config
adrien:feature/acme
adrien:meta/formating
Deuxfleurs:main
Deuxfleurs:ci-fmt
Deuxfleurs:feature/acme
Deuxfleurs:docker-7
..
compare: adrien:main
Branches Tags
adrien:feature/modular-config
adrien:feature/acme
adrien:meta/formating
adrien:main
Deuxfleurs:main
Deuxfleurs:ci-fmt
Deuxfleurs:feature/acme
Deuxfleurs:docker-7

No commits in common. "feature/acme" and "main" have entirely different histories.
feature/ac ... main

17 changed files with 369 additions and 3723 deletions
Show stats Expand all files Collapse all files

2
.rustfmt.toml
View file

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

1477
assets/images/acme_chronogram.svg
View file

File diff suppressed because it is too large Load diff
Side by side

Before

Width:  |  Height:  |  Size: 52 KiB

1675
assets/images/acme_goal.svg
View file

File diff suppressed because it is too large Load diff
Side by side

Before

Width:  |  Height:  |  Size: 110 KiB

72
src/acme_actor.rs
View file

@ -1,72 +0,0 @@
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(())
}
}

10
src/config/mod.rs
View file

@ -3,13 +3,9 @@ mod options;
mod options_test; mod options_test;
mod runtime; mod runtime;
pub use options::{ pub use options::{ConfigOpts, ConfigOptsConsul, ConfigOptsAcme, ConfigOptsFirewall, ConfigOptsIgd};
ConfigOpts, ConfigOptsAcme, ConfigOptsConsul, ConfigOptsFirewall, ConfigOptsIgd, pub use runtime::{RuntimeConfig, RuntimeConfigAcme, RuntimeConfigConsul, RuntimeConfigFirewall, RuntimeConfigIgd};
};
pub use runtime::{
RuntimeConfig, RuntimeConfigAcme, RuntimeConfigConsul, RuntimeConfigFirewall, RuntimeConfigIgd,
};
pub const EXPIRATION_TIME: u16 = 300; pub const EXPIRATION_TIME: u16 = 300;
pub const REFRESH_TIME: u16 = 60; pub const REFRESH_TIME: u16 = 60;
pub const CONSUL_URL: &str = "http://127.0.0.1:8500"; pub const CONSUL_URL: &str = "http://127.0.0.1:8500";

118
src/config/options.rs
View file

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

216
src/config/options_test.rs
View file

@ -5,43 +5,28 @@ use crate::config::*;
// Environment variables are set for the entire process and // Environment variables are set for the entire process and
// tests are run whithin the same process. // tests are run whithin the same process.
// => We cannot test ConfigOpts::from_env(), // => We cannot test ConfigOpts::from_env(),
// because tests modify each other's environment. // because tests modify each other's environment.
// This is why we only test ConfigOpts::from_iter(iter). // This is why we only test ConfigOpts::from_iter(iter).
fn minimal_valid_options() -> HashMap<String, String> { fn minimal_valid_options() -> HashMap<String, String> {
let mut opts = HashMap::new(); let mut opts = HashMap::new();
opts.insert( opts.insert("DIPLONAT_CONSUL_NODE_NAME".to_string(), "consul_node".to_string());
"DIPLONAT_CONSUL_NODE_NAME".to_string(), opts
"consul_node".to_string(),
);
opts
} }
fn all_valid_options() -> HashMap<String, String> { fn all_valid_options() -> HashMap<String, String> {
let mut opts = minimal_valid_options(); let mut opts = minimal_valid_options();
opts.insert( opts.insert("DIPLONAT_CONSUL_URL".to_string(), "http://127.0.0.1:9999".to_string());
"DIPLONAT_CONSUL_URL".to_string(), opts.insert("DIPLONAT_ACME_ENABLE".to_string(), "true".to_string());
"http://127.0.0.1:9999".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_ACME_ENABLE".to_string(), "true".to_string()); opts.insert("DIPLONAT_FIREWALL_REFRESH_TIME".to_string(), "20".to_string());
opts.insert( opts.insert("DIPLONAT_IGD_ENABLE".to_string(), "true".to_string());
"DIPLONAT_ACME_EMAIL".to_string(), opts.insert("DIPLONAT_IGD_PRIVATE_IP".to_string(), "172.123.43.555".to_string());
"bozo@bozo.net".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.insert("DIPLONAT_FIREWALL_ENABLE".to_string(), "true".to_string()); opts
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] // #[test]
@ -54,108 +39,107 @@ fn all_valid_options() -> HashMap<String, String> {
#[test] #[test]
#[should_panic] #[should_panic]
fn err_empty_env() { fn err_empty_env() {
std::env::remove_var("DIPLONAT_CONSUL_NODE_NAME"); std::env::remove_var("DIPLONAT_CONSUL_NODE_NAME");
let opts: HashMap<String, String> = HashMap::new(); let opts: HashMap<String, String> = HashMap::new();
ConfigOpts::from_iter(opts).unwrap(); ConfigOpts::from_iter(opts).unwrap();
} }
#[test] #[test]
fn ok_minimal_valid_options() { fn ok_minimal_valid_options() {
let opts = minimal_valid_options(); let opts = minimal_valid_options();
let rt_config = ConfigOpts::from_iter(opts.clone()).unwrap(); let rt_config = ConfigOpts::from_iter(opts.clone()).unwrap();
assert_eq!( assert_eq!(
&rt_config.consul.node_name, &rt_config.consul.node_name,
opts.get(&"DIPLONAT_CONSUL_NODE_NAME".to_string()).unwrap() opts.get(&"DIPLONAT_CONSUL_NODE_NAME".to_string()).unwrap()
); );
assert_eq!(rt_config.consul.url, CONSUL_URL.to_string()); assert_eq!(
assert!(rt_config.acme.is_none()); rt_config.consul.url,
assert!(rt_config.firewall.is_none()); CONSUL_URL.to_string()
assert!(rt_config.igd.is_none()); );
/*assert_eq!( assert!(rt_config.acme.is_none());
rt_config.firewall.refresh_time, assert!(rt_config.firewall.is_none());
Duration::from_secs(REFRESH_TIME.into()) assert!(rt_config.igd.is_none());
); /*assert_eq!(
assert_eq!( rt_config.firewall.refresh_time,
&rt_config.igd.private_ip, Duration::from_secs(REFRESH_TIME.into())
opts.get(&"DIPLONAT_PRIVATE_IP".to_string()).unwrap() );
); assert_eq!(
assert_eq!( &rt_config.igd.private_ip,
rt_config.igd.expiration_time, opts.get(&"DIPLONAT_PRIVATE_IP".to_string()).unwrap()
Duration::from_secs(EXPIRATION_TIME.into()) );
); assert_eq!(
assert_eq!( rt_config.igd.expiration_time,
rt_config.igd.refresh_time, Duration::from_secs(EXPIRATION_TIME.into())
Duration::from_secs(REFRESH_TIME.into()) );
);*/ assert_eq!(
rt_config.igd.refresh_time,
Duration::from_secs(REFRESH_TIME.into())
);*/
} }
#[test] #[test]
#[should_panic] #[should_panic]
fn err_invalid_igd_options() { fn err_invalid_igd_options() {
let mut opts = minimal_valid_options(); let mut opts = minimal_valid_options();
opts.insert("DIPLONAT_IGD_ENABLE".to_string(), "true".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_EXPIRATION_TIME".to_string(), "60".to_string());
opts.insert("DIPLONAT_IGD_REFRESH_TIME".to_string(), "60".to_string()); opts.insert("DIPLONAT_IGD_REFRESH_TIME".to_string(), "60".to_string());
ConfigOpts::from_iter(opts).unwrap(); ConfigOpts::from_iter(opts).unwrap();
} }
#[test] #[test]
fn ok_all_valid_options() { fn ok_all_valid_options() {
let opts = all_valid_options(); let opts = all_valid_options();
let rt_config = ConfigOpts::from_iter(opts.clone()).unwrap(); let rt_config = ConfigOpts::from_iter(opts.clone()).unwrap();
let firewall_refresh_time = Duration::from_secs( let firewall_refresh_time = Duration::from_secs(
opts opts.get(&"DIPLONAT_FIREWALL_REFRESH_TIME".to_string()).unwrap()
.get(&"DIPLONAT_FIREWALL_REFRESH_TIME".to_string()) .parse::<u64>().unwrap()
.unwrap() .into());
.parse::<u64>() let igd_expiration_time = Duration::from_secs(
.unwrap() opts.get(&"DIPLONAT_IGD_EXPIRATION_TIME".to_string()).unwrap()
.into(), .parse::<u64>().unwrap()
); .into());
let igd_expiration_time = Duration::from_secs( let igd_refresh_time = Duration::from_secs(
opts opts.get(&"DIPLONAT_IGD_REFRESH_TIME".to_string()).unwrap()
.get(&"DIPLONAT_IGD_EXPIRATION_TIME".to_string()) .parse::<u64>().unwrap()
.unwrap() .into());
.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_eq!( assert_eq!(
&rt_config.consul.node_name, &rt_config.consul.node_name,
opts.get(&"DIPLONAT_CONSUL_NODE_NAME".to_string()).unwrap() opts.get(&"DIPLONAT_CONSUL_NODE_NAME".to_string()).unwrap()
); );
assert_eq!( assert_eq!(
&rt_config.consul.url, &rt_config.consul.url,
opts.get(&"DIPLONAT_CONSUL_URL".to_string()).unwrap() opts.get(&"DIPLONAT_CONSUL_URL".to_string()).unwrap()
); );
assert!(rt_config.acme.is_some()); assert!(rt_config.acme.is_some());
let acme = rt_config.acme.unwrap(); let acme = rt_config.acme.unwrap();
assert_eq!( assert_eq!(
&acme.email, &acme.email,
opts.get(&"DIPLONAT_ACME_EMAIL".to_string()).unwrap() opts.get(&"DIPLONAT_ACME_EMAIL".to_string()).unwrap());
);
assert!(rt_config.firewall.is_some()); assert!(rt_config.firewall.is_some());
let firewall = rt_config.firewall.unwrap(); let firewall = rt_config.firewall.unwrap();
assert_eq!(firewall.refresh_time, firewall_refresh_time); assert_eq!(
firewall.refresh_time,
firewall_refresh_time
);
assert!(rt_config.igd.is_some()); assert!(rt_config.igd.is_some());
let igd = rt_config.igd.unwrap(); let igd = rt_config.igd.unwrap();
assert_eq!( assert_eq!(
&igd.private_ip, &igd.private_ip,
opts.get(&"DIPLONAT_IGD_PRIVATE_IP".to_string()).unwrap() opts.get(&"DIPLONAT_IGD_PRIVATE_IP".to_string()).unwrap()
); );
assert_eq!(igd.expiration_time, igd_expiration_time); assert_eq!(
assert_eq!(igd.refresh_time, igd_refresh_time); igd.expiration_time,
} igd_expiration_time
);
assert_eq!(
igd.refresh_time,
igd_refresh_time
);
}

153
src/config/runtime.rs
View file

@ -1,10 +1,8 @@
use std::time::Duration; use std::time::Duration;
use anyhow::{anyhow, Result}; use anyhow::{Result, anyhow};
use crate::config::{ use crate::config::{ConfigOpts, ConfigOptsConsul, ConfigOptsAcme, ConfigOptsFirewall, ConfigOptsIgd};
ConfigOpts, ConfigOptsAcme, ConfigOptsConsul, ConfigOptsFirewall, ConfigOptsIgd,
};
// This code is inspired by the Trunk crate (https://github.com/thedodd/trunk) // This code is inspired by the Trunk crate (https://github.com/thedodd/trunk)
@ -15,121 +13,118 @@ use crate::config::{
#[derive(Debug)] #[derive(Debug)]
pub struct RuntimeConfigConsul { pub struct RuntimeConfigConsul {
pub node_name: String, pub node_name: String,
pub url: String, pub url: String,
} }
#[derive(Debug)] #[derive(Debug)]
pub struct RuntimeConfigAcme { pub struct RuntimeConfigAcme {
pub email: String, pub email: String,
pub refresh_time: Duration,
} }
#[derive(Debug)] #[derive(Debug)]
pub struct RuntimeConfigFirewall { pub struct RuntimeConfigFirewall {
pub refresh_time: Duration, pub refresh_time: Duration,
} }
#[derive(Debug)] #[derive(Debug)]
pub struct RuntimeConfigIgd { pub struct RuntimeConfigIgd {
pub private_ip: String, pub private_ip: String,
pub expiration_time: Duration, pub expiration_time: Duration,
pub refresh_time: Duration, pub refresh_time: Duration,
} }
#[derive(Debug)] #[derive(Debug)]
pub struct RuntimeConfig { pub struct RuntimeConfig {
pub consul: RuntimeConfigConsul, pub consul: RuntimeConfigConsul,
pub acme: Option<RuntimeConfigAcme>, pub acme: Option<RuntimeConfigAcme>,
pub firewall: Option<RuntimeConfigFirewall>, pub firewall: Option<RuntimeConfigFirewall>,
pub igd: Option<RuntimeConfigIgd>, pub igd: Option<RuntimeConfigIgd>,
} }
impl RuntimeConfig { impl RuntimeConfig {
pub fn new(opts: ConfigOpts) -> Result<Self> { pub fn new(opts: ConfigOpts) -> Result<Self> {
let consul = RuntimeConfigConsul::new(opts.consul.clone())?; let consul = RuntimeConfigConsul::new(opts.consul.clone())?;
let acme = RuntimeConfigAcme::new(opts.acme.clone())?; let acme = RuntimeConfigAcme::new(opts.acme.clone())?;
let firewall = RuntimeConfigFirewall::new(opts.firewall.clone())?; let firewall = RuntimeConfigFirewall::new(opts.firewall.clone())?;
let igd = RuntimeConfigIgd::new(opts.igd.clone())?; let igd = RuntimeConfigIgd::new(opts.igd.clone())?;
Ok(Self { Ok(Self {
acme, acme,
consul, consul,
firewall, firewall,
igd, igd,
}) })
} }
} }
impl RuntimeConfigConsul { impl RuntimeConfigConsul {
pub(super) fn new(opts: ConfigOptsConsul) -> Result<Self> { pub(super) fn new(opts: ConfigOptsConsul) -> Result<Self> {
let node_name = opts let node_name = opts.node_name.expect(
.node_name "'DIPLONAT_CONSUL_NODE_NAME' is required");
.expect("'DIPLONAT_CONSUL_NODE_NAME' is required"); let url = opts.url.unwrap_or(super::CONSUL_URL.to_string());
let url = opts.url.unwrap_or(super::CONSUL_URL.to_string());
Ok(Self { node_name, url }) Ok(Self {
} node_name,
url,
})
}
} }
impl RuntimeConfigAcme { impl RuntimeConfigAcme {
pub fn new(opts: ConfigOptsAcme) -> Result<Option<Self>> { pub fn new(opts: ConfigOptsAcme) -> Result<Option<Self>> {
if !opts.enable { if !opts.enable {
return Ok(None); return Ok(None);
} }
let email = opts let email = opts.email.expect(
.email "'DIPLONAT_ACME_EMAIL' is required if ACME is enabled");
.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 { Ok(Some(Self {
email, email,
refresh_time, }))
})) }
}
} }
impl RuntimeConfigFirewall { impl RuntimeConfigFirewall {
pub(super) fn new(opts: ConfigOptsFirewall) -> Result<Option<Self>> { pub(super) fn new(opts: ConfigOptsFirewall) -> Result<Option<Self>> {
if !opts.enable { if !opts.enable {
return Ok(None); return Ok(None);
} }
let refresh_time = Duration::from_secs(opts.refresh_time.unwrap_or(super::REFRESH_TIME).into()); let refresh_time = Duration::from_secs(
opts.refresh_time.unwrap_or(super::REFRESH_TIME).into());
Ok(Some(Self { refresh_time })) Ok(Some(Self {
} refresh_time,
}))
}
} }
impl RuntimeConfigIgd { impl RuntimeConfigIgd {
pub(super) fn new(opts: ConfigOptsIgd) -> Result<Option<Self>> { pub(super) fn new(opts: ConfigOptsIgd) -> Result<Option<Self>> {
if !opts.enable { if !opts.enable {
return Ok(None); return Ok(None);
} }
let private_ip = opts let private_ip = opts.private_ip.expect(
.private_ip "'DIPLONAT_IGD_PRIVATE_IP' is required if IGD is enabled");
.expect("'DIPLONAT_IGD_PRIVATE_IP' is required if IGD is enabled"); let expiration_time = Duration::from_secs(
let expiration_time = Duration::from_secs( opts.expiration_time.unwrap_or(super::EXPIRATION_TIME).into());
opts let refresh_time = Duration::from_secs(
.expiration_time opts.refresh_time.unwrap_or(super::REFRESH_TIME).into());
.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() { if refresh_time.as_secs() * 2 > expiration_time.as_secs() {
return Err(anyhow!( return Err(anyhow!(
"IGD expiration time (currently: {}s) must be at least twice bigger than refresh time (currently: {}s)", "IGD expiration time (currently: {}s) must be at least twice bigger than refresh time (currently: {}s)",
expiration_time.as_secs(), expiration_time.as_secs(),
refresh_time.as_secs())); refresh_time.as_secs()));
} }
Ok(Some(Self { Ok(Some(Self {
private_ip, private_ip,
expiration_time, expiration_time,
refresh_time, refresh_time,
})) }))
} }
} }

18
src/consul.rs
View file

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

42
src/consul_actor.rs
View file

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

41
src/consul_kv.rs
View file

@ -1,41 +0,0 @@
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)),
}
}
}

40
src/diplonat.rs
View file

@ -1,8 +1,6 @@
use anyhow::{anyhow, Result}; use anyhow::{Result, anyhow};
use log::debug;
use tokio::try_join; use tokio::try_join;
use crate::acme_actor::AcmeActor;
use crate::config::ConfigOpts; use crate::config::ConfigOpts;
use crate::consul_actor::ConsulActor; use crate::consul_actor::ConsulActor;
use crate::fw_actor::FirewallActor; use crate::fw_actor::FirewallActor;
@ -11,7 +9,6 @@ use crate::igd_actor::IgdActor;
pub struct Diplonat { pub struct Diplonat {
consul: ConsulActor, consul: ConsulActor,
acme: Option<AcmeActor>,
firewall: Option<FirewallActor>, firewall: Option<FirewallActor>,
igd: Option<IgdActor>, igd: Option<IgdActor>,
} }
@ -19,25 +16,27 @@ pub struct Diplonat {
impl Diplonat { impl Diplonat {
pub async fn new() -> Result<Self> { pub async fn new() -> Result<Self> {
let config = ConfigOpts::from_env()?; let config = ConfigOpts::from_env()?;
debug!("{:#?}", config); println!("{:#?}", config);
let consul_actor = ConsulActor::new(config.consul); let consul_actor = ConsulActor::new(config.consul);
let acme_actor = AcmeActor::new(config.acme, &consul_actor.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?;
let firewall_actor = FirewallActor::new(config.firewall, &consul_actor.rx_open_ports).await?; if firewall_actor.is_none() && igd_actor.is_none() {
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!( return Err(anyhow!(
"At least enable *one* module, otherwise it's boring!" "At least enable *one* module, otherwise it's boring!"));
));
} }
let ctx = Self { let ctx = Self {
consul: consul_actor, consul: consul_actor,
acme: acme_actor,
firewall: firewall_actor, firewall: firewall_actor,
igd: igd_actor, igd: igd_actor,
}; };
@ -46,28 +45,21 @@ impl Diplonat {
} }
pub async fn listen(&mut self) -> Result<()> { pub async fn listen(&mut self) -> Result<()> {
let acme = &mut self.acme;
let firewall = &mut self.firewall; let firewall = &mut self.firewall;
let igd = &mut self.igd; let igd = &mut self.igd;
try_join!( try_join!(
self.consul.listen(), self.consul.listen(),
async {
match acme {
Some(x) => x.listen().await,
None => Ok(()),
}
},
async { async {
match firewall { match firewall {
Some(x) => x.listen().await, Some(x) => x.listen().await,
None => Ok(()), None => Ok(())
} }
}, },
async { async {
match igd { match igd {
Some(x) => x.listen().await, Some(x) => x.listen().await,
None => Ok(()), None => Ok(())
} }
}, },
)?; )?;

125
src/fw.rs
View file

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

45
src/fw_actor.rs
View file

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

46
src/igd_actor.rs
View file

@ -1,14 +1,16 @@
use std::net::SocketAddrV4; use std::net::SocketAddrV4;
use anyhow::{Context, Result}; use anyhow::{Result, Context};
use igd::aio::*; use igd::aio::*;
use igd::PortMappingProtocol; use igd::PortMappingProtocol;
use log::*; use log::*;
use tokio::{ use tokio::{
select, select,
sync::watch, sync::watch,
time::{self, Duration}, time::{
}; Duration,
self,
}};
use crate::config::RuntimeConfigIgd; use crate::config::RuntimeConfigIgd;
use crate::messages; use crate::messages;
@ -24,21 +26,18 @@ pub struct IgdActor {
} }
impl IgdActor { impl IgdActor {
pub async fn new( pub async fn new(config: Option<RuntimeConfigIgd>, rxp: &watch::Receiver<messages::PublicExposedPorts>) -> Result<Option<Self>> {
config: Option<RuntimeConfigIgd>,
rxp: &watch::Receiver<messages::PublicExposedPorts>,
) -> Result<Option<Self>> {
if config.is_none() { if config.is_none() {
return Ok(None); return Ok(None);
} }
let config = config.unwrap(); let config = config.unwrap();
let gw = search_gateway(Default::default()) let gw = search_gateway(Default::default())
.await .await
.context("Failed to find IGD gateway")?; .context("Failed to find IGD gateway")?;
info!("IGD gateway: {}", gw); info!("IGD gateway: {}", gw);
let ctx = Self { let ctx = Self {
expire: config.expiration_time, expire: config.expiration_time,
gateway: gw, gateway: gw,
last_ports: messages::PublicExposedPorts::new(), last_ports: messages::PublicExposedPorts::new(),
@ -61,9 +60,7 @@ impl IgdActor {
}; };
// 2. Update last ports if needed // 2. Update last ports if needed
if let Some(p) = new_ports { if let Some(p) = new_ports { self.last_ports = p; }
self.last_ports = p;
}
// 3. Flush IGD requests // 3. Flush IGD requests
match self.do_igd().await { match self.do_igd().await {
@ -75,26 +72,15 @@ impl IgdActor {
pub async fn do_igd(&self) -> Result<()> { pub async fn do_igd(&self) -> Result<()> {
let actions = [ let actions = [
(PortMappingProtocol::TCP, &self.last_ports.tcp_ports), (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 (proto, list) in actions.iter() {
for port in *list { for port in *list {
let service_str = format!("{}:{}", self.private_ip, port); let service_str = format!("{}:{}", self.private_ip, port);
let service = service_str let service = service_str.parse::<SocketAddrV4>().context("Invalid socket address")?;
.parse::<SocketAddrV4>() self.gateway.add_port(*proto, *port, service, self.expire.as_secs() as u32, "diplonat").await?;
.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); debug!("IGD request successful for {:#?} {}", proto, service);
} }
} }

4
src/main.rs
View file

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

8
src/messages.rs
View file

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