Skip to content

Fix ArrayIndexOutOfBoundsException in SearchQueryUtils.getFields() #50409

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

Closed
Pons3006 wants to merge 9 commits into from
+18 −0
Closed

Fix ArrayIndexOutOfBoundsException in SearchQueryUtils.getFields() #50409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1c33185
Fix ArrayIndexOutOfBoundsException in SearchQueryUtils.getFields() on…
Pons3006 Jun 29, 2026
beac954
Added more test coverage - Issue #50228
Pons3006 Jun 29, 2026
dc89ce1
Merge branch 'main' into issue-50228
Pons3006 Jun 29, 2026
794b4c8
Reject unterminated escape sequences in search queries - Issue #50228
Pons3006 Jul 2, 2026
ca3c42f
Merge branch 'main' into issue-50228
Pons3006 Jul 2, 2026
7e39973
Applied spotless for import ordering - Issue #50228
Pons3006 Jul 2, 2026
2388566
Merge branch 'main' into issue-50228
Pons3006 Jul 2, 2026
4e9b449
Merge branch 'main' into issue-50228
Pons3006 Jul 2, 2026
120aa76
Merge branch 'main' into issue-50228
Pons3006 Jul 5, 2026
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
7 changes: 7 additions & 0 deletions services/src/main/java/org/keycloak/utils/SearchQueryUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.Map;
import java.util.regex.Pattern;

import org.keycloak.models.ModelValidationException;
import org.keycloak.models.RealmModel;
import org.keycloak.models.UserModel;
import org.keycloak.models.UserProvider;
Expand Down Expand Up @@ -87,6 +88,9 @@ public static Map<String, String> getFields(final String query) {
String name = "";
while (i < chars.length && chars[i] != ':') {
if (chars[i] == '\\') {
if (i + 1 >= chars.length) {
throw new ModelValidationException("Invalid search query: unterminated escape sequence");
}
if (chars[i+1] == '\"') {
i++;
}
Expand Down Expand Up @@ -123,6 +127,9 @@ else if(chars[i] == ' ' && !inQuotes) {
String value = "";
while (i < chars.length) {
if (chars[i] == '\\') {
if (i + 1 >= chars.length) {
throw new ModelValidationException("Invalid search query: unterminated escape sequence");
}
if (chars[i+1] == '\"') {
i++;
}
Expand Down
11 changes: 11 additions & 0 deletions services/src/test/java/org/keycloak/utils/SearchQueryUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,12 @@
import java.util.HashMap;
import java.util.Map;

import org.keycloak.models.ModelValidationException;

import org.junit.Test;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThrows;

/**
* @author Vaclav Muzikar <vmuzikar@redhat.com>
Expand Down Expand Up @@ -61,6 +64,14 @@ public void testGetFields() {

testParseQuery("k:val1",
"k", "val1");

assertInvalidQuery("key:val\\");
assertInvalidQuery("key\\");
assertInvalidQuery("key:\"val\\");

@sguilhen sguilhen Jul 17, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The original issue lists additional malformed inputs beyond trailing backslashes: "key \", key ", "key \"1\"". It would be good to add test cases for these as well to confirm they're handled gracefully (some may already work via the existing loop bounds, but explicit coverage prevents future fixes on this).

}

private void assertInvalidQuery(String query) {
assertThrows(ModelValidationException.class, () -> SearchQueryUtils.getFields(query));
}

private void testParseQuery(String query, String... expectedStr) {
Expand Down
Loading