From 143c10b6efb42a6bccd95714795d0c6ab0a06be1 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Tue, 16 Oct 2018 13:23:55 -0700
Subject: [PATCH] GUACAMOLE-524: Correct handling of tokens within
 SimpleConnection. The copy of the configuration should be filtered, not the
 original, and token values need to actually be set.

---
 .../org/apache/guacamole/net/auth/simple/SimpleConnection.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnection.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnection.java
index f9da240c4..2dec26a94 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnection.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnection.java
@@ -113,8 +113,7 @@ public class SimpleConnection extends AbstractConnection {
 
         // Apply tokens to config parameters
         GuacamoleConfiguration filteredConfig = new GuacamoleConfiguration(config);
-        TokenFilter tokenFilter = new TokenFilter();
-        tokenFilter.filterValues(config.getParameters());
+        new TokenFilter(tokens).filterValues(filteredConfig.getParameters());
 
         GuacamoleSocket socket;