Review main Merged

92722[BUGFIX] Preserve route target when MFA intercepts a route request

Benjamin Franzke CR +2 V +2 Easy +6 −1 updated 09/07/26, 10:51

Commit message

…that is not the login route.

`RouteRedirect` has two factories:

 * `createFromRequest()` – intended to handle
   cases where `/typo3/login?redirect={routeTarget}`
   is used, that means the route redirect target is
   wrapped into the login route
 * `createFromRoute()` – intended to be used
   when /typo3/module/foobar is requested

Both cases can occur when user authentication gets intercepted because second factor authentication has not yet been performed.

Only the first was handled until now, because MFA *usually* intercepts
the login controller, but the second case happens when the second factor
step is aborted and restarted later on (e.g. 2FA tab was closed and the
target link was reopened again).

Review

  • Code review CR +2 Done
    • Benjamin Franzke +2
    • Stefan Bürk +1
    • Josua Vogel +1
    • Benjamin Kott +1
    • Benni Mack +1
  • Verified V +2 Done
    • Benjamin Franzke +2
    • Benjamin Kott +1
    • Benni Mack +1
    • core-ci +1 CI

Issues 1

Files 1

Review log 2739

Show 914 earlier messages
  1. Benjamin Franzke uploaded patch set 1 02/06/26, 15:25

  2. Benjamin Franzke rebased onto patch set 2 02/28/26, 10:24

  3. core-ci voted on patch set 2 V +1 02/28/26, 11:43 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/97018

  4. Benjamin Franzke uploaded patch set 3 V +1 03/03/26, 13:22

  5. Benjamin Franzke marked it ready for review 03/03/26, 13:23

  6. core-ci voted on patch set 3 V +1 03/03/26, 13:33 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/97179

  7. Benjamin Franzke wrote 03/03/26, 17:26

    Hashtag added: actions
  8. Benjamin Franzke rebased onto patch set 4 V +1 03/27/26, 20:14

  9. core-ci voted on patch set 4 V +1 03/27/26, 21:01 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/98916

  10. Hannes Lau voted on patch set 4 CR +1 03/30/26, 19:25

  11. Benni Mack updated the commit message in patch set 5 CR +1 V +1 04/22/26, 06:44

  12. core-ci voted on patch set 5 V +1 04/22/26, 11:33 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/100781

  13. Benjamin Franzke rebased onto patch set 6 V +1 06/30/26, 09:18

  14. core-ci voted on patch set 6 V -1 06/30/26, 09:28 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/104081

  1. Benjamin Franzke uploaded patch set 7 V -1 07/01/26, 14:39

  2. core-ci voted on patch set 7 V -1 07/01/26, 14:51 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/104154

  3. core-ci voted on patch set 7 V +1 07/02/26, 07:30 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/104154

  4. Benjamin Franzke uploaded patch set 8 V +1 07/20/26, 06:46

    Rebase
  5. Benjamin Franzke updated the commit message in patch set 9 07/20/26, 06:47

  6. core-ci voted on patch set 8 V +1 07/20/26, 06:55 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/105003

  7. core-ci voted on patch set 9 V +1 07/20/26, 06:57 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/105004

  8. Benjamin Franzke rebased onto patch set 10 V +1 08/27/26, 08:50

  9. core-ci voted on patch set 10 V +1 08/27/26, 09:00 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/107229

  10. Benjamin Franzke rebased onto patch set 11 V +1 08/31/26, 09:01

  11. core-ci voted on patch set 11 V +1 08/31/26, 09:08 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/107393

  12. Benni Mack voted on patch set 11 CR +1 09/01/26, 11:40

  13. Hannes Lau commented on patch set 11 09/01/26, 21:11

    There is a minor typo in the commit message.
    ```suggestion Both cases can occur when user authentication gets intercepted because second factor authentication has not yet been performed. ```
  14. Benni Mack commented on patch set 11 09/01/26, 21:14

    Reply

    Fix applied.
  15. Benni Mack updated the commit message in patch set 12 CR +1 V +1 09/01/26, 21:14

  16. Benni Mack commented on patch set 12 09/01/26, 21:14

    Reply

    Done
  17. core-ci voted on patch set 12 V +1 09/01/26, 21:23 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/107534

  18. Benni Mack voted on patch set 12 CR +1 09/02/26, 09:20

  19. Josua Vogel voted on patch set 12 CR +1 09/02/26, 12:48

  20. Stefan Bürk voted on patch set 12 CR +1 09/02/26, 12:52

  21. Benni Mack voted on patch set 12 V +1 09/02/26, 13:04

  22. Benjamin Franzke commented on patch set 12 09/02/26, 13:22

    FYI: I'm working on respective e2e tests in: > 95565: [WIP][TASK] Add MFA e2e tests | https://review.typo3.org/c/Packages/TYPO3.CMS/+/95565 They do not contain this case just yet (need to get MFA testing up and running at all), but it will be easy to add the reproduction steps listed in https://forge.typo3.org/issues/109133 later on.
  23. Benjamin Kott voted on patch set 12 CR +1 V +1 09/07/26, 10:26

  24. Benjamin Franzke voted on patch set 12 CR +2 V +2 09/07/26, 10:26

  25. Benjamin Franzke merged patch set 13 09/07/26, 10:51