Skip to content

Fix ArrayIndexOutOfBoundsException in SearchQueryUtils.getFields() #51543

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

Merged
pedroigor merged 2 commits into from
Aug 10, 2026
+30 −0
Merged

Fix ArrayIndexOutOfBoundsException in SearchQueryUtils.getFields() #51543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
295b78e
Reject unterminated escape sequences in SearchQueryUtils.getFields()
Pons3006 Aug 7, 2026
17a875b
Add test coverage for search query escape handling edge cases
sguilhen Aug 7, 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
23 changes: 23 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,26 @@ public void testGetFields() {

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

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

// double-backslash at value boundary - i+=2 lands exactly at array end
testParseQuery("key:val\\\\",
"key", "val");
testParseQuery("key:\\\\",
"key", "");

// malformed inputs that don't crash but produce no key-value pairs
testParseQuery("\"key \\\"1\\\"");
testParseQuery("\"key \\\"");
testParseQuery("key \"");
}

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

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