From ef8f60d013cf159784c42a4b5243d9782f970c20 Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Wed, 15 Sep 2021 23:22:01 -0500
Subject: [PATCH] Update tests

---
 .github/workflows/cron.yml | 70 +++++++++++++++++++++++++++++++-------
 .github/workflows/main.yml | 68 +++++++++++++++++++++++++++++-------
 2 files changed, 113 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
index ac21e7a..0ce2012 100644
--- a/.github/workflows/cron.yml
+++ b/.github/workflows/cron.yml
@@ -192,6 +192,7 @@ jobs:
           bash vpnunst.sh <<ANSWERS
           y
           ANSWERS
+          rm -f /usr/bin/ikev2.sh /opt/src/ikev2.sh
           if grep -qi stream /etc/redhat-release; then
             mkdir /etc/xl2tpd
           fi
@@ -230,6 +231,7 @@ jobs:
           bash vpnunst.sh <<ANSWERS
           y
           ANSWERS
+          rm -f /usr/bin/ikev2.sh /opt/src/ikev2.sh
           if grep -qi stream /etc/redhat-release; then
             mkdir /etc/xl2tpd
           fi
@@ -248,7 +250,21 @@ jobs:
           VPN_DNS_SRV2='1.0.0.1' \
           bash vpnsetup.sh
 
+          systemctl restart xl2tpd
           restart_ipsec
+
+          netstat -anpu | grep pluto
+          netstat -anpu | grep xl2tpd
+          iptables -nvL
+          iptables -nvL | grep -q 'ppp+'
+          iptables -nvL | grep -q '192\.168\.43\.0/24'
+          iptables -nvL -t nat
+          iptables -nvL -t nat | grep -q '192\.168\.42\.0/24'
+          iptables -nvL -t nat | grep -q '192\.168\.43\.0/24'
+          ipsec status
+          ipsec status | grep -q l2tp-psk
+          ipsec status | grep -q xauth-psk
+
           grep -q "your_ipsec_pre_shared_key" /etc/ipsec.secrets
           grep -q "your_vpn_username" /etc/ppp/chap-secrets
           grep -q "your_vpn_password" /etc/ppp/chap-secrets
@@ -257,6 +273,9 @@ jobs:
           grep -q 'ms-dns 1.1.1.1' /etc/ppp/options.xl2tpd
           grep -q 'ms-dns 1.0.0.1' /etc/ppp/options.xl2tpd
 
+          ls -l /usr/bin/ikev2.sh
+          ls -l /opt/src/ikev2.sh
+
           wget -t 3 -T 30 -nv -O ikev2.sh https://git.io/ikev2setup # hwdsl2
           sed -i '/swan_ver_latest=/s/^/#/' ikev2.sh
 
@@ -522,10 +541,6 @@ jobs:
           ipsec status | grep -q ikev2-cp && exit 1
           certutil -L -d sql:/etc/ipsec.d
 
-          ls -ld vpnsetup.sh
-          ls -ld ikev2.sh
-          ls -ld vpnup.sh
-
           exit 0
           EOF
 
@@ -664,6 +679,7 @@ jobs:
           bash vpnunst.sh <<ANSWERS
           y
           ANSWERS
+          rm -f /usr/bin/ikev2.sh /opt/src/ikev2.sh
 
           wget -t 3 -T 30 -nv -O quickstart.sh https://git.io/vpnquickstart
           sed -i -e '/curl /a sed -i "/swan_ver_latest=/s/^/#/" "$tmpdir/vpn.sh"' \
@@ -698,6 +714,7 @@ jobs:
           bash vpnunst.sh <<ANSWERS
           y
           ANSWERS
+          rm -f /usr/bin/ikev2.sh /opt/src/ikev2.sh
 
           wget -t 3 -T 30 -nv -O vpnsetup.sh https://git.io/vpnsetup-ubuntu
           sed -i '/swan_ver_latest=/s/^/#/' vpnsetup.sh
@@ -710,6 +727,19 @@ jobs:
           bash vpnsetup.sh
 
           restart_ipsec
+
+          netstat -anpu | grep pluto
+          netstat -anpu | grep xl2tpd
+          iptables -nvL
+          iptables -nvL | grep -q 'ppp+'
+          iptables -nvL | grep -q '192\.168\.43\.0/24'
+          iptables -nvL -t nat
+          iptables -nvL -t nat | grep -q '192\.168\.42\.0/24'
+          iptables -nvL -t nat | grep -q '192\.168\.43\.0/24'
+          ipsec status
+          ipsec status | grep -q l2tp-psk
+          ipsec status | grep -q xauth-psk
+
           grep -q "your_ipsec_pre_shared_key" /etc/ipsec.secrets
           grep -q "your_vpn_username" /etc/ppp/chap-secrets
           grep -q "your_vpn_password" /etc/ppp/chap-secrets
@@ -718,6 +748,9 @@ jobs:
           grep -q 'ms-dns 1.1.1.1' /etc/ppp/options.xl2tpd
           grep -q 'ms-dns 1.0.0.1' /etc/ppp/options.xl2tpd
 
+          ls -l /usr/bin/ikev2.sh
+          ls -l /opt/src/ikev2.sh
+
           wget -t 3 -T 30 -nv -O ikev2.sh https://git.io/ikev2setup
           sed -i '/swan_ver_latest=/s/^/#/' ikev2.sh
 
@@ -982,12 +1015,8 @@ jobs:
           ipsec status | grep -q ikev2-cp && exit 1
           certutil -L -d sql:/etc/ipsec.d
 
-          ls -ld vpnsetup.sh
-          ls -ld ikev2.sh
-          ls -ld vpnup.sh
-
   test_set_3:
-    needs: [shellcheck, check_urls]
+    needs: check_urls
     runs-on: ubuntu-20.04
     if: github.repository_owner == 'hwdsl2'
     strategy:
@@ -1056,6 +1085,7 @@ jobs:
           bash vpnunst.sh <<ANSWERS
           y
           ANSWERS
+          rm -f /usr/bin/ikev2.sh /opt/src/ikev2.sh
           killall pluto || true
           killall xl2tpd || true
 
@@ -1091,6 +1121,7 @@ jobs:
           bash vpnunst.sh <<ANSWERS
           y
           ANSWERS
+          rm -f /usr/bin/ikev2.sh /opt/src/ikev2.sh
           killall pluto || true
           killall xl2tpd || true
 
@@ -1105,7 +1136,21 @@ jobs:
           bash vpnsetup.sh
 
           ipsec initnss
+          xl2tpd -c /etc/xl2tpd/xl2tpd.conf
           restart_ipsec
+
+          netstat -anpu | grep pluto
+          netstat -anpu | grep xl2tpd
+          iptables -nvL
+          iptables -nvL | grep -q 'ppp+'
+          iptables -nvL | grep -q '192\.168\.43\.0/24'
+          iptables -nvL -t nat
+          iptables -nvL -t nat | grep -q '192\.168\.42\.0/24'
+          iptables -nvL -t nat | grep -q '192\.168\.43\.0/24'
+          ipsec status
+          ipsec status | grep -q l2tp-psk
+          ipsec status | grep -q xauth-psk
+
           grep -q "your_ipsec_pre_shared_key" /etc/ipsec.secrets
           grep -q "your_vpn_username" /etc/ppp/chap-secrets
           grep -q "your_vpn_password" /etc/ppp/chap-secrets
@@ -1114,6 +1159,9 @@ jobs:
           grep -q 'ms-dns 1.1.1.1' /etc/ppp/options.xl2tpd
           grep -q 'ms-dns 1.0.0.1' /etc/ppp/options.xl2tpd
 
+          ls -l /usr/bin/ikev2.sh
+          ls -l /opt/src/ikev2.sh
+
           wget -t 3 -T 30 -nv -O ikev2.sh https://git.io/ikev2setup
           sed -i '/swan_ver_latest=/s/^/#/' ikev2.sh
 
@@ -1376,7 +1424,3 @@ jobs:
           ipsec status | grep -q xauth-psk
           ipsec status | grep -q ikev2-cp && exit 1
           certutil -L -d sql:/etc/ipsec.d
-
-          ls -ld vpnsetup.sh
-          ls -ld ikev2.sh
-          ls -ld vpnup.sh
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index acbaca5..e8999fa 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -221,6 +221,7 @@ jobs:
           bash vpnunst.sh <<ANSWERS
           y
           ANSWERS
+          rm -f /usr/bin/ikev2.sh /opt/src/ikev2.sh
           if grep -qi stream /etc/redhat-release; then
             mkdir /etc/xl2tpd
           fi
@@ -259,6 +260,7 @@ jobs:
           bash vpnunst.sh <<ANSWERS
           y
           ANSWERS
+          rm -f /usr/bin/ikev2.sh /opt/src/ikev2.sh
           if grep -qi stream /etc/redhat-release; then
             mkdir /etc/xl2tpd
           fi
@@ -277,7 +279,21 @@ jobs:
           VPN_DNS_SRV2='1.0.0.1' \
           bash vpnsetup.sh
 
+          systemctl restart xl2tpd
           restart_ipsec
+
+          netstat -anpu | grep pluto
+          netstat -anpu | grep xl2tpd
+          iptables -nvL
+          iptables -nvL | grep -q 'ppp+'
+          iptables -nvL | grep -q '192\.168\.43\.0/24'
+          iptables -nvL -t nat
+          iptables -nvL -t nat | grep -q '192\.168\.42\.0/24'
+          iptables -nvL -t nat | grep -q '192\.168\.43\.0/24'
+          ipsec status
+          ipsec status | grep -q l2tp-psk
+          ipsec status | grep -q xauth-psk
+
           grep -q "your_ipsec_pre_shared_key" /etc/ipsec.secrets
           grep -q "your_vpn_username" /etc/ppp/chap-secrets
           grep -q "your_vpn_password" /etc/ppp/chap-secrets
@@ -286,6 +302,9 @@ jobs:
           grep -q 'ms-dns 1.1.1.1' /etc/ppp/options.xl2tpd
           grep -q 'ms-dns 1.0.0.1' /etc/ppp/options.xl2tpd
 
+          ls -l /usr/bin/ikev2.sh
+          ls -l /opt/src/ikev2.sh
+
           wget -t 3 -T 30 -nv -O ikev2.sh https://git.io/ikev2setup # hwdsl2
           sed -i '/swan_ver_latest=/s/^/#/' ikev2.sh
 
@@ -551,10 +570,6 @@ jobs:
           ipsec status | grep -q ikev2-cp && exit 1
           certutil -L -d sql:/etc/ipsec.d
 
-          ls -ld vpnsetup.sh
-          ls -ld ikev2.sh
-          ls -ld vpnup.sh
-
           exit 0
           EOF
 
@@ -693,6 +708,7 @@ jobs:
           bash vpnunst.sh <<ANSWERS
           y
           ANSWERS
+          rm -f /usr/bin/ikev2.sh /opt/src/ikev2.sh
 
           wget -t 3 -T 30 -nv -O quickstart.sh https://git.io/vpnquickstart
           sed -i -e '/curl /a sed -i "/swan_ver_latest=/s/^/#/" "$tmpdir/vpn.sh"' \
@@ -727,6 +743,7 @@ jobs:
           bash vpnunst.sh <<ANSWERS
           y
           ANSWERS
+          rm -f /usr/bin/ikev2.sh /opt/src/ikev2.sh
 
           wget -t 3 -T 30 -nv -O vpnsetup.sh https://git.io/vpnsetup-ubuntu
           sed -i '/swan_ver_latest=/s/^/#/' vpnsetup.sh
@@ -739,6 +756,19 @@ jobs:
           bash vpnsetup.sh
 
           restart_ipsec
+
+          netstat -anpu | grep pluto
+          netstat -anpu | grep xl2tpd
+          iptables -nvL
+          iptables -nvL | grep -q 'ppp+'
+          iptables -nvL | grep -q '192\.168\.43\.0/24'
+          iptables -nvL -t nat
+          iptables -nvL -t nat | grep -q '192\.168\.42\.0/24'
+          iptables -nvL -t nat | grep -q '192\.168\.43\.0/24'
+          ipsec status
+          ipsec status | grep -q l2tp-psk
+          ipsec status | grep -q xauth-psk
+
           grep -q "your_ipsec_pre_shared_key" /etc/ipsec.secrets
           grep -q "your_vpn_username" /etc/ppp/chap-secrets
           grep -q "your_vpn_password" /etc/ppp/chap-secrets
@@ -747,6 +777,9 @@ jobs:
           grep -q 'ms-dns 1.1.1.1' /etc/ppp/options.xl2tpd
           grep -q 'ms-dns 1.0.0.1' /etc/ppp/options.xl2tpd
 
+          ls -l /usr/bin/ikev2.sh
+          ls -l /opt/src/ikev2.sh
+
           wget -t 3 -T 30 -nv -O ikev2.sh https://git.io/ikev2setup
           sed -i '/swan_ver_latest=/s/^/#/' ikev2.sh
 
@@ -1011,10 +1044,6 @@ jobs:
           ipsec status | grep -q ikev2-cp && exit 1
           certutil -L -d sql:/etc/ipsec.d
 
-          ls -ld vpnsetup.sh
-          ls -ld ikev2.sh
-          ls -ld vpnup.sh
-
   test_set_3:
     needs: [shellcheck, check_urls]
     runs-on: ubuntu-20.04
@@ -1085,6 +1114,7 @@ jobs:
           bash vpnunst.sh <<ANSWERS
           y
           ANSWERS
+          rm -f /usr/bin/ikev2.sh /opt/src/ikev2.sh
           killall pluto || true
           killall xl2tpd || true
 
@@ -1120,6 +1150,7 @@ jobs:
           bash vpnunst.sh <<ANSWERS
           y
           ANSWERS
+          rm -f /usr/bin/ikev2.sh /opt/src/ikev2.sh
           killall pluto || true
           killall xl2tpd || true
 
@@ -1134,7 +1165,21 @@ jobs:
           bash vpnsetup.sh
 
           ipsec initnss
+          xl2tpd -c /etc/xl2tpd/xl2tpd.conf
           restart_ipsec
+
+          netstat -anpu | grep pluto
+          netstat -anpu | grep xl2tpd
+          iptables -nvL
+          iptables -nvL | grep -q 'ppp+'
+          iptables -nvL | grep -q '192\.168\.43\.0/24'
+          iptables -nvL -t nat
+          iptables -nvL -t nat | grep -q '192\.168\.42\.0/24'
+          iptables -nvL -t nat | grep -q '192\.168\.43\.0/24'
+          ipsec status
+          ipsec status | grep -q l2tp-psk
+          ipsec status | grep -q xauth-psk
+
           grep -q "your_ipsec_pre_shared_key" /etc/ipsec.secrets
           grep -q "your_vpn_username" /etc/ppp/chap-secrets
           grep -q "your_vpn_password" /etc/ppp/chap-secrets
@@ -1143,6 +1188,9 @@ jobs:
           grep -q 'ms-dns 1.1.1.1' /etc/ppp/options.xl2tpd
           grep -q 'ms-dns 1.0.0.1' /etc/ppp/options.xl2tpd
 
+          ls -l /usr/bin/ikev2.sh
+          ls -l /opt/src/ikev2.sh
+
           wget -t 3 -T 30 -nv -O ikev2.sh https://git.io/ikev2setup
           sed -i '/swan_ver_latest=/s/^/#/' ikev2.sh
 
@@ -1405,7 +1453,3 @@ jobs:
           ipsec status | grep -q xauth-psk
           ipsec status | grep -q ikev2-cp && exit 1
           certutil -L -d sql:/etc/ipsec.d
-
-          ls -ld vpnsetup.sh
-          ls -ld ikev2.sh
-          ls -ld vpnup.sh