Skip to content

Create a WildcardMatcher.NONE when creating a WildcardMatcher with an empty string #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Create a WildcardMatcher.NONE when creating a WildcardMatcher with an empty string #69

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
effb081
Create a WildcardMatcher.NONE when creating a WildcardMatcher with an…
cwperks Oct 8, 2025
292f9e1
Merge branch 'main' into wildcard-matcher-handle-blank
cwperks Oct 9, 2025
f7f3d49
Add to CHANGELOG
cwperks Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/opensearch/security/support/WildcardMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ public String toString() {
};

public static WildcardMatcher from(String pattern) {
if (pattern == null) {
if (pattern == null || pattern.isBlank()) {
Copy link

@kkhatua kkhatua Oct 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should you perform a trim() on the pattern as well ?

Copy link
Owner Author

@cwperks cwperks Oct 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

trim() isn't necessary since isBlank() will return true if the string is only whitespace: https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/String.html#isBlank()

return NONE;
} else if (pattern.equals("*")) {
return ANY;
Expand Down
3 changes: 3 additions & 0 deletions src/test/java/org/opensearch/security/UtilTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ public void testWildcardMatcherClasses() {
assertTrue(wc("abc").test("abc"));
assertFalse(wc("ABC").test("abc"));
assertFalse(wc(null).test("abc"));
assertFalse(wc("").test("abc"));
// Creating a WildcardMatcher with blank should create a matcher that matches nothing
assertFalse(wc("").test(""));
assertTrue(WildcardMatcher.from(null, "abc").test("abc"));
}

Expand Down
Loading