Fix race condition vulnerability, by ensuring the unconfirmed_email is always saved#5784
Merged
carlosantoniodasilva merged 5 commits intoheartcombo:mainfrom Mar 16, 2026
Conversation
runephilosof-abtion
left a comment
runephilosof-abtion
left a comment
There was a problem hiding this comment.
Another way to solve this, would be to use transactions and locking for update.
However, that might be a problem for some database backends?
Anyway, transactions have not been used anywhere else in Devise and the approach in this PR works.
grantcox
force-pushed
the
email-confirmation-race-condition-vulnfix
branch
from
cfa56a4 to
502ed42
Compare
Contributor
Author
|
Thank you for the feedback @runephilosof-abtion , your changes were very helpful and I've merged them all now |
…s always saved even if the submitted value is the same as the in-memory model's state
Co-authored-by: Rune Philosof <57357936+runephilosof-abtion@users.noreply.github.com>
grantcox
force-pushed
the
email-confirmation-race-condition-vulnfix
branch
from
502ed42 to
f12a6c3
Compare
It appears Mongoid differs from AR in that even if you're calling `will_change!` on an attribute to "force" it to see (and persist) changes, and it gets set to `changed_attributes` so it knows it's technically "changed", the model's `changes` which are based on `attribute_changed?` don't include the field because it didn't actually "change" from its original value, so it doesn't get persisted by Mongoid. This was causing the new test for the confirmable race condition issue to fail, because `will_change!` wasn't forcing the "change" to be persisted in Mongoid. This is a workaround for it, by setting `changed_attributes` directly to `nil` (could be any value like `__devise-force-change__`) it makes Mongoid see the changes and persist them.
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
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.
Fixes #5783