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

GUACAMOLE-641: Expand CONNECTION_USERNAME and CONNECTION_HOSTNAME tokens only if corresponding parameters are non-empty.

Browse Source
This commit is contained in:
Michael Jumper
2022-01-21 15:23:41 -08:00
parent 4d3b2a9435
commit 16cb9ed69b
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
extensions/guacamole-vault/modules/guacamole-vault-base/src/main/java/org/apache/guacamole/vault/user/VaultUserContext.java
View File

@@ -77,14 +77,20 @@ public class VaultUserContext extends TokenInjectingUserContext {
/** /**
* The name of the token which will be replaced with the \"hostname\" * The name of the token which will be replaced with the \"hostname\"
* connection parameter of the current connection if specified within the * connection parameter of the current connection if specified within the
* name of a secret. This token only applies only to connections. * name of a secret. If the \"hostname\" parameter cannot be retrieved, or
* if the parameter is blank, the token will not be replaced and any
* secrets involving that token will not be retrieved. This token only
* applies only to connections.
*/ */
private static final String CONNECTION_HOSTNAME_TOKEN = "CONNECTION_HOSTNAME"; private static final String CONNECTION_HOSTNAME_TOKEN = "CONNECTION_HOSTNAME";
/** /**
* The name of the token which will be replaced with the \"username\" * The name of the token which will be replaced with the \"username\"
* connection parameter of the current connection if specified within the * connection parameter of the current connection if specified within the
* name of a secret. This token only applies only to connections. * name of a secret. If the \"username\" parameter cannot be retrieved, or
* if the parameter is blank, the token will not be replaced and any
* secrets involving that token will not be retrieved. This token only
* applies only to connections.
*/ */
private static final String CONNECTION_USERNAME_TOKEN = "CONNECTION_USERNAME"; private static final String CONNECTION_USERNAME_TOKEN = "CONNECTION_USERNAME";
@@ -340,7 +346,7 @@ public class VaultUserContext extends TokenInjectingUserContext {
Map<String, String> parameters = getConnectionParameters(connection); Map<String, String> parameters = getConnectionParameters(connection);
String hostname = parameters.get("hostname"); String hostname = parameters.get("hostname");
if (hostname != null) if (hostname != null && !hostname.isEmpty())
filter.setToken(CONNECTION_HOSTNAME_TOKEN, hostname); filter.setToken(CONNECTION_HOSTNAME_TOKEN, hostname);
else else
logger.debug("Hostname for connection \"{}\" (\"{}\") not " logger.debug("Hostname for connection \"{}\" (\"{}\") not "
@@ -349,7 +355,7 @@ public class VaultUserContext extends TokenInjectingUserContext {
CONNECTION_HOSTNAME_TOKEN); CONNECTION_HOSTNAME_TOKEN);
String username = parameters.get("username"); String username = parameters.get("username");
if (username != null) if (username != null && !username.isEmpty())
filter.setToken(CONNECTION_USERNAME_TOKEN, username); filter.setToken(CONNECTION_USERNAME_TOKEN, username);
else else
logger.debug("Username for connection \"{}\" (\"{}\") not " logger.debug("Username for connection \"{}\" (\"{}\") not "