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-641: Consider existing tokens when injecting tokens from vault.

Browse Source
This commit is contained in:
Michael Jumper
2022-01-21 15:23:41 -08:00
parent 7641fa9222
commit b655866057
4 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/guacamole-vault/modules/guacamole-vault-ksm/src/main/java/org/apache/guacamole/vault/ksm/secret/KsmSecretService.java
View File

@@ -31,6 +31,7 @@ import java.util.concurrent.Future;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.protocol.GuacamoleConfiguration;
import org.apache.guacamole.token.TokenFilter;
import org.apache.guacamole.vault.secret.VaultSecretService;
/**
@@ -71,14 +72,11 @@ public class KsmSecretService implements VaultSecretService {
}
@Override
public Map<String, Future<String>> getTokens(GuacamoleConfiguration config)
throws GuacamoleException {
public Map<String, Future<String>> getTokens(GuacamoleConfiguration config,
TokenFilter filter) throws GuacamoleException {
Map<String, Future<String>> tokens = new HashMap<>();
// TODO: Ensure tokens within parameters are evaluated when considering
// whether a KSM record matches (ie: "username" might be ${GUAC_USERNAME})
// TODO: Verify protocol before assuming meaning of "hostname"
// parameter
@@ -87,7 +85,7 @@ public class KsmSecretService implements VaultSecretService {
// Retrieve and define server-specific tokens, if any
String hostname = parameters.get("hostname");
if (hostname != null && !hostname.isEmpty()) {
KeeperRecord record = ksm.getRecordByHost(hostname);
KeeperRecord record = ksm.getRecordByHost(filter.filter(hostname));
if (record != null) {
// Username of server-related record