From 492dbf48d609a7ff270d33a196a07fa2e3af0406 Mon Sep 17 00:00:00 2001 From: James Muehlner Date: Thu, 21 Jul 2022 23:25:25 +0000 Subject: [PATCH] GUACAMOLE-1643: Ensure connection groups with an empty KSM config attribute fall back to the global config. --- .../apache/guacamole/vault/ksm/secret/KsmSecretService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/extensions/guacamole-vault/modules/guacamole-vault-ksm/src/main/java/org/apache/guacamole/vault/ksm/secret/KsmSecretService.java b/extensions/guacamole-vault/modules/guacamole-vault-ksm/src/main/java/org/apache/guacamole/vault/ksm/secret/KsmSecretService.java index 2436a4e62..3d0d65bd4 100644 --- a/extensions/guacamole-vault/modules/guacamole-vault-ksm/src/main/java/org/apache/guacamole/vault/ksm/secret/KsmSecretService.java +++ b/extensions/guacamole-vault/modules/guacamole-vault-ksm/src/main/java/org/apache/guacamole/vault/ksm/secret/KsmSecretService.java @@ -276,9 +276,10 @@ public class KsmSecretService implements VaultSecretService { if (group == null) break; - // If the current connection group has the KSM configuration attribute, return immediately + // If the current connection group has the KSM configuration attribute + // set to a non-empty value, return immediately String ksmConfig = group.getAttributes().get(KsmAttributeService.KSM_CONFIGURATION_ATTRIBUTE); - if (ksmConfig != null) + if (ksmConfig != null && !ksmConfig.trim().isEmpty()) return ksmConfig; // Otherwise, keep searching up the tree until an appropriate configuration is found @@ -287,6 +288,7 @@ public class KsmSecretService implements VaultSecretService { // If no KSM configuration was ever found, use the default value return confService.getKsmConfig(); + } @Override