From ec4a831d628cc2f2c177c111e59a9c1126e9f70f Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 25 Feb 2023 13:27:03 -0600
Subject: [PATCH] Update mm-scripts.sh

---
 mm-scripts.sh | 38 ++++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/mm-scripts.sh b/mm-scripts.sh
index 7b61295..5a46f84 100755
--- a/mm-scripts.sh
+++ b/mm-scripts.sh
@@ -55,30 +55,39 @@ MMSTART(){
 		echo
 		OUT=$(ip link | grep "$VPN_INTERFACE")			
 		if [ ${#OUT} = 0 ]; then
-			JSON=$(curl 'https://chi.central.usa.torguardvpnaccess.com:1443/api/v1/setup?public-key=IuPhYqkMdzhsZ0nGFpiXq7eWjnLcx1I4Yr0KydyCTVU=' --user "villusion80:Dcs9208839613" -sk)
+			echo -en "${idsCL[LightCyan]}Setting up the VPN Tunnel config ... ${idsCL[Default]}"
+			privkey=$(wg genkey)
+			reqpublickey=$(echo "${privkey}" | wg pubkey)
+			reqpublickey="$(php -r 'echo rawurlencode($argv[1]);' -- "$reqpublickey")"
+			
+			JSON=$(curl https://chi.central.usa.torguardvpnaccess.com:1443/api/v1/setup?public-key=${reqpublickey} --user "villusion80:Dcs9208839613" -sk)
+			echo ${JSON} | jq
 			publickey=`echo ${JSON} | jq -r '.server_public_key'`
-			address=`echo ${JSON} | jq -r '.vpn_server_address'`
-			port=`echo ${JSON} | jq -r '.vpn_server_port'`
+			vpnaddress=`echo ${JSON} | jq -r '.vpn_server_address'`
+			vpnport=`echo ${JSON} | jq -r '.vpn_server_port'`
+			vpnip=`echo ${JSON} | jq -r '.client_ipv4'`
 
 			rm -f /etc/wireguard/wg-torguard.conf
 
 			echo -e "[Interface]
-PrivateKey = EDLTAzV/0KZOuvCeGaztr7c/YEDRJ3aZDLPUOL+Ctkk=
-ListenPort = 57881
+PrivateKey = ${privkey}
+ListenPort = 55009
 MTU = 1390
 DNS = 1.1.1.1
-Address = 10.13.38.29/24
-Table = off
+Address = ${vpnip}
 
 [Peer]
 PublicKey = ${publickey}
 AllowedIPs = 0.0.0.0/0
-Endpoint = ${address}:${port}
-PersistentKeepalive = 25
-" >> /etc/wireguard/wg-torguard.conf
+Endpoint = ${vpnaddress}:${vpnport}
+PersistentKeepalive = 25" >> /etc/wireguard/wg-torguard.conf
+
+			rm -f /opt/idssys/mediamanager/vpninfo.*
+			echo -e "$publickey" >> /opt/idssys/mediamanager/vpninfo.publickey
+			echo -e "$vpnaddress" >> /opt/idssys/mediamanager/vpninfo.address
+			echo -e "${idsCL[Green]} done${idsCL[Default]}"
+			
 			
-			rm -f /opt/idssys/mediamanager/vpnpublickey
-			echo -e "$publickey" >> /opt/idssys/mediamanager/vpnpublickey
 			
 			echo -en "${idsCL[LightCyan]}Starting the VPN Tunnel ... ${idsCL[Default]}"
 			"${VPN_START[@]}" >/dev/null 2>&1
@@ -146,7 +155,7 @@ PersistentKeepalive = 25
 			/bin/ip route add default dev wg-torguard
 			/bin/ip route add 0.0.0.0/1 dev wg-torguard
 			/bin/ip route add 128.0.0.0/1 dev wg-torguard
-			/bin/ip route add 45.128.36.194/32 via 10.10.0.1 dev eth0
+			/bin/ip route add $(cat /opt/idssys/mediamanager/vpninfo.address)/32 via 10.10.0.1 dev eth0
 			echo -e "${idsCL[Green]} done${idsCL[Default]}"
 			
 			zerogw=$(ip route show | grep 0.0.0.0 | cut -d' ' -f 3)
@@ -344,7 +353,8 @@ MMSTOP(){
 		fi
 	done
 	
-	[ "$(ip route show | grep default | cut -d' ' -f 3)" != "10.10.0.1" ] && /bin/ip route add default via 10.10.0.1 && ip route del 45.128.36.194
+	[ "$(ip route show | grep default | cut -d' ' -f 3)" != "10.10.0.1" ] && /bin/ip route add default via 10.10.0.1 && ip route del $(cat /opt/idssys/mediamanager/vpninfo.address)
+	rm -f /opt/idssys/mediamanager/vpninfo.*
 	[ $VERBOSE = true ] && echo "$(date) - Added default route back in" >> $logfile
 	
 	echo -e "${idsCL[Green]} done${idsCL[Default]}"