From b8d2a9edc19ca495576b44802eb61e617824df32 Mon Sep 17 00:00:00 2001 From: James Muehlner Date: Thu, 29 Sep 2022 03:12:13 +0000 Subject: [PATCH] GUACAMOLE-1656: Check if user KSM config is null before constructing a client. --- .../org/apache/guacamole/vault/ksm/secret/KsmSecretService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 515c1fc3d..f4d3c0626 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 @@ -163,7 +163,7 @@ public class KsmSecretService implements VaultSecretService { // If the user config happens to be the same as admin-defined one, // don't bother trying again - if (!Objects.equal(userKsmConfig, ksmConfig)) + if (userKsmConfig != null && !Objects.equal(userKsmConfig, ksmConfig)) return getClient(userKsmConfig).getSecret(name); return CompletableFuture.completedFuture(null);