fix(organizations): Add select_for_update to prevent race condition in set_user_for_organization_member#108344
Merged
vgrozdanic merged 2 commits intomasterfrom Mar 17, 2026
Merged
Conversation
…n set_user_for_organization_member The org_member query inside the transaction.atomic() block was missing select_for_update(), allowing concurrent requests to read and overwrite each other's changes when setting a user on an organization member.
github-actions
bot
added
the
Scope: Backend
Contributor
|
This pull request has gone three weeks without activity. In another week, I will close it. But! If you comment or otherwise update it, I will reset the clock, and if you add the label "A weed is but an unloved flower." ― Ella Wheeler Wilcox 🥀 |
armenzg
approved these changes
Mar 17, 2026
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.
2 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
set_user_for_organization_member, theOrganizationMemberquery atline 309 fetches, mutates (
.set_user()), and saves within atransaction.atomic()block but withoutselect_for_update(). Thismeans concurrent requests can read the same row simultaneously and
overwrite each other's changes, causing a race condition.
Adding
select_for_update()ensures the row is locked for the durationof the transaction, so only one request can modify the member at a time.