[6.x] Fix enforced two factor setup elevation - #15329
Merged
Merged
Conversation
jasonvarga
requested changes
Sep 22, 2026
jasonvarga
left a comment
jasonvarga
left a comment
Member
There was a problem hiding this comment.
The fix itself is right, and I traced the whole flow — requireElevatedSession() → GET /cp/elevated-session → the appended modal → POST /cp/elevated-session → POST /cp/two-factor/enable — and it works end to end. The two new tests are genuine guards too: with two_factor_enforced_roles => ['*'] and a user that fails hasEnabledTwoFactorAuthentication(), both would 302 rather than 200 without the route change.
One thing to change before this goes in — the middleware exemption is wider than the fix needs. Details inline.
Only the JSON elevation endpoints need to skip `RedirectIfTwoFactorSetupIncomplete`. The confirm password page renders the full control panel layout, so exempting it let users with incomplete enforced two factor setup see the nav. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
jasonvarga
enabled auto-merge (squash)
September 22, 2026 15:16
jasonvarga
approved these changes
Sep 22, 2026
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 users with enforced two-factor authentication cannot start setup when their session is not elevated.
This was happening because the enforced-setup middleware redirected the elevation endpoints, and the outside layout did not render the elevation dialog.
This PR fixes it by allowing the elevation flow during setup, rendering its dialog, surfacing setup errors, and allowing admins to clear incomplete setup.
Fixes #15216