Update tests

.github/workflows/test_set_1.yml

@@ -85,11 +85,16 @@ jobs:
           systemctl start rsyslog
 
           cp -f /opt/src/scripts/vpnsetup.sh .
-          sed -i '/curl /a sed -i "/swan_ver_latest=/s/^/#/" "$tmpdir/vpn.sh"' vpnsetup.sh
+          cp -f /opt/src/scripts/extras/quickstart.sh .
+          cp -f /opt/src/scripts/extras/vpnuninstall.sh ./vpnunst.sh
+          sed -i -e '/curl /a sed -i "/swan_ver_latest=/s/^/#/" "$tmpdir/vpn.sh"' \
+            -e '/sleep 1/a sed -i "/swan_ver_latest=/s/^/#/" /opt/src/ikev2.sh' \
+            vpnsetup.sh quickstart.sh
 
-          sh vpnsetup.sh
+          for vpnsc in vpnsetup.sh quickstart.sh; do
+            sh "$vpnsc"
 
-          systemctl start xl2tpd
+            systemctl restart xl2tpd
             restart_ipsec
             restart_fail2ban
             cat /var/log/fail2ban.log
@@ -107,41 +112,6 @@ jobs:
             ipsec status
             ipsec status | grep -q l2tp-psk
             ipsec status | grep -q xauth-psk
-
-          ls -l /usr/bin/ikev2.sh
-          ls -l /opt/src/ikev2.sh
-
-          cp -f /opt/src/scripts/extras/vpnuninstall.sh ./vpnunst.sh
-          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
-
-          cp -f /opt/src/scripts/extras/quickstart.sh .
-          sed -i -e '/curl /a sed -i "/swan_ver_latest=/s/^/#/" "$tmpdir/vpn.sh"' \
-            -e '/sleep 1/a sed -i "/swan_ver_latest=/s/^/#/" /opt/src/ikev2.sh' quickstart.sh
-
-          sh quickstart.sh
-
-          systemctl restart xl2tpd
-          restart_ipsec
-          restart_fail2ban
-          cat /var/log/fail2ban.log
-
-          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
             ipsec status | grep -q ikev2-cp
 
             ls -ld /etc/ipsec.d/vpnclient.mobileconfig
@@ -155,9 +125,11 @@ jobs:
           y
           ANSWERS
             rm -f /usr/bin/ikev2.sh /opt/src/ikev2.sh
+            rm -f /etc/ipsec.d/vpnclient*
             if grep -qi stream /etc/redhat-release; then
               mkdir /etc/xl2tpd
             fi
+          done
 
           if [ "$1" != "amazon" ]; then
             cp -f /opt/src/scripts/vpnsetup_centos.sh ./vpnsetup.sh
@@ -316,7 +288,6 @@ jobs:
           restart_ipsec
           ipsec status | grep -q ikev2-cp
 
-          bash ikev2.sh --auto --addclient invalidclient: 2>&1 | grep -i "warning"
           bash ikev2.sh --addclient invalidclient: 2>&1 | grep -i "invalid"
           bash ikev2.sh --addclient vpnclient1 2>&1 | grep -i "already exists"
 

.github/workflows/test_set_2.yml

@@ -88,12 +88,16 @@ jobs:
           fi
 
           cp -f "$GITHUB_WORKSPACE"/vpnsetup.sh .
-          sed -i '/curl /a sed -i "/swan_ver_latest=/s/^/#/" "$tmpdir/vpn.sh"' vpnsetup.sh
+          cp -f "$GITHUB_WORKSPACE"/extras/quickstart.sh .
+          cp -f "$GITHUB_WORKSPACE"/extras/vpnuninstall.sh ./vpnunst.sh
+          sed -i -e '/curl /a sed -i "/swan_ver_latest=/s/^/#/" "$tmpdir/vpn.sh"' \
+            -e '/sleep 1/a sed -i "/swan_ver_latest=/s/^/#/" /opt/src/ikev2.sh' \
+            vpnsetup.sh quickstart.sh
 
-          sh vpnsetup.sh
+          for vpnsc in vpnsetup.sh quickstart.sh; do
+            sh "$vpnsc"
 
             if [ "$os_type" = "alpine" ]; then
-            ipsec initnss
               xl2tpd -c /etc/xl2tpd/xl2tpd.conf
               restart_ipsec
             else
@@ -115,47 +119,6 @@ jobs:
             ipsec status
             ipsec status | grep -q l2tp-psk
             ipsec status | grep -q xauth-psk
-
-          ls -l /usr/bin/ikev2.sh
-          ls -l /opt/src/ikev2.sh
-
-          cp -f "$GITHUB_WORKSPACE"/extras/vpnuninstall.sh ./vpnunst.sh
-          bash vpnunst.sh <<ANSWERS
-          y
-          ANSWERS
-          rm -f /usr/bin/ikev2.sh /opt/src/ikev2.sh
-
-          if [ "$os_type" = "alpine" ]; then
-            killall pluto || true
-            killall xl2tpd || true
-          fi
-
-          cp -f "$GITHUB_WORKSPACE"/extras/quickstart.sh .
-          sed -i -e '/curl /a sed -i "/swan_ver_latest=/s/^/#/" "$tmpdir/vpn.sh"' \
-            -e '/sleep 1/a sed -i "/swan_ver_latest=/s/^/#/" /opt/src/ikev2.sh' quickstart.sh
-
-          sh quickstart.sh
-
-          if [ "$os_type" = "alpine" ]; then
-            xl2tpd -c /etc/xl2tpd/xl2tpd.conf
-            restart_ipsec
-          else
-            restart_ipsec
-            restart_fail2ban
-            cat /var/log/fail2ban.log
-          fi
-
-          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
             ipsec status | grep -q ikev2-cp
 
             ls -ld /etc/ipsec.d/vpnclient.mobileconfig
@@ -169,11 +132,12 @@ jobs:
           y
           ANSWERS
             rm -f /usr/bin/ikev2.sh /opt/src/ikev2.sh
-
+            rm -f /etc/ipsec.d/vpnclient*
             if [ "$os_type" = "alpine" ]; then
               killall pluto || true
               killall xl2tpd || true
             fi
+          done
 
           if [ "$os_type" = "alpine" ]; then
             cp -f "$GITHUB_WORKSPACE"/vpnsetup_alpine.sh ./vpnsetup.sh
@@ -340,7 +304,6 @@ jobs:
           restart_ipsec
           ipsec status | grep -q ikev2-cp
 
-          bash ikev2.sh --auto --addclient invalidclient: 2>&1 | grep -i "warning"
           bash ikev2.sh --addclient invalidclient: 2>&1 | grep -i "invalid"
           bash ikev2.sh --addclient vpnclient1 2>&1 | grep -i "already exists"