Repository navigation
Cleanup orphaned broker links when duplicate federated identities found - #45124
Open
Rathan-Naik wants to merge 1 commit into
Open
Rathan-Naik wants to merge 1 commit into
Rathan-Naik wants to merge 1 commit into
Conversation
Rathan-Naik
marked this pull request as ready for review
January 4, 2026 20:04
vramik
approved these changes
Jan 5, 2026
Contributor
There was a problem hiding this comment.
@Rathan-Naik thank you for preparing the PR. LGTM.
@pedroigor since you're more familiar with the context, can you please also take a look?
Rathan-Naik
force-pushed
the
feature/cleanup-orphaned-broker-links
branch
from
January 8, 2026 04:04
7674b9f to
cc50c0f
Compare
When a federated user (e.g., from LDAP) is deleted from the external source, the broker link record in Keycloak is not cleaned up. If a new user with the same IdP mapping logs in later, a second broker link is created. On subsequent logins, the query returns multiple results and throws IllegalStateException. This fix: - In JpaUserFederatedStorageProvider: resolves multiple BrokerLinkEntity records by checking if each user still exists, removing orphaned links - In JpaUserProvider: resolves multiple FederatedIdentityEntity records by checking if federated users still exist, removing orphaned identities Closes keycloak#44933 Signed-off-by: Rathan Naik <30756840+Rathan-Naik@users.noreply.github.com>
Rathan-Naik
force-pushed
the
feature/cleanup-orphaned-broker-links
branch
from
January 15, 2026 06:40
4dd7c40 to
4c1244c
Compare
Member
|
@Rathan-Naik - Please avoid merging the main branch into the PR or rebasing the PR unless there are merge conflicts reported by GitHub or a reviewer asks you for a rebase. This prevents spamming reviewers with notifications and saves minutes on the GitHub actions CI. Thanks! |
Contributor
Author
Noted. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When a federated user (e.g., from LDAP) is deleted from the external source, the broker link record in Keycloak is not cleaned up. If a new user with the same IdP mapping logs in later, a second broker link is created. On subsequent logins, the query returns multiple results and throws IllegalStateException.
This fix:
In both JpaUserFederatedStorageProvider and JpaUserProvider, when multiple results are found:
This approach cleans up stale data automatically while preserving the error for genuine duplicate scenarios.
Closes #44933