Wireguard pub keys on gateway

2024-05-13 15:37:48 +00:00
10 changed files with 153 additions and 119 deletions
@@ -437,7 +437,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 [[package]]
@@ -448,7 +448,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 [[package]]
@@ -1122,9 +1122,9 @@ dependencies = [
 [[package]]
 name = "clap_complete"
-version = "4.5.1"
+version = "4.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "885e4d7d5af40bfb99ae6f9433e292feac98d452dcb3ec3d25dfe7552b77da8c"
+checksum = "e3ae8ba90b9d8b007efe66e55e48fb936272f5ca00349b5b0e89877520d35ea7"
 dependencies = [
 "clap 4.4.7",
 ]
@@ -1148,7 +1148,7 @@ dependencies = [
 "heck 0.4.1",
 "proc-macro2",
 "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 [[package]]
@@ -1816,7 +1816,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 [[package]]
@@ -1998,7 +1998,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "strsim",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 [[package]]
@@ -2031,7 +2031,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
 dependencies = [
 "darling_core 0.20.3",
 "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 [[package]]
@@ -2223,7 +2223,7 @@ dependencies = [
 "proc-macro2",
 "proc-macro2-diagnostics",
 "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 [[package]]
@@ -2305,7 +2305,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 [[package]]
@@ -2873,7 +2873,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 [[package]]
@@ -3029,7 +3029,7 @@ checksum = "ba330b70a5341d3bc730b8e205aaee97ddab5d9c448c4f51a7c2d924266fa8f9"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 [[package]]
@@ -6198,7 +6198,7 @@ dependencies = [
 "semver 1.0.22",
 "serde",
 "serde_json",
- "sysinfo 0.30.7",
+ "sysinfo 0.30.10",
 "thiserror",
 "tokio",
 "toml 0.8.12",
@@ -6938,6 +6938,7 @@ dependencies = [
 "nym-network-defaults",
 "nym-task",
 "nym-wireguard-types",
 "serde",
 "tokio",
 "x25519-dalek 2.0.0",
 ]
@@ -7344,7 +7345,7 @@ dependencies = [
 "proc-macro2",
 "proc-macro2-diagnostics",
 "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 [[package]]
@@ -7440,7 +7441,7 @@ dependencies = [
 "pest_meta",
 "proc-macro2",
 "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 [[package]]
@@ -7481,7 +7482,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 [[package]]
@@ -7692,9 +7693,9 @@ dependencies = [
 [[package]]
 name = "proc-macro2"
-version = "1.0.79"
+version = "1.0.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
+checksum = "a56dea16b0a29e94408b9aa5e2940a4eedbd128a1ba20e8f7ae60fd3d465af0e"
 dependencies = [
 "unicode-ident",
 ]
@@ -7707,7 +7708,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 "version_check",
 "yansi",
 ]
@@ -7747,7 +7748,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 [[package]]
@@ -7827,7 +7828,7 @@ dependencies = [
 "itertools 0.11.0",
 "proc-macro2",
 "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 [[package]]
@@ -7922,9 +7923,9 @@ dependencies = [
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
 "proc-macro2",
 ]
@@ -8249,7 +8250,7 @@ checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 [[package]]
@@ -8459,7 +8460,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "rocket_http",
- "syn 2.0.58",
+ "syn 2.0.59",
 "unicode-xid",
 "version_check",
 ]
@@ -8597,7 +8598,7 @@ dependencies = [
 "quote",
 "rust-embed-utils",
 "shellexpand",
- "syn 2.0.58",
+ "syn 2.0.59",
 "walkdir",
 ]
@@ -9024,7 +9025,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 [[package]]
@@ -9046,7 +9047,7 @@ checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 [[package]]
@@ -9078,7 +9079,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 [[package]]
@@ -9128,7 +9129,7 @@ dependencies = [
 "darling 0.20.3",
 "proc-macro2",
 "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 [[package]]
@@ -9646,7 +9647,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "rustversion",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 [[package]]
@@ -9717,9 +9718,9 @@ dependencies = [
 [[package]]
 name = "syn"
-version = "2.0.58"
+version = "2.0.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687"
+checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -9761,9 +9762,9 @@ dependencies = [
 [[package]]
 name = "sysinfo"
-version = "0.30.7"
+version = "0.30.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c385888ef380a852a16209afc8cfad22795dd8873d69c9a14d2e2088f118d18"
+checksum = "26d7c217777061d5a2d652aea771fb9ba98b6dade657204b08c4b9604d11555b"
 dependencies = [
 "cfg-if",
 "core-foundation-sys",
@@ -9953,7 +9954,7 @@ checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 [[package]]
@@ -10083,7 +10084,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 [[package]]
@@ -10254,7 +10255,7 @@ dependencies = [
 "serde",
 "serde_spanned",
 "toml_datetime",
- "winnow 0.6.5",
+ "winnow 0.6.6",
 ]
 [[package]]
@@ -10362,7 +10363,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 [[package]]
@@ -10555,7 +10556,7 @@ dependencies = [
 "Inflector",
 "proc-macro2",
 "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 "termcolor",
 ]
@@ -10582,7 +10583,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "serde_derive_internals 0.28.0",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 [[package]]
@@ -10835,7 +10836,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "regex",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 [[package]]
@@ -10973,7 +10974,7 @@ dependencies = [
 "once_cell",
 "proc-macro2",
 "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 "wasm-bindgen-shared",
 ]
@@ -11007,7 +11008,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
 ]
@@ -11484,7 +11485,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
 dependencies = [
 "windows-core 0.52.0",
- "windows-targets 0.52.4",
+ "windows-targets 0.52.5",
 ]
 [[package]]
@@ -11502,7 +11503,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.52.4",
+ "windows-targets 0.52.5",
 ]
 [[package]]
@@ -11555,17 +11556,18 @@ dependencies = [
 [[package]]
 name = "windows-targets"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.4",
+ "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.4",
+ "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.4",
+ "windows_i686_gnu 0.52.5",
- "windows_i686_msvc 0.52.4",
+ "windows_i686_gnullvm",
- "windows_x86_64_gnu 0.52.4",
+ "windows_i686_msvc 0.52.5",
- "windows_x86_64_gnullvm 0.52.4",
+ "windows_x86_64_gnu 0.52.5",
- "windows_x86_64_msvc 0.52.4",
+ "windows_x86_64_gnullvm 0.52.5",
 "windows_x86_64_msvc 0.52.5",
 ]
 [[package]]
@@ -11582,9 +11584,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
 [[package]]
 name = "windows_aarch64_msvc"
@@ -11600,9 +11602,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
 [[package]]
 name = "windows_i686_gnu"
@@ -11618,9 +11620,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
 [[package]]
 name = "windows_i686_msvc"
@@ -11636,9 +11644,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
 [[package]]
 name = "windows_x86_64_gnu"
@@ -11654,9 +11662,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -11672,9 +11680,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
 [[package]]
 name = "windows_x86_64_msvc"
@@ -11690,9 +11698,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
 [[package]]
 name = "winnow"
@@ -11705,9 +11713,9 @@ dependencies = [
 [[package]]
 name = "winnow"
-version = "0.6.5"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8"
+checksum = "f0c976aaaa0e1f90dbb21e9587cdaf1d9679a1cde8875c0d6bd83ab96a208352"
 dependencies = [
 "memchr",
 ]
@@ -11870,7 +11878,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 [[package]]
@@ -21,6 +21,7 @@ log.workspace = true
 nym-network-defaults = { path = "../network-defaults" }
 nym-task = { path = "../task" }
 nym-wireguard-types = { path = "../wireguard-types" }
 serde = { workspace = true, features = ["derive"] }
 tokio = { workspace = true, features = ["rt-multi-thread", "net", "io-util"] }
 [target."cfg(target_os = \"linux\")".dependencies]
@@ -12,11 +12,10 @@ pub async fn start_wireguard(
    _gateway_client_registry: std::sync::Arc<
        nym_wireguard_types::registration::GatewayClientRegistry,
    >,
    peer_pairs: Vec<crate::setup::PeerPair>,
 ) -> Result<defguard_wireguard_rs::WGApi, Box<dyn std::error::Error + Send + Sync + 'static>> {
-    use crate::setup::{peer_allowed_ips, peer_static_public_key, PRIVATE_KEY};
+    use crate::setup::{peer_static_pairs, PRIVATE_KEY};
-    use defguard_wireguard_rs::{
+    use defguard_wireguard_rs::{InterfaceConfiguration, WGApi, WireguardInterfaceApi};
        host::Peer, key::Key, net::IpAddrMask, InterfaceConfiguration, WGApi, WireguardInterfaceApi,
    };
    use nym_network_defaults::{WG_PORT, WG_TUN_DEVICE_ADDRESS};
    let ifname = String::from("wg0");
@@ -30,13 +29,11 @@ pub async fn start_wireguard(
        peers: vec![],
    };
    wgapi.configure_interface(&interface_config)?;
-    let peer = peer_static_public_key();
+    let peers = peer_static_pairs(peer_pairs);
-    let mut peer = Peer::new(Key::new(peer.to_bytes()));
+    for peer in peers.iter() {
-    let peer_ip = peer_allowed_ips();
+        wgapi.configure_peer(peer)?;
-    let peer_ip_mask = IpAddrMask::new(peer_ip.network_address(), peer_ip.netmask());
+    }
-    peer.set_allowed_ips(vec![peer_ip_mask]);
+    wgapi.configure_peer_routing(&peers)?;
    wgapi.configure_peer(&peer)?;
    wgapi.configure_peer_routing(&[peer.clone()])?;
    tokio::spawn(async move { task_client.recv().await });
@@ -1,7 +1,10 @@
 use std::net::IpAddr;
 use base64::{engine::general_purpose, Engine as _};
-use log::info;
+#[cfg(target_os = "linux")]
 use defguard_wireguard_rs::{host::Peer, key::Key, net::IpAddrMask};
 use log::{info, warn};
 use serde::Deserialize;
 // The wireguard UDP listener
 pub const WG_ADDRESS: &str = "0.0.0.0";
@@ -10,21 +13,23 @@ pub const WG_ADDRESS: &str = "0.0.0.0";
 // Corresponding public key: "WM8s8bYegwMa0TJ+xIwhk+dImk2IpDUKslDBCZPizlE="
 pub(crate) const PRIVATE_KEY: &str = "AEqXrLFT4qjYq3wmX0456iv94uM6nDj5ugp6Jedcflg=";
-// The AllowedIPs for the connected peer, which is one a single IP and the same as the IP that the
+#[derive(Deserialize, Debug)]
-// peer has configured on their side.
+pub struct PeerPair {
-const ALLOWED_IPS: &str = "10.1.0.2";
+    pub addr: String,
    pub public_key: String,
 }
-fn decode_base64_key(base64_key: &str) -> [u8; 32] {
+fn decode_base64_key(base64_key: &str) -> Result<[u8; 32], String> {
    general_purpose::STANDARD
        .decode(base64_key)
-        .unwrap()
+        .map_err(|_| String::from("Could not decode"))?
        .try_into()
-        .unwrap()
+        .map_err(|_| String::from("Not enough bytes"))
 }
 pub fn server_static_private_key() -> x25519_dalek::StaticSecret {
    // TODO: this is a temporary solution for development
-    let static_private_bytes: [u8; 32] = decode_base64_key(PRIVATE_KEY);
+    let static_private_bytes: [u8; 32] = decode_base64_key(PRIVATE_KEY).unwrap();
    let static_private = x25519_dalek::StaticSecret::from(static_private_bytes);
    let static_public = x25519_dalek::PublicKey::from(&static_private);
    info!(
@@ -34,23 +39,29 @@ pub fn server_static_private_key() -> x25519_dalek::StaticSecret {
    static_private
 }
-pub fn peer_static_public_key() -> x25519_dalek::PublicKey {
+#[cfg(target_os = "linux")]
-    // A single static public key is used during development
+pub fn peer_static_pairs(raw_pairs: Vec<PeerPair>) -> Vec<Peer> {
-
+    raw_pairs
-    // Read from NYM_PEER_PUBLIC_KEY env variable
+        .into_iter()
-    let peer = std::env::var("NYM_PEER_PUBLIC_KEY").expect("NYM_PEER_PUBLIC_KEY must be set");
+        .filter_map(|pair| {
-
+            if let Ok(peer_static_public_bytes) = decode_base64_key(&pair.public_key) {
-    let peer_static_public_bytes: [u8; 32] = decode_base64_key(&peer);
+                let peer_static_public = x25519_dalek::PublicKey::from(peer_static_public_bytes);
-    let peer_static_public = x25519_dalek::PublicKey::from(peer_static_public_bytes);
+                let mut peer = Peer::new(Key::new(peer_static_public.to_bytes()));
-    info!(
+                if let Ok(key) = pair.addr.parse::<IpAddr>() {
-        "Adding wg peer public key: {}",
+                    let peer_ip = ip_network::IpNetwork::new_truncate(key, 32u8)
-        general_purpose::STANDARD.encode(peer_static_public)
+                        .expect("Netmask should be correct");
-    );
+                    let peer_ip_mask =
-    peer_static_public
+                        IpAddrMask::new(peer_ip.network_address(), peer_ip.netmask());
-}
+                    peer.set_allowed_ips(vec![peer_ip_mask]);
-
+                    Some(peer)
-pub fn peer_allowed_ips() -> ip_network::IpNetwork {
+                } else {
-    let key: IpAddr = ALLOWED_IPS.parse().unwrap();
+                    warn!("Not adding {:?} as IP doesn't parse", pair);
-    let cidr = 32u8;
+                    None
-    ip_network::IpNetwork::new_truncate(key, cidr).unwrap()
+                }
            } else {
                warn!("Not adding {:?} as public key doesn't decode", pair);
                None
            }
        })
        .collect()
 }
@@ -257,6 +257,11 @@ impl Config {
        self
    }
    pub fn with_client_keys_path(mut self, client_keys: PathBuf) -> Self {
        self.wireguard.storage_paths.client_keys = client_keys;
        self
    }
    pub fn with_listening_address(mut self, listening_address: IpAddr) -> Self {
        self.gateway.listening_address = listening_address;
@@ -376,7 +381,9 @@ impl Default for Wireguard {
            bind_address: SocketAddr::new(IpAddr::V4(Ipv4Addr::UNSPECIFIED), WG_PORT),
            announced_port: WG_PORT,
            private_network_prefix: 16,
-            storage_paths: WireguardPaths {},
+            storage_paths: WireguardPaths {
                client_keys: PathBuf::from("/root/keys_pub.json"),
            },
        }
    }
 }
@@ -131,7 +131,7 @@ impl From<ConfigV1_1_31> for Config {
                announced_port: value.wireguard.announced_port,
                private_network_prefix: Default::default(),
                storage_paths: WireguardPaths {
-                    // no fields (yet)
+                    client_keys: Default::default(),
                },
            },
            storage_paths: GatewayPaths {
@@ -173,11 +173,13 @@ impl KeysPaths {
 #[derive(Debug, Clone, Deserialize, PartialEq, Eq, Serialize)]
 #[serde(deny_unknown_fields)]
 pub struct WireguardPaths {
-    // pub keys:
+    pub client_keys: PathBuf,
 }
 impl WireguardPaths {
    pub fn new_empty() -> Self {
-        WireguardPaths {}
+        WireguardPaths {
            client_keys: PathBuf::from("/root/keys_pub.json"),
        }
    }
 }
@@ -230,7 +230,11 @@ impl<St> Gateway<St> {
        &self,
        shutdown: TaskClient,
    ) -> Result<defguard_wireguard_rs::WGApi, Box<dyn std::error::Error + Send + Sync>> {
-        nym_wireguard::start_wireguard(shutdown, Arc::clone(&self.client_registry)).await
+        let file = std::fs::File::open(&self.config.wireguard.storage_paths.client_keys)?;
        let reader = std::io::BufReader::new(file);
        let peers = serde_json::from_reader(reader)?;
        log::info!("Starting wireguard");
        nym_wireguard::start_wireguard(shutdown, Arc::clone(&self.client_registry), peers).await
    }
    #[cfg(all(feature = "wireguard", not(target_os = "linux")))]
@@ -517,7 +517,7 @@ pub struct Wireguard {
 }
 impl Wireguard {
-    pub fn new_default<P: AsRef<Path>>(data_dir: P) -> Self {
+    pub fn new_default<P: AsRef<Path>>(_data_dir: P) -> Self {
        Wireguard {
            enabled: false,
            bind_address: SocketAddr::new(
@@ -527,7 +527,9 @@ impl Wireguard {
            private_network_ip: DEFAULT_WIREGUARD_NETWORK_IP,
            announced_port: DEFAULT_WIREGUARD_PORT,
            private_network_prefix: DEFAULT_WIREGUARD_PREFIX,
-            storage_paths: persistence::WireguardPaths::new(data_dir),
+            storage_paths: persistence::WireguardPaths {
                client_keys: PathBuf::from("/root/keys_pub.json"),
            },
        }
    }
 }
@@ -366,11 +366,13 @@ impl ExitGatewayPaths {
 #[derive(Debug, Clone, Deserialize, PartialEq, Eq, Serialize)]
 #[serde(deny_unknown_fields)]
 pub struct WireguardPaths {
-    // pub keys:
+    pub client_keys: PathBuf,
 }
 impl WireguardPaths {
    pub fn new<P: AsRef<Path>>(_data_dir: P) -> Self {
-        WireguardPaths {}
+        WireguardPaths {
            client_keys: PathBuf::from("/root/keys_pub.json"),
        }
    }
 }