From d0043e34ddaf7510d88267fb4190a0672b104e3a Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Fri, 21 Jan 2022 15:23:41 -0800 Subject: [PATCH] GUACAMOLE-641: Allow token mapping file to not exist. Some tokens may be standardized or specific to the implementation, and may not need to be defined in YAML. --- .../apache/guacamole/vault/conf/VaultConfigurationService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/extensions/guacamole-vault/modules/guacamole-vault-base/src/main/java/org/apache/guacamole/vault/conf/VaultConfigurationService.java b/extensions/guacamole-vault/modules/guacamole-vault-base/src/main/java/org/apache/guacamole/vault/conf/VaultConfigurationService.java index b398c4919..25d1b9326 100644 --- a/extensions/guacamole-vault/modules/guacamole-vault-base/src/main/java/org/apache/guacamole/vault/conf/VaultConfigurationService.java +++ b/extensions/guacamole-vault/modules/guacamole-vault-base/src/main/java/org/apache/guacamole/vault/conf/VaultConfigurationService.java @@ -25,6 +25,7 @@ import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import com.google.inject.Inject; import java.io.File; import java.io.IOException; +import java.util.Collections; import java.util.Map; import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.GuacamoleServerException; @@ -91,6 +92,8 @@ public abstract class VaultConfigurationService { // Get configuration file from GUACAMOLE_HOME File confFile = new File(environment.getGuacamoleHome(), tokenMappingFilename); + if (!confFile.exists()) + return Collections.emptyMap(); // Deserialize token mapping from YAML try {