Add server public key to config

3 files changed, 36 insertions, 23 deletions

diff --git a/src/main.rs b/src/main.rs
index 25ef860..a0e38ca 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -100,7 +100,10 @@ fn main() {
                         None => false
                     };
 
-                    do_config(&conf, peer_name.to_string(), is_full).unwrap();
+                    if let Err(e) = do_config(&conf, peer_name.to_string(), is_full) {
+                        eprintln!("Error generating configuration for {}: {}", peer_name.to_string(), e);
+                        exit(1);
+                    }
                 },
                 None => {}
             }
diff --git a/src/wg/config.rs b/src/wg/config.rs
index 2dac6a8..4e8c205 100644
--- a/src/wg/config.rs
+++ b/src/wg/config.rs
@@ -1,8 +1,10 @@
 use std::str::FromStr;
 use std::{net::Ipv4Addr, fs};
 use std::fmt::Write;
+use std::process::{Command, Stdio};
+use std::io::Write as ioWrite;
 
-use anyhow::{Result, anyhow};
+use anyhow::{Result, anyhow, Context};
 use ipnetwork::Ipv4Network;
 
 use crate::wg::peer::Peer;
@@ -13,8 +15,7 @@ pub struct WireguardConfig {
     listen_port: u32,
     pub network: Ipv4Network,
     pub peers: Vec<Peer>,
-    pre_ups: Vec<String>,
-    post_downs: Vec<String>
+    other_lines: Vec<String>,
 }
 
 
@@ -28,8 +29,7 @@ impl WireguardConfig {
             listen_port: 0,
             network: Ipv4Network::from_str("0.0.0.0/0")?,
             peers: vec![],
-            pre_ups: vec![],
-            post_downs: vec![]
+            other_lines: vec![],
         };
         let mut current_peer = Peer {
             ip: Ipv4Addr::UNSPECIFIED,
@@ -81,13 +81,8 @@ impl WireguardConfig {
                     let addr = config_value(line)?;
                     conf.network = Ipv4Network::from_str(addr)?;
                 }
-                else if line.starts_with("PreUp") {
-                    let pre_up = String::from(config_value(line)?);
-                    conf.pre_ups.push(pre_up);
-                }
-                else if line.starts_with("PostDown") {
-                    let post_down = String::from(config_value(line)?);
-                    conf.post_downs.push(post_down);
+                else {
+                    conf.other_lines.push(String::from(line)); 
                 }
             }
 
@@ -159,12 +154,8 @@ impl WireguardConfig {
 
         writeln!(res, "Address = {}", self.network)?;
         
-        for pre_up in self.pre_ups.iter() {
-            writeln!(res, "PreUp = {}", pre_up)?;
-        }
-
-        for post_down in self.post_downs.iter() {
-            writeln!(res, "PostDown = {}", post_down)?;
+        for line in self.other_lines.iter() {
+            writeln!(res, "{}", line)?;
         }
 
         writeln!(res, "")?;
@@ -180,6 +171,27 @@ impl WireguardConfig {
 
         Ok(res)
     }
+
+    pub fn public_key(&self) -> Result<String> {
+        let mut wg = Command::new("wg")
+            .arg("pubkey")
+            .stdin(Stdio::piped())
+            .stdout(Stdio::piped())
+            .spawn()
+            .context("could not start 'wg pubkey'")?;
+    
+        let pk = self.private_key.clone();
+        let mut stdin = wg.stdin.take().context("could not open stdin")?;
+        std::thread::spawn(move || {
+            stdin.write_all(pk.as_bytes()).unwrap();
+        });
+
+        let public = wg.wait_with_output()?;
+        let public = String::from_utf8(public.stdout)?;
+        let public = String::from(public.trim());
+
+        Ok(public)
+    }
 }
 
 
diff --git a/src/wg/peer.rs b/src/wg/peer.rs
index 1f9a173..1d2002f 100644
--- a/src/wg/peer.rs
+++ b/src/wg/peer.rs
@@ -1,5 +1,4 @@
 use std::net::Ipv4Addr;
-use std::env::join_paths;
 use std::fs::{read_to_string, self, File};
 use std::fmt::Write;
 use std::path::{Path};
@@ -84,8 +83,7 @@ impl Peer {
     }
 
     pub fn private_key(&self) -> Result<String> {
-        let pk_folder = self.private_key_folder()?;
-        let pk_path = join_paths(&[pk_folder, self.name.clone()])?;
+        let pk_path = self.private_key_path()?;
         let pk = read_to_string(pk_path)?;
 
         Ok(pk)
@@ -100,7 +98,7 @@ impl Peer {
         writeln!(res, "DNS = TODO\n")?;
 
         writeln!(res, "[Peer]")?;
-        writeln!(res, "PublicKey = TODO")?;
+        writeln!(res, "PublicKey = {}", conf.public_key().context("error getting server public key")?)?;
 
         let allowed_ips = match is_full { 
             true => String::from("0.0.0.0/0"),