[stable17] Handle token insert conflicts #18189
Merged
Conversation
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
Env-based SAML uses the "Apache auth" mechanism to log users in. In this code path, we first delete all existin auth tokens from the database, before a new one is inserted. This is problematic for concurrent requests as they might reach the same code at the same time, hence both trying to insert a new row wit the same token (the session ID). This also bubbles up and disables user_saml. As the token might still be OK (both request will insert the same data), we can actually just check if the UIDs of the conflict row is the same as the one we want to insert right now. In that case let's just use the existing entry and carry on. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
ChristophWurst
added
bug
3. to review
ChristophWurst
changed the title
rullzer
approved these changes
Dec 2, 2019
gary-kim
approved these changes
Dec 2, 2019
gary-kim
added
4. to release
|
/backport to stable16 |
|
/backport to stable15 |
|
/backport to stable16 |
This was referenced Dec 10, 2019
Merged
|
/backport to stable16 |
|
/backport to stable15 |
|
Ah well, we should not need 15 as this is EOL |
|
The backport to stable16 failed. Please do this backport manually. |
|
The backport to stable15 failed. Please do this backport manually. |
|
Care to manually backport to stable16 @rullzer :) |
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.
Backport of #17939