Skip to content

fix: correctly handle duplicate values in setAttribute() #48384

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
ahus1 merged 2 commits into from
Apr 23, 2026
+56 −20
Merged

fix: correctly handle duplicate values in setAttribute() #48384

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
c8545a8
fix: correctly handle duplicate values in setAttribute() (#38526)
dasniko Apr 22, 2026
f937a0c
Review
ahus1 Apr 23, 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
13 changes: 4 additions & 9 deletions model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/UserAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,8 @@ public void setSingleAttribute(String name, String value) {
value = KeycloakModelUtils.toLowerCaseSafe(value);
}
if (updated == null) {
Set<String> oldEntries = getAttributeStream(name).collect(Collectors.toSet());
Set<String> newEntries = value != null ? Set.of(value) : Collections.emptySet();
List<String> oldEntries = getAttributeStream(name).sorted().collect(Collectors.toList());
List<String> newEntries = value == null ? List.of() : List.of(value);
if (CollectionUtil.collectionEquals(oldEntries, newEntries)) {
return;
}
Expand All @@ -215,13 +215,8 @@ public void setAttribute(String name, List<String> values) {
if (lowerCasedFirstValue != null) values = Collections.singletonList(lowerCasedFirstValue);
}
if (updated == null) {
Set<String> oldEntries = getAttributeStream(name).collect(Collectors.toSet());
Set<String> newEntries;
if (values == null) {
newEntries = new HashSet<>();
} else {
newEntries = new HashSet<>(values);
}
List<String> oldEntries = getAttributeStream(name).sorted().collect(Collectors.toList());
List<String> newEntries = values == null ? List.of() : values.stream().sorted().toList();
if (CollectionUtil.collectionEquals(oldEntries, newEntries)) {
return;
}
Expand Down
15 changes: 4 additions & 11 deletions model/jpa/src/main/java/org/keycloak/models/jpa/UserAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@
package org.keycloak.models.jpa;

import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;

Expand Down Expand Up @@ -154,8 +152,8 @@ public void setSingleAttribute(String name, String value) {
if (value == null) {
removeAttribute(name);
} else {
Set<String> oldEntries = getAttributeStream(name).collect(Collectors.toSet());
Set<String> newEntries = Set.of(value);
List<String> oldEntries = getAttributeStream(name).sorted().collect(Collectors.toList());
List<String> newEntries = List.of(value);
if (CollectionUtil.collectionEquals(oldEntries, newEntries)) {
return;
}
Expand Down Expand Up @@ -205,13 +203,8 @@ public void setAttribute(String name, List<String> values) {
return;
}

Set<String> oldEntries = getAttributeStream(name).collect(Collectors.toSet());
Set<String> newEntries;
if (values == null) {
newEntries = new HashSet<>();
} else {
newEntries = new HashSet<>(values);
}
List<String> oldEntries = getAttributeStream(name).sorted().collect(Collectors.toList());
List<String> newEntries = values == null ? List.of() : values.stream().sorted().toList();
if (CollectionUtil.collectionEquals(oldEntries, newEntries)) {
return;
}
Expand Down
48 changes: 48 additions & 0 deletions tests/base/src/test/java/org/keycloak/tests/model/UserModelTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,54 @@ public void testUpdateUserSingleAttribute(KeycloakSession session) {
});
}

@TestOnServer
public void testUpdateUserAttributeMultipleSameValues(KeycloakSession session) {
String key = "foo";

// Testing "setAttribute"
KeycloakModelUtils.runJobInTransaction(session.getKeycloakSessionFactory(), session.getContext(), (KeycloakSession currentSession) -> {
RealmModel realm = currentSession.realms().getRealmByName("original");
UserModel user = currentSession.users().addUser(realm, "user");

user.setAttribute(key, List.of("bar", "bar"));

List<String> expected = List.of("bar", "bar");
assertThat(user.getAttributes().get(key), equalTo(expected));
});

KeycloakModelUtils.runJobInTransaction(session.getKeycloakSessionFactory(), session.getContext(), (KeycloakSession currentSession) -> {
RealmModel realm = currentSession.realms().getRealmByName("original");
UserModel user = currentSession.users().getUserByUsername(realm, "user");

user.setAttribute(key, List.of("bar"));

List<String> expected = List.of("bar");
assertThat(user.getAttributes().get(key), equalTo(expected));
});

// Testing "setSingleAttribute"
KeycloakModelUtils.runJobInTransaction(session.getKeycloakSessionFactory(), session.getContext(), (KeycloakSession currentSession) -> {
RealmModel realm = currentSession.realms().getRealmByName("original");
UserModel user = currentSession.users().getUserByUsername(realm, "user");

user.setAttribute(key, List.of("bar", "bar"));

List<String> expected = List.of("bar", "bar");
assertThat(user.getAttributes().get(key), equalTo(expected));
});

KeycloakModelUtils.runJobInTransaction(session.getKeycloakSessionFactory(), session.getContext(), (KeycloakSession currentSession) -> {
RealmModel realm = currentSession.realms().getRealmByName("original");
UserModel user = currentSession.users().getUserByUsername(realm, "user");

user.setSingleAttribute(key, "bar");

List<String> expected = List.of("bar");
assertThat(user.getAttributes().get(key), equalTo(expected));
});

}

@TestOnServer
public void testSearchByString(KeycloakSession session) {

Expand Down
Loading