This repository was archived by the owner on Sep 30, 2024. It is now read-only.
[Backport 5.4.5099] scim: Fix random suffix added to every user on resync#63131
Merged
[Backport 5.4.5099] scim: Fix random suffix added to every user on resync#63131
Conversation
In the current implementation, we check if there's a user in the database already, and if so we add a random suffix to increase the chances of the insert/update to succeed. However, we didn't check if the user that already exists is _the same user_. So for a first sync, usernames would look nice and tidy, but then on a second sync from the SCIM provider, every user would get a suffix. This PR fixes that by adding a check for the user ID. Test plan: Added tests, verified SCIM sync doesn't modify usernames anymore locally. (cherry picked from commit 614375e)
sourcegraph-release-bot
requested review from
a team,
DaedalusG and
eseliger
and removed request for
a team
sourcegraph-release-bot
added
cla-signed
backports
team/source
eseliger
approved these changes
Jun 6, 2024
DaedalusG
approved these changes
Jun 6, 2024
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
In the current implementation, we check if there's a user in the database already, and if so we add a random suffix to increase the chances of the insert/update to succeed.
However, we didn't check if the user that already exists is the same user. So for a first sync, usernames would look nice and tidy, but then on a second sync from the SCIM provider, every user would get a suffix.
This PR fixes that by adding a check for the user ID.
Test plan:
Added tests, verified SCIM sync doesn't modify usernames anymore locally.
Backport 614375e from #63122