Add wgmgr.conf loading

5 files changed, 239 insertions, 39 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 6c862da..5edeb14 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "anstream"
-version = "0.3.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e579a7752471abc2a8268df8b20005e3eadd975f585398f17efcfd8d4927371"
+checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -43,9 +43,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle-wincon"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bcd8291a340dd8ac70e18878bc4501dd7b4ff970cfa21c207d36ece51ea88fd"
+checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
 dependencies = [
  "anstyle",
  "windows-sys",
@@ -53,9 +53,15 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.70"
+version = "1.0.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
+checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
@@ -71,18 +77,18 @@ checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
 
 [[package]]
 name = "clap"
-version = "4.2.2"
+version = "4.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b802d85aaf3a1cdb02b224ba472ebdea62014fccfcb269b95a4d76443b5ee5a"
+checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc"
 dependencies = [
  "clap_builder",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.2.2"
+version = "4.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14a1a858f532119338887a4b8e1af9c60de8249cd7bafd68036a489e261e37b6"
+checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990"
 dependencies = [
  "anstream",
  "anstyle",
@@ -94,9 +100,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1"
+checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
 
 [[package]]
 name = "colorchoice"
@@ -126,12 +132,28 @@ dependencies = [
 ]
 
 [[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
 name = "hermit-abi"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
 
 [[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown",
+]
+
+[[package]]
 name = "io-lifetimes"
 version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -165,15 +187,21 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.141"
+version = "0.2.144"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
+checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.3.1"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f"
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
+
+[[package]]
+name = "memchr"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
 [[package]]
 name = "once_cell"
@@ -182,10 +210,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
 
 [[package]]
+name = "proc-macro2"
+version = "1.0.58"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
 name = "rustix"
-version = "0.37.11"
+version = "0.37.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77"
+checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d"
 dependencies = [
  "bitflags",
  "errno",
@@ -197,9 +243,32 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.160"
+version = "1.0.163"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.163"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
+checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "strsim"
@@ -208,6 +277,57 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
+name = "syn"
+version = "2.0.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "toml"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
+
+[[package]]
 name = "utf8parse"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -220,6 +340,8 @@ dependencies = [
  "anyhow",
  "clap",
  "ipnetwork",
+ "serde",
+ "toml",
 ]
 
 [[package]]
@@ -287,3 +409,12 @@ name = "windows_x86_64_msvc"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+
+[[package]]
+name = "winnow"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699"
+dependencies = [
+ "memchr",
+]
diff --git a/Cargo.toml b/Cargo.toml
index 8b25ae0..6c52be6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,3 +9,5 @@ edition = "2021"
 anyhow = "1.0.70"
 clap = { version = "4.2.2", features = ["cargo"] }
 ipnetwork = "0.20.0"
+serde = { version = "1.0", features = ["derive"] }
+toml = "0.7.4"
diff --git a/src/configuration.rs b/src/configuration.rs
new file mode 100644
index 0000000..173b8ff
--- /dev/null
+++ b/src/configuration.rs
@@ -0,0 +1,31 @@
+use serde::Deserialize;
+use anyhow::{Result, anyhow, Context};
+use std::fs::read_to_string;
+
+#[derive(Deserialize)]
+pub struct Configuration {
+    pub endpoint: String,
+    pub port: Option<u32>,
+    pub dns: Option<String>,
+    pub wgconf: Option<String>,
+}
+
+pub fn find_configuration_file(argument: Option<&String>) -> Result<String> {
+    match argument {
+        Some(p) => {
+            if let Ok(t) = read_to_string(p) {
+                let _: Configuration = toml::from_str(&t).context("parsing configuration file")?;
+                return Ok(p.clone())
+            }
+        },
+        None => {
+            // Try /etc/wgmgr.toml
+            if let Ok(t) = read_to_string("/etc/wgmgr.toml") {
+                let _: Configuration = toml::from_str(&t).context("parsing /etc/wgmgr.toml")?;
+                return Ok(String::from("/etc/wgmgr.toml"))
+            }
+        },
+    };
+
+    Err(anyhow!("Could not find a valid configuration file for wgmgr."))
+}
diff --git a/src/main.rs b/src/main.rs
index 6bc7e85..58c87e8 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -13,12 +13,19 @@ use clap::arg;
 use wg::config::WireguardConfig;
 
 mod wg;
+mod configuration;
 
 fn main() {
     let matches = command!()
         .arg(
             arg!(
-                -w --wg-config <WGCONFIG> "Wireguard configuration file name"
+                -w --wgconfig <WGCONFIG> "Wireguard configuration file name"
+            )
+            .required(false)
+        )
+        .arg(
+            arg!(
+                -c --config <CONFIG> "wgmgr configuration file path"
             )
             .required(false)
         )
@@ -79,11 +86,25 @@ fn main() {
             .about("Run 'wg', but with the client names")
         )
         .get_matches();
+    
+    
+    // Find the configuration file for wgmgr
+    let wgmgr_conf_path = match configuration::find_configuration_file(matches.get_one::<String>("config")) {
+        Ok(s) => s,
+        Err(e) => {
+            eprintln!("Could not find wgmgr configuration file. Place it at /etc/wgmgr.toml or use the --config flag.");
+            eprintln!("{:?}", e);
+            exit(1);
+        }
+    };
+    
+    let wgmgr_conf: configuration::Configuration = toml::from_str(&read_to_string(wgmgr_conf_path).unwrap()).unwrap();
 
-    let wg_conf_path = match find_wg_config_file(&matches) {
+    // Find the Wireguard configuration file
+    let wg_conf_path = match find_wg_config_file(&matches, &wgmgr_conf.wgconf) {
         Ok(s) => s,
         Err(e) => {
-            eprintln!("Wireguard configuration file error: {}", e);
+            eprintln!("Wireguard configuration file error: {:?}", e);
             exit(1);
         }
     };
@@ -91,8 +112,8 @@ fn main() {
     let mut wg_conf = match wg::config::WireguardConfig::new(&wg_conf_path) {
         Ok(c) => c,
         Err(e) => {
-            eprintln!("Error loading the Wireguard configuration file '{}'", wg_conf_path);
-            eprintln!("{}", e);
+            eprintln!("Error loading the Wireguard configuration file '{}'.", wg_conf_path);
+            eprintln!("{:?}", e);
             exit(1);
         }
     };
@@ -119,8 +140,8 @@ fn main() {
                         None => false
                     };
 
-                    if let Err(e) = do_config(&wg_conf, peer_name.to_string(), is_full) {
-                        eprintln!("Error generating configuration for {}: {}", peer_name.to_string(), e);
+                    if let Err(e) = do_config(&wg_conf, &wgmgr_conf, peer_name.to_string(), is_full) {
+                        eprintln!("Error generating configuration for {}: {:?}", peer_name.to_string(), e);
                         exit(1);
                     }
                 },
@@ -131,7 +152,7 @@ fn main() {
         Some(("add", args)) => {
             let new_name = args.get_one::<String>("NAME").unwrap().to_string();
             if let Err(e) = do_add(&mut wg_conf, wg_conf_path, &new_name, args.get_one::<String>("ip")) {
-                eprintln!("Error adding peer: {}", e);
+                eprintln!("Error adding peer: {:?}", e);
                 exit(1);
             }
             else {
@@ -142,7 +163,7 @@ fn main() {
         Some(("rm", args)) => {
             let rm_name = args.get_one::<String>("NAME").unwrap().to_string();
             if let Err(e) = do_rm(&mut wg_conf, wg_conf_path, &rm_name) {
-                eprintln!("Error removing peer: {}", e);
+                eprintln!("Error removing peer: {:?}", e);
                 exit(1);
             }
 
@@ -151,7 +172,7 @@ fn main() {
 
         Some(("wg", _)) => {
             if let Err(e) = do_wg(&wg_conf) {
-                eprintln!("{}", e);
+                eprintln!("{:?}", e);
                 exit(1);
             }
         }
@@ -163,9 +184,9 @@ fn main() {
 
 }
 
-fn find_wg_config_file(matches: &ArgMatches) -> Result<String> {
+fn find_wg_config_file(matches: &ArgMatches, wgconf: &Option<String>) -> Result<String> {
     // Top priority goes to the command-line argument
-    match matches.get_one::<String>("wg-config") {
+    match matches.get_one::<String>("wgconfig") {
         Some(s) => {
             if s.starts_with("/") {
                 return Ok(s.to_string())
@@ -183,6 +204,12 @@ fn find_wg_config_file(matches: &ArgMatches) -> Result<String> {
         Err(_) => {}
     };
 
+    // Then, is there is a "wgconf" in the wgmgr configuration file, we take that
+    match wgconf {
+        Some(s) => return Ok(s.clone()),
+        None => {}
+    };
+
     // Otherwise, we will first try a simple "wg0.conf"
     match read_to_string("/etc/wireguard/wg0.conf") {
         Ok(_) => return Ok(String::from_str("/etc/wireguard/wg0.conf").unwrap()),
@@ -233,7 +260,7 @@ fn do_list(wg_conf: &wg::config::WireguardConfig) {
     }
 }
 
-fn do_config(wg_conf: &wg::config::WireguardConfig, peer_name: String, is_full: bool) -> Result<()> {
+fn do_config(wg_conf: &wg::config::WireguardConfig, conf: &configuration::Configuration, peer_name: String, is_full: bool) -> Result<()> {
     let peer = match wg_conf.get_peer(peer_name.as_str()) {
         Some(p) => p,
         None => {
@@ -241,7 +268,7 @@ fn do_config(wg_conf: &wg::config::WireguardConfig, peer_name: String, is_full:
         }
     };
 
-    println!("{}", peer.gen_config(wg_conf, is_full)?);
+    println!("{}", peer.gen_config(wg_conf, conf.dns.clone(), conf.endpoint.clone(), conf.port, is_full)?);
 
     Ok(())
 }
diff --git a/src/wg/peer.rs b/src/wg/peer.rs
index 7b703fc..bb85a5e 100644
--- a/src/wg/peer.rs
+++ b/src/wg/peer.rs
@@ -89,23 +89,32 @@ impl Peer {
         Ok(pk)
     }
 
-    pub fn gen_config(&self, conf: &WireguardConfig, is_full: bool) -> Result<String>{
+    pub fn gen_config(&self, wg_conf: &WireguardConfig, dns: Option<String>, endpoint: String, port: Option<u32>, is_full: bool) -> Result<String>{
         let mut res = String::new();
         
         writeln!(res, "[Interface]")?;
         writeln!(res, "PrivateKey = {}", self.private_key()?)?;
         writeln!(res, "Address = {}/32", self.ip)?;
-        writeln!(res, "DNS = TODO\n")?;
 
+        if let Some(s) = dns {
+            writeln!(res, "DNS = {}", s)?;
+        }
+        
+        writeln!(res, "")?;
         writeln!(res, "[Peer]")?;
-        writeln!(res, "PublicKey = {}", conf.public_key().context("error getting server public key")?)?;
+        writeln!(res, "PublicKey = {}", wg_conf.public_key().context("error getting server public key")?)?;
 
         let allowed_ips = match is_full { 
             true => String::from("0.0.0.0/0"), 
-            false => conf.network.to_string()
+            false => wg_conf.network.to_string()
         };
         writeln!(res, "AllowedIPs = {}", allowed_ips)?;
-        writeln!(res, "Endpoint = TODO")?;
+
+        let port = match port {
+            Some(p) => p,
+            None => 51820,
+        };
+        writeln!(res, "Endpoint = {}:{}", endpoint, port)?;
         writeln!(res, "PersistentKeepAlive = 25")?;
 
         Ok(res)