Merge 8b129925e6 into ae97aaca94

* Update README.md

Update to Version 1.5.4

* Update docker-install.sh

Updated to version 1.5.4

* Update guac-install-server.sh

Update to version 1.5.4

* Update guac-install.sh

Update to version 1.5.4

* Update guac-upgrade.sh

* Update guac-install.sh to version 1.5.5

* Update docker-install.sh to version 1.5.5

* Update guac-install-server.sh to version 1.5.5

* Update README.md

Update to version 1.5.5

* Update guac-upgrade.sh

Update to version 1.5.5

* Update README.md

* Update README.md

changed URL back to default

---------

Co-authored-by: wtaylor803 <111420385+wtaylor803@users.noreply.github.com>

README.md

@@ -20,7 +20,7 @@ sudo apt update
 sudo apt -y -t buster-backports install freerdp2-dev libpulse-dev
 ```
 
-Script for installing Guacamole 1.5.4 on Ubuntu 16.04 or newer (with MySQL, or remote MySQL). It should also work on pure [Debian](https://www.debian.org/), [Raspbian](https://www.raspberrypi.org/downloads/raspbian/), [Linux Mint](https://linuxmint.com/) (18/LMDE 4 or newer) or [Kali Linux](https://www.kali.org/). I have tested this with Debian 10.3.0 (Buster). **If other versions don't work please open an issue.** It is likely due to a required library having a different name.
+Script for installing Guacamole 1.5.5 on Ubuntu 16.04 or newer (with MySQL, or remote MySQL). It should also work on pure [Debian](https://www.debian.org/), [Raspbian](https://www.raspberrypi.org/downloads/raspbian/), [Linux Mint](https://linuxmint.com/) (18/LMDE 4 or newer) or [Kali Linux](https://www.kali.org/). I have tested this with Debian 10.3.0 (Buster). **If other versions don't work please open an issue.** It is likely due to a required library having a different name.
 
 Run script, enter MySQL Root Password and Guacamole User password. Guacamole User is used to connect to the Guacamole Database. Be sure to save these!
 

docker-install.sh

@@ -4,7 +4,7 @@
 if ! [ $(id -u) = 0 ]; then echo "Please run this script as sudo or root"; exit 1 ; fi
 
 # Version number of Guacamole to install
-GUACVERSION="1.5.4"
+GUACVERSION="1.5.5"
 
 # Initialize variable values
 installTOTP=""

guac-install-server.sh

@@ -4,7 +4,7 @@
 if ! [ $(id -u) = 0 ]; then echo "Please run this script as sudo or root"; exit 1 ; fi
 
 # Version number of Guacamole to install
-GUACVERSION="1.5.4"
+GUACVERSION="1.5.5"
 
 # Different version of Ubuntu/Linux Mint and Debian have different package names...
 source /etc/os-release

guac-install.sh

@@ -15,7 +15,7 @@ fi
 
 # Version number of Guacamole to install
 # Homepage ~ https://guacamole.apache.org/releases/
-GUACVERSION="1.5.4"
+GUACVERSION="1.5.5"
 
 # Latest Version of MySQL Connector/J if manual install is required (if libmariadb-java/libmysql-java is not available via apt)
 # Homepage ~ https://dev.mysql.com/downloads/connector/j/

guac-upgrade.sh

@@ -4,7 +4,7 @@
 if ! [ $(id -u) = 0 ]; then echo "Please run this script as sudo or root"; exit 1 ; fi
 
 # Version number of Guacamole to install
-GUACVERSION="1.5.4"
+GUACVERSION="1.5.5"
 
 # Colors to use for output
 YELLOW='\033[1;33m'
@@ -197,6 +197,39 @@ 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-saml*.jar
+        download_sso_auth
+    fi
+done
+# Handle newer install/upgrade with different package name
+for file in /etc/guacamole/extensions/guacamole-auth-sso-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
+        download_sso_auth
+    fi
+done
+
 # Fix for #196
 mkdir -p /usr/sbin/.config/freerdp
 chown daemon:daemon /usr/sbin/.config/freerdp