]> cat aescling's git repositories - mastodon.git/commit
Fix error when suspending user with an already-existing canonical email block (#17036)
authorClaire <claire.github-309c@sitedethib.com>
Wed, 24 Nov 2021 16:41:03 +0000 (17:41 +0100)
committerGitHub <noreply@github.com>
Wed, 24 Nov 2021 16:41:03 +0000 (17:41 +0100)
commit02a87431cf260e466ff58cc159b52cbce9aaef6b
treea67a63815f79aea7745ed759f8ba1a2915c622b8
parent9c44cf205f098ef499854bb52b698b594807b5c7
Fix error when suspending user with an already-existing canonical email block (#17036)

* Fix error when suspending user with an already-existing canonical email block

Fixes #17033

While attempting to create a `CanonicalEmailBlock` with an existing hash would
raise an `ActiveRecord::RecordNotUnique` error, this being done within a
transaction would cancel the whole transaction. For this reason, checking for
uniqueness in Rails would query the database within the transaction and avoid
invalidating the whole transaction for this reason.

A race condition is still possible, where multiple accounts sharing a canonical
email would be blocked in concurrent transactions, in which only one would
succeed, but that is way less likely to happen that the current issue, and can
always be retried after the first failure, unlike the current situation.

* Add tests
app/models/canonical_email_block.rb
spec/models/account_spec.rb