Add test for list containing null values

Signed-off-by: Craig Perkins <[email protected]>
cwperks · Feb 8, 2024 · 8141cd5 · 8141cd5
1 parent c19fe0c
commit 8141cd5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/java/org/opensearch/security/support/WildcardMatcher.java b/src/main/java/org/opensearch/security/support/WildcardMatcher.java
@@ -170,7 +170,9 @@ public static WildcardMatcher from(String pattern) {
     // This may in future use more optimized techniques to combine multiple WildcardMatchers in a single automaton
     public static <T> WildcardMatcher from(Stream<T> stream, boolean caseSensitive) {
         Collection<WildcardMatcher> matchers = stream.map(t -> {
-            if (t instanceof String) {
+            if (t == null) {
+                return NONE;
+            } else if (t instanceof String) {
                 return WildcardMatcher.from(((String) t), caseSensitive);
             } else if (t instanceof WildcardMatcher) {
                 return ((WildcardMatcher) t);

diff --git a/src/test/java/org/opensearch/security/UtilTests.java b/src/test/java/org/opensearch/security/UtilTests.java
@@ -71,6 +71,7 @@ public void testWildcardMatcherClasses() {
         assertTrue(wc("abc").test("abc"));
         assertFalse(wc("ABC").test("abc"));
         assertFalse(wc(null).test("abc"));
+        assertTrue(WildcardMatcher.from(null, "abc").test("abc"));
     }
 
     @Test