From 8b129925e6ea7f4dca01e1c0039293f69401e30c Mon Sep 17 00:00:00 2001
From: Tom Maguire <thomas@maguire.email>
Date: Tue, 3 Jan 2023 17:23:57 +0000
Subject: [PATCH] Tidied up SSO function and replaced with correct download
 file

---
 guac-upgrade.sh | 42 +++++++++++++++++-------------------------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git a/guac-upgrade.sh b/guac-upgrade.sh
index 873c10f..905de12 100755
--- a/guac-upgrade.sh
+++ b/guac-upgrade.sh
@@ -197,24 +197,27 @@ for file in /etc/guacamole/extensions/guacamole-auth-duo*.jar; do
     fi
 done
 
+function download_sso_auth () {
+    wget -q --show-progress -O guacamole-auth-sso-${GUACVERSION}.tar.gz ${SERVER}/binary/guacamole-auth-sso-${GUACVERSION}.tar.gz
+    if [ $? -ne 0 ]; then
+        echo -e "${RED}Failed to download guacamole-auth-sso-${GUACVERSION}.tar.gz"
+        echo -e "${SERVER}/binary/guacamole-auth-sso-${GUACVERSION}.tar.gz"
+        exit 1
+    fi
+    echo -e "${GREEN}Downloaded guacamole-auth-sso-${GUACVERSION}.tar.gz${NC}"
+    tar -xzf guacamole-auth-sso-${GUACVERSION}.tar.gz
+    cp guacamole-auth-sso-${GUACVERSION}/saml/guacamole-auth-sso-saml-${GUACVERSION}.jar /etc/guacamole/extensions/
+    echo -e "${GREEN}SAML copied to extensions.${NC}"
+    break
+}
+
 # Handle upgrading SAML plugin if present
 for file in /etc/guacamole/extensions/guacamole-auth-saml*.jar; do
     if [[ -f $file ]]; then
         # Upgrade SAML
         echo -e "${BLUE}SAML extension was found, upgrading...${NC}"
-        rm /etc/guacamole/extensions/guacamole-auth-sso-saml*.jar
-        wget -q --show-progress -O guacamole-auth-sso-saml-${GUACVERSION}.tar.gz ${SERVER}/binary/guacamole-auth-sso-saml-${GUACVERSION}.tar.gz
-        if [ $? -ne 0 ]; then
-            echo -e "${RED}Failed to download guacamole-auth-sso-saml-${GUACVERSION}.tar.gz"
-            echo -e "${SERVER}/binary/guacamole-auth-sso-saml-${GUACVERSION}.tar.gz"
-            exit 1
-        fi
-        echo -e "${GREEN}Downloaded guacamole-auth-sso-saml-${GUACVERSION}.tar.gz${NC}"
-        tar -xzf guacamole-auth-sso-saml-${GUACVERSION}.tar.gz
-        cp guacamole-auth-sso-saml-${GUACVERSION}/guacamole-auth-sso-saml-${GUACVERSION}.jar /etc/guacamole/extensions/
-        echo -e "${GREEN}SAML copied to extensions.${NC}"
-
-        break
+        rm /etc/guacamole/extensions/guacamole-auth-saml*.jar
+        download_sso_auth
     fi
 done
 # Handle newer install/upgrade with different package name
@@ -223,18 +226,7 @@ for file in /etc/guacamole/extensions/guacamole-auth-sso-saml*.jar; do
         # Upgrade SAML
         echo -e "${BLUE}SAML extension was found, upgrading...${NC}"
         rm /etc/guacamole/extensions/guacamole-auth-sso-saml*.jar
-        wget -q --show-progress -O guacamole-auth-sso-saml-${GUACVERSION}.tar.gz ${SERVER}/binary/guacamole-auth-sso-saml-${GUACVERSION}.tar.gz
-        if [ $? -ne 0 ]; then
-            echo -e "${RED}Failed to download guacamole-auth-sso-saml-${GUACVERSION}.tar.gz"
-            echo -e "${SERVER}/binary/guacamole-auth-sso-saml-${GUACVERSION}.tar.gz"
-            exit 1
-        fi
-        echo -e "${GREEN}Downloaded guacamole-auth-sso-saml-${GUACVERSION}.tar.gz${NC}"
-        tar -xzf guacamole-auth-sso-saml-${GUACVERSION}.tar.gz
-        cp guacamole-auth-sso-saml-${GUACVERSION}/guacamole-auth-sso-saml-${GUACVERSION}.jar /etc/guacamole/extensions/
-        echo -e "${GREEN}SAML copied to extensions.${NC}"
-
-        break
+        download_sso_auth
     fi
 done