[6.x] Skip two factor setup enforcement while impersonating - #15247
Merged
Conversation
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01WfgWVorn6h1mPSwgGKVb7Q
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_019fa8J46Th4Q3aRPWs51kPt
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_019fa8J46Th4Q3aRPWs51kPt
The setup route is registered without the RedirectIfTwoFactorSetupIncomplete middleware, so an impersonator could still reach it by navigating there directly. Setup.vue posts to the enable endpoint on mount, which persists a secret and recovery codes onto the impersonated user's record. Guarding the base controller covers both the CP and frontend routes, since the CP subclass only overrides redirectPath() and routes(). Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
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
2 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.
This pull request fixes an issue where impersonating a user who hasn't set up two factor authentication (when it's enforced for their role) would redirect the impersonator to that user's 2FA setup screen, persisting a
two_factor_secretandtwo_factor_recovery_codesonto the impersonated user's record in the process. Abandoning the setup didn't roll this back, and the impersonator could even complete the enrollment on the user's behalf.This was happening because the
RedirectIfTwoFactorSetupIncompletemiddleware generates and saves a secret as a side effect of redirecting to the setup screen, and it didn't account for impersonation. Impersonation already bypasses the 2FA challenge, but not setup enforcement, which was inconsistent.This PR fixes it by skipping the setup enforcement while impersonating, so the impersonator is never sent to the setup screen and nothing is written to the impersonated user's record. Enforcement kicks in as normal when the user next logs in themselves.
Fixes #15231