Skip to content

Commit 575e697

Browse files
authored
[Backport 2.19] Create a WildcardMatcher.NONE when creating a WildcardMatcher with an empty string (#5694) (#5715)
Signed-off-by: Craig Perkins <[email protected]>
1 parent db2dffb commit 575e697

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55

66
## [Unreleased 2.19.x]
77

8+
### Bug Fixes
9+
- Create a WildcardMatcher.NONE when creating a WildcardMatcher with an empty string ([#5694](https://github.com/opensearch-project/security/pull/5694))
10+
811
### Maintenance
912
- Bump `com.nimbusds:nimbus-jose-jwt:9.48` from 9.48 to 10.0.2 ([#5480](https://github.com/opensearch-project/security/pull/5480))
1013
- Bump `checkstyle` from 10.3.3 to 10.26.1 ([#5480](https://github.com/opensearch-project/security/pull/5480))

src/main/java/org/opensearch/security/support/WildcardMatcher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public String toString() {
132132
};
133133

134134
public static WildcardMatcher from(String pattern) {
135-
if (pattern == null) {
135+
if (pattern == null || pattern.isBlank()) {
136136
return NONE;
137137
} else if (pattern.equals("*")) {
138138
return ANY;

src/test/java/org/opensearch/security/UtilTests.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ public void testWildcardMatcherClasses() {
8181
assertTrue(wc("abc").test("abc"));
8282
assertFalse(wc("ABC").test("abc"));
8383
assertFalse(wc(null).test("abc"));
84+
assertFalse(wc("").test("abc"));
85+
// Creating a WildcardMatcher with blank should create a matcher that matches nothing
86+
assertFalse(wc("").test(""));
8487
assertTrue(WildcardMatcher.from(null, "abc").test("abc"));
8588
}
8689

0 commit comments

Comments
 (0)