From 7c1038bfb390c150f08937f62ff9a5c43bf9ebde Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 6 Sep 2021 08:30:27 +0000
Subject: [PATCH] Remove 2FA exemption from PublicPage annotation

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
---
 core/Middleware/TwoFactorMiddleware.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/core/Middleware/TwoFactorMiddleware.php b/core/Middleware/TwoFactorMiddleware.php
index 398234fa1e4..2ddfcafa027 100644
--- a/core/Middleware/TwoFactorMiddleware.php
+++ b/core/Middleware/TwoFactorMiddleware.php
@@ -82,11 +82,6 @@ class TwoFactorMiddleware extends Middleware {
 	 * @param string $methodName
 	 */
 	public function beforeController($controller, $methodName) {
-		if ($this->reflector->hasAnnotation('PublicPage')) {
-			// Don't block public pages
-			return;
-		}
-
 		if ($controller instanceof TwoFactorChallengeController
 			&& $this->userSession->getUser() !== null
 			&& !$this->reflector->hasAnnotation('TwoFactorSetUpDoneRequired')) {