From 4946813d927f0487969eac61750a3f43a90ffb88 Mon Sep 17 00:00:00 2001
From: Keith Irwin <git@ki9.us>
Date: Thu, 30 Nov 2023 18:29:44 -0700
Subject: [PATCH] refactor: :art: Move $WG_DNS to individual IPs

---
 INSTALL.md                  | 3 ++-
 back/lib/admin/peer/add     | 2 +-
 back/lib/admin/user/add     | 2 +-
 back/lib/dashboard/peer/add | 2 +-
 etc/config.sample           | 5 +++--
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/INSTALL.md b/INSTALL.md
index 6d96cca..9bc3352 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -490,7 +490,8 @@ TLD='mynet'
 LOCAL_SERVER='hn'
 IPV4_NET='10.99.0.0/16'
 IPV6_NET='fd69:1337:0:420:f4:99::/96'
-WG_DNS='DNS=10.99.0.1'
+IPV4_HUB=10.3.0.1
+IPV6_HUB=fd69:1337:0:420:f4:f3:0:1
 SSL_CONFIG_DIR="/etc/ssl/private/${TLD}"
 SSL_CA_CERT="${SSL_CONFIG_DIR}/_ca.crt"
 SSL_CA_KEY="${SSL_CONFIG_DIR}/_ca.key"
diff --git a/back/lib/admin/peer/add b/back/lib/admin/peer/add
index c1d61cd..2d3cf91 100755
--- a/back/lib/admin/peer/add
+++ b/back/lib/admin/peer/add
@@ -118,5 +118,5 @@ while IFS=$'\t' read -r server_hostname server_ipv4 server_ipv6 server_pubkey se
 		fi
 	fi
 done </etc/wagon/servers
-wg_config="[Interface] # ${hostname}.${username}.${TLD}\nPrivateKey=${privkey:?}\nAddress=${address:?}\n${WG_DNS}\n${server_blocks:?}"
+wg_config="[Interface] # ${hostname}.${username}.${TLD}\nPrivateKey=${privkey:?}\nAddress=${address:?}\nDNS=${IPV4_HUB},${IPV6_HUB}\n${server_blocks:?}"
 <<<"${wg_config}" /usr/lib/wagon/http_res 202
diff --git a/back/lib/admin/user/add b/back/lib/admin/user/add
index 1324ba5..f49bb83 100755
--- a/back/lib/admin/user/add
+++ b/back/lib/admin/user/add
@@ -110,5 +110,5 @@ while IFS=$'\t' read -r server_hostname server_ipv4 server_ipv6 server_pubkey se
 		fi
 	fi
 done </etc/wagon/servers
-wg_config="[Interface] # ${hostname}.${username}.${TLD}\nPrivateKey=${privkey:?}\nAddress=${address:?}\n${WG_DNS}\n${server_blocks:?}"
+wg_config="[Interface] # ${hostname}.${username}.${TLD}\nPrivateKey=${privkey:?}\nAddress=${address:?}\nDNS=${IPV4_HUB},${IPV6_HUB}\n${server_blocks:?}"
 <<<"${wg_config}" /usr/lib/wagon/http_res 202
diff --git a/back/lib/dashboard/peer/add b/back/lib/dashboard/peer/add
index 4b080ec..2980d5f 100755
--- a/back/lib/dashboard/peer/add
+++ b/back/lib/dashboard/peer/add
@@ -128,5 +128,5 @@ while IFS=$'\t' read -r server_hostname server_ipv4 server_ipv6 server_pubkey se
 		fi
 	fi
 done </etc/wagon/servers
-wg_config="[Interface] # ${hostname}.${username}.${TLD}\nPrivateKey=${privkey:?}\nAddress=${address:?}\n${WG_DNS}\n${server_blocks:?}"
+wg_config="[Interface] # ${hostname}.${username}.${TLD}\nPrivateKey=${privkey:?}\nAddress=${address:?}\nDNS=${IPV4_HUB},${IPV6_HUB}\nPostUp = ip route delete ${IPV4_NET} dev %i; ip route delete ${IPV6_NET} dev %i\nPostUp = ip route add ${IPV4_HUB}/32 dev %i; ip route add ${IPV6_HUB}/128 dev %i\nPostUp = ip route add ${IPV4_NET} via ${IPV4_HUB} dev %i; ip route add ${IPV6_NET} via ${IPV6_HUB} dev %i\nPostUp = resolvectl dns %i ${IPV4_HUB} ${IPV6_HUB}\nPostUp = resolvectl domain %i '~${TLD}' '${IPV4_NET}~4.10.in-addr.arpa' '${IPV6_NET}~4.f.0.0.4.f.0.0.0.2.4.0.0.0.0.0.7.3.3.1.9.6.d.f.ip6.arpa'${server_blocks:?}"
 <<<"${wg_config}" /usr/lib/wagon/http_res 202
diff --git a/etc/config.sample b/etc/config.sample
index 88e6574..4f8fba8 100755
--- a/etc/config.sample
+++ b/etc/config.sample
@@ -2,13 +2,14 @@ TLD='tld'
 LOCAL_SERVER='myhost1'
 IPV4_NET='10.3.0.0/16'
 IPV6_NET='fd69:1337:0:420:f4:f3::/96'
-WG_DNS='DNS=10.3.0.1,10.3.0.2,fd69:1337:0:420:f4:f3:0:1,fd69:1337:0:420:f4:f3:0:2'
+IPV4_HUB=10.3.0.1
+IPV6_HUB=fd69:1337:0:420:f4:f3:0:1
 SSL_CONFIG_DIR="/etc/ssl/private/${TLD}"
 SSL_CA_CERT="${SSL_CONFIG_DIR}/_ca.crt"
 SSL_CA_KEY="${SSL_CONFIG_DIR}/_ca.key"
 SSL_ORG='My Org'
 SSL_DAYS='3650'
 SSL_CA_PASS='XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
-DNS_KEY='XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXxw=='
+DNS_KEY='hmac-sha512:wagon:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXxw=='
 DNS_MASTER='10.3.0.1'
 DNS_TTL='86400'