External-Mirrors/keycloak
2
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-01-09 23:12:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

Exact searches should be the default when querying user by attributes (#35869)

Browse Source 
Closes #35822

Signed-off-by: Pedro Igor <pigor.craveiro@gmail.com>
This commit is contained in:
Pedro Igor 2024-12-13 04:45:38 -03:00 committed by GitHub
parent 5061ca4a99
commit 125f66e7d0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserProvider.java
View File

@ -1012,7 +1012,7 @@ public class JpaUserProvider implements UserProvider, UserCredentialStore {
builder.equal(attributesJoin.get("name"), key), builder.equal(attributesJoin.get("name"), key),
builder.equal(attributesJoin.get("longValueHashLowerCase"), JpaHashUtils.hashForAttributeValueLowerCase(value)))); builder.equal(attributesJoin.get("longValueHashLowerCase"), JpaHashUtils.hashForAttributeValueLowerCase(value))));
} else { } else {
if (Boolean.parseBoolean(attributes.get(UserModel.EXACT))) { if (Boolean.parseBoolean(attributes.getOrDefault(UserModel.EXACT, Boolean.TRUE.toString()))) {
attributePredicates.add(builder.and( attributePredicates.add(builder.and(
builder.equal(attributesJoin.get("name"), key), builder.equal(attributesJoin.get("name"), key),
builder.equal(builder.lower(attributesJoin.get("value")), value.toLowerCase()))); builder.equal(builder.lower(attributesJoin.get("value")), value.toLowerCase())));

6
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserTest.java
View File

@ -916,8 +916,12 @@ public class UserTest extends AbstractAdminTest {
List<UserRepresentation> users = realm.users().searchByAttributes(mapToSearchQuery(Map.of("username", "user", "test", "test1", "attr", "common", "test1", "test1"))); List<UserRepresentation> users = realm.users().searchByAttributes(mapToSearchQuery(Map.of("username", "user", "test", "test1", "attr", "common", "test1", "test1")));
assertThat(users, hasSize(1)); assertThat(users, hasSize(1));
//custom user attribute should use wildcard search by default //custom user attribute should not use wildcard search by default
users = realm.users().searchByAttributes(mapToSearchQuery(Map.of("username", "user", "test", "est", "attr", "mm", "test1", "test1"))); users = realm.users().searchByAttributes(mapToSearchQuery(Map.of("username", "user", "test", "est", "attr", "mm", "test1", "test1")));
assertThat(users, hasSize(0));
//custom user attribute should use wildcard
users = realm.users().searchByAttributes(mapToSearchQuery(Map.of("username", "user", "test", "est", "attr", "mm", "test1", "test1")), false);
assertThat(users, hasSize(1)); assertThat(users, hasSize(1));
//with exact=true the user shouldn't be returned //with exact=true the user shouldn't be returned