[Security] Do not deauthenticate token on user change if not an AbstractToken #42776
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
511d604 to
fe31fcb
Compare
|
Hey! I think @dmaicher has recently worked with this code. Maybe they can help review this? Cheers! Carsonbot |
fabpot
approved these changes
Sep 1, 2021
|
Thank you @chalasr. |
|
Thanks for merging. Will run my test suite somewhen in the next days once I find time for it. I'm relatively confident that this is fixing the issue with 2fa-bundle on Symfony 5.4 👍 |
|
Confirmed. 2fa-bundle is all green on the latest 5.4.x-dev, both old security system and authenticator-based system 👍 |
|
That's great news! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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 #42050, we moved the
hasUserChanged()logic used for deauthentication from AbstractToken to ContextListener.Problem is that this check is now done against on all kind of tokens, whereas it was only for
AbstractTokeninstances before.That breaks https://github.com/scheb/2fa, tokens get wrongly deauthenticated in the middle of the 2fa auth process.
This fixes it by skipping non-AbstractToken implementations.
We may want to provide a way to opt-in/out the
hasUserChanged()logic on a custom token with e.g. a marker interface, but that's not necessarily worth it for now IMHO.