libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Fix Infinispan adapter not checking updated value in getAttribute methods

Browse source 
Closes #12819
This commit is contained in:
Michal Hajas 2022-11-04 18:33:59 +01:00 committed by Hynek Mlnařík
parent ec30c52a00
commit d9dcb6c60a
2 changed files with 75 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/GroupAdapter.java vendored
View file

@ -138,6 +138,7 @@ public class GroupAdapter implements GroupModel {
@Override
public Stream<String> getAttributeStream(String name) {
if (isUpdated()) return updated.getAttributeStream(name);
List<String> values = cached.getAttributes(modelSupplier).get(name);
if (values == null) return Stream.empty();
return values.stream();
@ -145,6 +146,7 @@ public class GroupAdapter implements GroupModel {
@Override
public Map<String, List<String>> getAttributes() {
if (isUpdated()) return updated.getAttributes();
return cached.getAttributes(modelSupplier);
}

73
testsuite/model/src/test/java/org/keycloak/testsuite/model/group/GroupModelTest.java Normal file
View file

@ -0,0 +1,73 @@
/*
* Copyright 2022 Red Hat, Inc. and/or its affiliates
* and other contributors as indicated by the @author tags.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.keycloak.testsuite.model.group;
import org.junit.Test;
import org.keycloak.models.Constants;
import org.keycloak.models.GroupModel;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.RealmModel;
import org.keycloak.testsuite.model.KeycloakModelTest;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.equalTo;
public class GroupModelTest extends KeycloakModelTest {
private String realmId;
private static final String OLD_VALUE = "oldValue";
private static final String NEW_VALUE = "newValue";
@Override
public void createEnvironment(KeycloakSession s) {
RealmModel realm = s.realms().createRealm("realm");
realm.setDefaultRole(s.roles().addRealmRole(realm, Constants.DEFAULT_ROLES_ROLE_PREFIX + "-" + realm.getName()));
this.realmId = realm.getId();
}
@Override
public void cleanEnvironment(KeycloakSession s) {
s.realms().removeRealm(realmId);
}
@Test
public void testGroupAttributesSetter() {
String groupId = withRealm(realmId, (session, realm) -> {
GroupModel groupModel = session.groups().createGroup(realm, "my-group");
groupModel.setSingleAttribute("key", OLD_VALUE);
return groupModel.getId();
});
withRealm(realmId, (session, realm) -> {
GroupModel groupModel = session.groups().getGroupById(realm, groupId);
assertThat(groupModel.getAttributes().get("key"), contains(OLD_VALUE));
// Change value to NEW_VALUE
groupModel.setSingleAttribute("key", NEW_VALUE);
// Check all getters return the new value
assertThat(groupModel.getAttributes().get("key"), contains(NEW_VALUE));
assertThat(groupModel.getFirstAttribute("key"), equalTo(NEW_VALUE));
assertThat(groupModel.getAttributeStream("key").findFirst().get(), equalTo(NEW_VALUE));
return null;
});
}
}