Skip to content

Fix addManagedMember adding user as unmanaged when user is cache-wrapped #51161

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

Open
simonbleher wants to merge 1 commit into
base: main
Choose a base branch
from
+34 −0
Open

Fix addManagedMember adding user as unmanaged when user is cache-wrapped #51161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 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 @@ -35,6 +35,7 @@
import org.keycloak.models.GroupModel;
import org.keycloak.models.GroupModel.Type;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.MembershipMetadata;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RoleModel;
import org.keycloak.models.SubjectCredentialManager;
Expand Down Expand Up @@ -504,6 +505,17 @@ public void joinGroup(GroupModel group) {

}

@Override
public void joinGroup(GroupModel group, MembershipMetadata metadata) {
// Only REALM groups are cached; organization groups always delegate to persistence
if (group.getType() == Type.REALM && updated == null && cached.getGroups(keycloakSession, modelSupplier).contains(group.getId())) {
return;
}
getDelegateForUpdate();
updated.joinGroup(group, metadata);

}

@Override
public void leaveGroup(GroupModel group) {
// Only REALM groups are cached; organization groups always delegate to persistence
Expand Down
22 changes: 22 additions & 0 deletions tests/base/src/test/java/org/keycloak/tests/organization/cache/OrganizationCacheTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,28 @@ public void testGetByDomain() {
});
}

@Test
public void testAddManagedMemberWithCachedUser() {
runOnServer.run(session -> {
RealmModel realm = session.getContext().getRealm();
UserModel member = session.users().addUser(realm, "member");
member.setEnabled(true);
});
runOnServer.run(session -> {
OrganizationProvider orgProvider = session.getProvider(OrganizationProvider.class);
OrganizationModel orga = orgProvider.getByDomainName("orga.org");
RealmModel realm = session.getContext().getRealm();
// Fetch through the standard cached user provider, as any real caller (e.g. a
// custom AdminRealmResourceProvider, or the registration/broker flows that call
// addManagedMember) would - this returns the infinispan cache-wrapped UserAdapter.
UserModel member = session.users().getUserByUsername(realm, "member");
boolean added = orgProvider.addManagedMember(orga, member);
assertTrue(added);
assertTrue(orgProvider.isManagedMember(orga, member),
"user added via addManagedMember must be reported as a MANAGED member");
});
}

@Test
public void testGetByMember() {
runOnServer.run(session -> {
Expand Down