Fix handlng of concurrent inserts of the 2FA provider registry DAO#10943
Merged
MorrisJobke merged 1 commit intomasterfrom Aug 31, 2018
Merged
Fix handlng of concurrent inserts of the 2FA provider registry DAO#10943MorrisJobke merged 1 commit intomasterfrom
MorrisJobke merged 1 commit intomasterfrom
Conversation
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
MorrisJobke
approved these changes
Aug 31, 2018
Member
Author
Edit: to reproduce the issue with the old code, you actually have to set the break point at and insert the row at that point. |
rullzer
approved these changes
Aug 31, 2018
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.
This was discovered by Sentry once on my private instance and so far I have not been able to reproduce this. Still, the way I implemented this before is prone to concurrency issues.
The problem originates from
server/lib/private/Authentication/TwoFactorAuth/Manager.php
Line 160 in 2a22615
server/lib/private/Authentication/TwoFactorAuth/Manager.php
Lines 225 to 228 in 2a22615
I was unable to reproduce this with benchmarking tools and high numbers of concurrent requests, so I used the debugger to simulate it.
Steps to reproduce:
oc_twofactor_providerstable of your test userserver/lib/private/Authentication/TwoFactorAuth/Manager.php
Line 228 in 2a22615
Before this patch: 💥
With this patch: exception is caught and update is run instead.
cc @rullzer @MorrisJobke as discussed at the conf.