fix: handle race condition on addUser#3952
Merged
strehle merged 3 commits intoJun 18, 2026
Merged
Conversation
fhanik
previously approved these changes
Jun 18, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
This PR addresses a race condition during SCIM user bootstrap when a NewUserAuthenticatedEvent triggers user creation and a concurrent request inserts the same user first, by reconciling and optionally updating the existing user (based on the override flag).
Changes:
- Catch
ScimResourceAlreadyExistsExceptionduring user creation and reconcile by re-querying the concurrently-created user. - Refactor existing-user handling into a helper (
handleRegisteringExistingUser) for reuse across normal and concurrent paths. - Add unit tests covering concurrent insert behavior for both
override=trueandoverride=false.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
server/src/main/java/org/cloudfoundry/identity/uaa/scim/bootstrap/ScimUserBootstrap.java |
Adds concurrent-create reconciliation logic and refactors existing-user handling; adjusts method visibility to enable test spying. |
server/src/test/java/org/cloudfoundry/identity/uaa/scim/bootstrap/ScimUserBootstrapTests.java |
Adds tests that simulate concurrent insert behavior and verify update vs no-update based on override. |
cf-foundation-community-automation
Bot
moved this to Inbox
in Foundational Infrastructure Working Group
github-project-automation
Bot
moved this from Inbox
to Pending Merge | Prioritized
in Foundational Infrastructure Working Group
strehle
approved these changes
Jun 18, 2026
github-project-automation
Bot
moved this from Pending Merge | Prioritized
to Done
in Foundational Infrastructure Working Group
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.
No description provided.