From f3c25f6e62f971f28a7e8d6c4e906569c22cdf95 Mon Sep 17 00:00:00 2001
From: Joshua Lancaster <joshua.lancaster@kudelskisecurity.com>
Date: Fri, 30 Sep 2022 07:21:25 -0700
Subject: [PATCH 1/2] GUACAMOLE-1628: Docker image of guacamole client is
 missing unzip

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 438635e18..586cf4136 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -55,10 +55,10 @@ RUN /opt/guacamole/bin/build-guacamole.sh "$BUILD_DIR" /opt/guacamole
 # For the runtime image, we start with the official Tomcat distribution
 FROM tomcat:${TOMCAT_VERSION}-${TOMCAT_JRE}
 
-# Install XMLStarlet for server.xml alterations
+# Install XMLStarlet for server.xml alterations and unzip for LOGBACK_LEVEL case
 RUN apt-get update -qq \
-    && apt-get install -y xmlstarlet \
-    && rm -rf /var/lib/apt/lists/*
+    && apt-get install -y xmlstarlet unzip\
+    && rm -rf /var/lib/apt/lists/* 
 
 # This is where the build artifacts go in the runtime image
 WORKDIR /opt/guacamole

From bc251f5a29283c22d40bbaed5327bc8c1c9f1266 Mon Sep 17 00:00:00 2001
From: Ares Li <mli@harriscomputer.com>
Date: Wed, 19 Apr 2023 15:43:18 -0700
Subject: [PATCH 2/2] GUACAMOLE-1775: Use header for auth token instead of a
 parameter in "session/tunnels/<tunnel ID>/protocol" request

---
 .../frontend/src/app/rest/services/tunnelService.js   | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/guacamole/src/main/frontend/src/app/rest/services/tunnelService.js b/guacamole/src/main/frontend/src/app/rest/services/tunnelService.js
index 6a637ff71..1f0cde50d 100644
--- a/guacamole/src/main/frontend/src/app/rest/services/tunnelService.js
+++ b/guacamole/src/main/frontend/src/app/rest/services/tunnelService.js
@@ -88,17 +88,10 @@ angular.module('rest').factory('tunnelService', ['$injector',
      */
     service.getProtocol = function getProtocol(tunnel) {
 
-        // Build HTTP parameters set
-        var httpParameters = {
-            token : authenticationService.getCurrentToken()
-        };
-
-        // Retrieve the protocol details of the specified tunnel
-        return requestService({
+        return authenticationService.request({
             method  : 'GET',
             url     : 'api/session/tunnels/' + encodeURIComponent(tunnel)
-                        + '/protocol',
-            params  : httpParameters
+                        + '/protocol'
         });
 
     };