From f72bdf1237ff79e423deb1d84ab61cc6e9b877aa Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Sat, 24 Apr 2021 16:16:44 -0500
Subject: [PATCH] Update tests

---
 .github/workflows/cron.yml | 89 ++++++++++++++++++++++++++++----------
 .github/workflows/main.yml | 89 ++++++++++++++++++++++++++++----------
 2 files changed, 130 insertions(+), 48 deletions(-)

diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
index 13b292a..47ad969 100644
--- a/.github/workflows/cron.yml
+++ b/.github/workflows/cron.yml
@@ -218,19 +218,19 @@ jobs:
             sed -i '/pluto/d' /var/log/secure
             pkill -HUP rsyslog
             if [ "$1" = "centos" ]; then
-              wget -t 3 -T 30 -nv -O vpnupgrade.sh https://git.io/vpnupgrade-centos
+              wget -t 3 -T 30 -nv -O vpnup.sh https://git.io/vpnupgrade-centos
             else
-              wget -t 3 -T 30 -nv -O vpnupgrade.sh https://git.io/vpnupgrade-amzn
+              wget -t 3 -T 30 -nv -O vpnup.sh https://git.io/vpnupgrade-amzn
             fi
           else
             sed -i '/pluto/d' /var/log/auth.log
             pkill -HUP rsyslog
-            wget -t 3 -T 30 -nv -O vpnupgrade.sh https://git.io/vpnupgrade
+            wget -t 3 -T 30 -nv -O vpnup.sh https://git.io/vpnupgrade
           fi
 
-          sed -i '/swan_ver_url/s/^/#/' vpnupgrade.sh
-          sed -i 's/^SWAN_VER=.*/SWAN_VER=3.32/' vpnupgrade.sh
-          sh vpnupgrade.sh <<ANSWERS
+          sed -i '/swan_ver_url/s/^/#/' vpnup.sh
+          sed -i 's/^SWAN_VER=.*/SWAN_VER=3.32/' vpnup.sh
+          sh vpnup.sh <<ANSWERS
           y
           ANSWERS
 
@@ -255,8 +255,8 @@ jobs:
             pkill -HUP rsyslog
           fi
 
-          sed -i 's/^SWAN_VER=.*/SWAN_VER=4.1/' vpnupgrade.sh
-          sh vpnupgrade.sh <<ANSWERS
+          sed -i 's/^SWAN_VER=.*/SWAN_VER=4.1/' vpnup.sh
+          sh vpnup.sh <<ANSWERS
           y
           ANSWERS
 
@@ -281,8 +281,8 @@ jobs:
             pkill -HUP rsyslog
           fi
 
-          sed -i 's/^SWAN_VER=.*/SWAN_VER=4.2/' vpnupgrade.sh
-          sh vpnupgrade.sh <<ANSWERS
+          sed -i 's/^SWAN_VER=.*/SWAN_VER=4.2/' vpnup.sh
+          sh vpnup.sh <<ANSWERS
           y
           ANSWERS
 
@@ -307,8 +307,34 @@ jobs:
             pkill -HUP rsyslog
           fi
 
-          sed -i 's/^SWAN_VER=.*/SWAN_VER=4.3/' vpnupgrade.sh
-          sh vpnupgrade.sh <<ANSWERS
+          sed -i 's/^SWAN_VER=.*/SWAN_VER=4.3/' vpnup.sh
+          sh vpnup.sh <<ANSWERS
+          y
+          ANSWERS
+
+          if [ "$1" = "centos" ] || [ "$1" = "amazon" ]; then
+            systemctl restart ipsec
+            sleep 10
+            grep pluto /var/log/secure
+          else
+            sleep 10
+            grep pluto /var/log/auth.log
+          fi
+          ipsec status
+          ipsec status | grep -q l2tp-psk
+          ipsec status | grep -q xauth-psk
+          ipsec status | grep -q ikev2-cp
+
+          if [ "$1" = "centos" ] || [ "$1" = "amazon" ]; then
+            sed -i '/pluto/d' /var/log/secure
+            pkill -HUP rsyslog
+          else
+            sed -i '/pluto/d' /var/log/auth.log
+            pkill -HUP rsyslog
+          fi
+
+          sed -i 's/^SWAN_VER=.*/SWAN_VER=4.4/' vpnup.sh
+          sh vpnup.sh <<ANSWERS
           y
           ANSWERS
 
@@ -342,7 +368,7 @@ jobs:
 
           ls -ld vpnsetup.sh
           ls -ld ikev2.sh
-          ls -ld vpnupgrade.sh
+          ls -ld vpnup.sh
 
           exit 0
           EOF
@@ -545,11 +571,11 @@ jobs:
           sed -i '/pluto/d' /var/log/auth.log
           pkill -HUP rsyslog
 
-          wget -t 3 -T 30 -nv -O vpnupgrade.sh https://git.io/vpnupgrade
+          wget -t 3 -T 30 -nv -O vpnup.sh https://git.io/vpnupgrade
 
-          sed -i '/swan_ver_url/s/^/#/' vpnupgrade.sh
-          sed -i 's/^SWAN_VER=.*/SWAN_VER=3.32/' vpnupgrade.sh
-          sh vpnupgrade.sh <<ANSWERS
+          sed -i '/swan_ver_url/s/^/#/' vpnup.sh
+          sed -i 's/^SWAN_VER=.*/SWAN_VER=3.32/' vpnup.sh
+          sh vpnup.sh <<ANSWERS
           y
           ANSWERS
 
@@ -563,8 +589,8 @@ jobs:
           sed -i '/pluto/d' /var/log/auth.log
           pkill -HUP rsyslog
 
-          sed -i 's/^SWAN_VER=.*/SWAN_VER=4.1/' vpnupgrade.sh
-          sh vpnupgrade.sh <<ANSWERS
+          sed -i 's/^SWAN_VER=.*/SWAN_VER=4.1/' vpnup.sh
+          sh vpnup.sh <<ANSWERS
           y
           ANSWERS
 
@@ -578,8 +604,8 @@ jobs:
           sed -i '/pluto/d' /var/log/auth.log
           pkill -HUP rsyslog
 
-          sed -i 's/^SWAN_VER=.*/SWAN_VER=4.2/' vpnupgrade.sh
-          sh vpnupgrade.sh <<ANSWERS
+          sed -i 's/^SWAN_VER=.*/SWAN_VER=4.2/' vpnup.sh
+          sh vpnup.sh <<ANSWERS
           y
           ANSWERS
 
@@ -593,8 +619,23 @@ jobs:
           sed -i '/pluto/d' /var/log/auth.log
           pkill -HUP rsyslog
 
-          sed -i 's/^SWAN_VER=.*/SWAN_VER=4.3/' vpnupgrade.sh
-          sh vpnupgrade.sh <<ANSWERS
+          sed -i 's/^SWAN_VER=.*/SWAN_VER=4.3/' vpnup.sh
+          sh vpnup.sh <<ANSWERS
+          y
+          ANSWERS
+
+          sleep 10
+          grep pluto /var/log/auth.log
+          ipsec status
+          ipsec status | grep -q l2tp-psk
+          ipsec status | grep -q xauth-psk
+          ipsec status | grep -q ikev2-cp
+
+          sed -i '/pluto/d' /var/log/auth.log
+          pkill -HUP rsyslog
+
+          sed -i 's/^SWAN_VER=.*/SWAN_VER=4.4/' vpnup.sh
+          sh vpnup.sh <<ANSWERS
           y
           ANSWERS
 
@@ -618,4 +659,4 @@ jobs:
 
           ls -ld vpnsetup.sh
           ls -ld ikev2.sh
-          ls -ld vpnupgrade.sh
+          ls -ld vpnup.sh
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4680f13..d87a0cb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -250,19 +250,19 @@ jobs:
             sed -i '/pluto/d' /var/log/secure
             pkill -HUP rsyslog
             if [ "$1" = "centos" ]; then
-              wget -t 3 -T 30 -nv -O vpnupgrade.sh https://git.io/vpnupgrade-centos
+              wget -t 3 -T 30 -nv -O vpnup.sh https://git.io/vpnupgrade-centos
             else
-              wget -t 3 -T 30 -nv -O vpnupgrade.sh https://git.io/vpnupgrade-amzn
+              wget -t 3 -T 30 -nv -O vpnup.sh https://git.io/vpnupgrade-amzn
             fi
           else
             sed -i '/pluto/d' /var/log/auth.log
             pkill -HUP rsyslog
-            wget -t 3 -T 30 -nv -O vpnupgrade.sh https://git.io/vpnupgrade
+            wget -t 3 -T 30 -nv -O vpnup.sh https://git.io/vpnupgrade
           fi
 
-          sed -i '/swan_ver_url/s/^/#/' vpnupgrade.sh
-          sed -i 's/^SWAN_VER=.*/SWAN_VER=3.32/' vpnupgrade.sh
-          sh vpnupgrade.sh <<ANSWERS
+          sed -i '/swan_ver_url/s/^/#/' vpnup.sh
+          sed -i 's/^SWAN_VER=.*/SWAN_VER=3.32/' vpnup.sh
+          sh vpnup.sh <<ANSWERS
           y
           ANSWERS
 
@@ -287,8 +287,8 @@ jobs:
             pkill -HUP rsyslog
           fi
 
-          sed -i 's/^SWAN_VER=.*/SWAN_VER=4.1/' vpnupgrade.sh
-          sh vpnupgrade.sh <<ANSWERS
+          sed -i 's/^SWAN_VER=.*/SWAN_VER=4.1/' vpnup.sh
+          sh vpnup.sh <<ANSWERS
           y
           ANSWERS
 
@@ -313,8 +313,8 @@ jobs:
             pkill -HUP rsyslog
           fi
 
-          sed -i 's/^SWAN_VER=.*/SWAN_VER=4.2/' vpnupgrade.sh
-          sh vpnupgrade.sh <<ANSWERS
+          sed -i 's/^SWAN_VER=.*/SWAN_VER=4.2/' vpnup.sh
+          sh vpnup.sh <<ANSWERS
           y
           ANSWERS
 
@@ -339,8 +339,34 @@ jobs:
             pkill -HUP rsyslog
           fi
 
-          sed -i 's/^SWAN_VER=.*/SWAN_VER=4.3/' vpnupgrade.sh
-          sh vpnupgrade.sh <<ANSWERS
+          sed -i 's/^SWAN_VER=.*/SWAN_VER=4.3/' vpnup.sh
+          sh vpnup.sh <<ANSWERS
+          y
+          ANSWERS
+
+          if [ "$1" = "centos" ] || [ "$1" = "amazon" ]; then
+            systemctl restart ipsec
+            sleep 10
+            grep pluto /var/log/secure
+          else
+            sleep 10
+            grep pluto /var/log/auth.log
+          fi
+          ipsec status
+          ipsec status | grep -q l2tp-psk
+          ipsec status | grep -q xauth-psk
+          ipsec status | grep -q ikev2-cp
+
+          if [ "$1" = "centos" ] || [ "$1" = "amazon" ]; then
+            sed -i '/pluto/d' /var/log/secure
+            pkill -HUP rsyslog
+          else
+            sed -i '/pluto/d' /var/log/auth.log
+            pkill -HUP rsyslog
+          fi
+
+          sed -i 's/^SWAN_VER=.*/SWAN_VER=4.4/' vpnup.sh
+          sh vpnup.sh <<ANSWERS
           y
           ANSWERS
 
@@ -374,7 +400,7 @@ jobs:
 
           ls -ld vpnsetup.sh
           ls -ld ikev2.sh
-          ls -ld vpnupgrade.sh
+          ls -ld vpnup.sh
 
           exit 0
           EOF
@@ -580,11 +606,11 @@ jobs:
           sed -i '/pluto/d' /var/log/auth.log
           pkill -HUP rsyslog
 
-          wget -t 3 -T 30 -nv -O vpnupgrade.sh https://git.io/vpnupgrade
+          wget -t 3 -T 30 -nv -O vpnup.sh https://git.io/vpnupgrade
 
-          sed -i '/swan_ver_url/s/^/#/' vpnupgrade.sh
-          sed -i 's/^SWAN_VER=.*/SWAN_VER=3.32/' vpnupgrade.sh
-          sh vpnupgrade.sh <<ANSWERS
+          sed -i '/swan_ver_url/s/^/#/' vpnup.sh
+          sed -i 's/^SWAN_VER=.*/SWAN_VER=3.32/' vpnup.sh
+          sh vpnup.sh <<ANSWERS
           y
           ANSWERS
 
@@ -598,8 +624,8 @@ jobs:
           sed -i '/pluto/d' /var/log/auth.log
           pkill -HUP rsyslog
 
-          sed -i 's/^SWAN_VER=.*/SWAN_VER=4.1/' vpnupgrade.sh
-          sh vpnupgrade.sh <<ANSWERS
+          sed -i 's/^SWAN_VER=.*/SWAN_VER=4.1/' vpnup.sh
+          sh vpnup.sh <<ANSWERS
           y
           ANSWERS
 
@@ -613,8 +639,8 @@ jobs:
           sed -i '/pluto/d' /var/log/auth.log
           pkill -HUP rsyslog
 
-          sed -i 's/^SWAN_VER=.*/SWAN_VER=4.2/' vpnupgrade.sh
-          sh vpnupgrade.sh <<ANSWERS
+          sed -i 's/^SWAN_VER=.*/SWAN_VER=4.2/' vpnup.sh
+          sh vpnup.sh <<ANSWERS
           y
           ANSWERS
 
@@ -628,8 +654,23 @@ jobs:
           sed -i '/pluto/d' /var/log/auth.log
           pkill -HUP rsyslog
 
-          sed -i 's/^SWAN_VER=.*/SWAN_VER=4.3/' vpnupgrade.sh
-          sh vpnupgrade.sh <<ANSWERS
+          sed -i 's/^SWAN_VER=.*/SWAN_VER=4.3/' vpnup.sh
+          sh vpnup.sh <<ANSWERS
+          y
+          ANSWERS
+
+          sleep 10
+          grep pluto /var/log/auth.log
+          ipsec status
+          ipsec status | grep -q l2tp-psk
+          ipsec status | grep -q xauth-psk
+          ipsec status | grep -q ikev2-cp
+
+          sed -i '/pluto/d' /var/log/auth.log
+          pkill -HUP rsyslog
+
+          sed -i 's/^SWAN_VER=.*/SWAN_VER=4.4/' vpnup.sh
+          sh vpnup.sh <<ANSWERS
           y
           ANSWERS
 
@@ -653,4 +694,4 @@ jobs:
 
           ls -ld vpnsetup.sh
           ls -ld ikev2.sh
-          ls -ld vpnupgrade.sh
+          ls -ld vpnup.sh