safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-524: Merge correct handling of parameter tokens within SimpleConnection

Browse Source
This commit is contained in:
Nick Couchman
2018-10-17 13:20:44 -04:00
parent f3cbdf5a3b 143c10b6ef
commit ecca7bc509
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnection.java
View File

@@ -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;

23
guacamole-ext/src/main/java/org/apache/guacamole/token/TokenFilter.java
View File

@@ -19,6 +19,7 @@
package org.apache.guacamole.token;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.regex.Matcher;
@@ -68,7 +69,27 @@ public class TokenFilter {
/**
* The values of all known tokens.
*/
private final Map<String, String> tokenValues = new HashMap<String, String>();
private final Map<String, String> tokenValues;
/**
* Creates a new TokenFilter which has no associated tokens. Tokens must
* later be given using {@link #setToken(java.lang.String, java.lang.String)}
* or {@link #setTokens(java.util.Map)}.
*/
public TokenFilter() {
this(Collections.<String, String>emptyMap());
}
/**
* Creates a new TokenFilter which is initialized with the given token
* name/value pairs.
*
* @param tokenValues
* A map containing token names and their corresponding values.
*/
public TokenFilter(Map<String, String> tokenValues) {
this.tokenValues = new HashMap<>(tokenValues);
}
/**
* Sets the token having the given name to the given value. Any existing