From 486fe6f42a171a92f548b7429da5cbf33f2d4a0b Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Thu, 13 Apr 2023 13:38:53 -0700
Subject: [PATCH] GUACAMOLE-1769: Handle case that KSM's getCustom() returns
 null.

---
 .../guacamole/vault/ksm/secret/KsmRecordService.java      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/extensions/guacamole-vault/modules/guacamole-vault-ksm/src/main/java/org/apache/guacamole/vault/ksm/secret/KsmRecordService.java b/extensions/guacamole-vault/modules/guacamole-vault-ksm/src/main/java/org/apache/guacamole/vault/ksm/secret/KsmRecordService.java
index d67b5816a..70e500e2e 100644
--- a/extensions/guacamole-vault/modules/guacamole-vault-ksm/src/main/java/org/apache/guacamole/vault/ksm/secret/KsmRecordService.java
+++ b/extensions/guacamole-vault/modules/guacamole-vault-ksm/src/main/java/org/apache/guacamole/vault/ksm/secret/KsmRecordService.java
@@ -212,7 +212,9 @@ public class KsmRecordService {
      *     The type of field to return.
      *
      * @param fields
-     *     The list of fields to retrieve the field from.
+     *     The list of fields to retrieve the field from. For convenience, this
+     *     may be null. A null list will be considered equivalent to an empty
+     *     list.
      *
      * @param fieldClass
      *     The class representing the type of field to return.
@@ -229,6 +231,10 @@ public class KsmRecordService {
     private <T extends KeeperRecordField> T getField(List<KeeperRecordField> fields,
             Class<T> fieldClass, Pattern labelPattern) {
 
+        // There are no fields if no List was provided at all
+        if (fields == null)
+            return null;
+
         T foundField = null;
         for (KeeperRecordField field : fields) {