Merge pull request #28742 from nextcloud/backport/28725/stable20

[stable20] Remove 2FA exemption from PublicPage annotation

Author: LukasReschke

core/Middleware/TwoFactorMiddleware.php

@@ -83,11 +83,6 @@ public function __construct(Manager $twoFactorManager, Session $userSession, ISe
 	 * @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')) {

tests/Core/Middleware/TwoFactorMiddlewareTest.php

@@ -97,10 +97,6 @@ protected function setUp(): void {
 	}
 
 	public function testBeforeControllerNotLoggedIn() {
-		$this->reflector->expects($this->once())
-			->method('hasAnnotation')
-			->with('PublicPage')
-			->willReturn(false);
 		$this->userSession->expects($this->once())
 			->method('isLoggedIn')
 			->willReturn(false);
@@ -111,24 +107,9 @@ public function testBeforeControllerNotLoggedIn() {
 		$this->middleware->beforeController($this->controller, 'index');
 	}
 
-	public function testBeforeControllerPublicPage() {
-		$this->reflector->expects($this->once())
-			->method('hasAnnotation')
-			->with('PublicPage')
-			->willReturn(true);
-		$this->userSession->expects($this->never())
-			->method('isLoggedIn');
-
-		$this->middleware->beforeController($this->controller, 'create');
-	}
-
 	public function testBeforeSetupController() {
 		$user = $this->createMock(IUser::class);
 		$controller = $this->createMock(ALoginSetupController::class);
-		$this->reflector->expects($this->once())
-			->method('hasAnnotation')
-			->with('PublicPage')
-			->willReturn(false);
 		$this->userSession->expects($this->any())
 			->method('getUser')
 			->willReturn($user);
@@ -144,10 +125,6 @@ public function testBeforeSetupController() {
 	public function testBeforeControllerNoTwoFactorCheckNeeded() {
 		$user = $this->createMock(IUser::class);
 
-		$this->reflector->expects($this->once())
-			->method('hasAnnotation')
-			->with('PublicPage')
-			->willReturn(false);
 		$this->userSession->expects($this->once())
 			->method('isLoggedIn')
 			->willReturn(true);
@@ -168,10 +145,6 @@ public function testBeforeControllerTwoFactorAuthRequired() {
 
 		$user = $this->createMock(IUser::class);
 
-		$this->reflector->expects($this->once())
-			->method('hasAnnotation')
-			->with('PublicPage')
-			->willReturn(false);
 		$this->userSession->expects($this->once())
 			->method('isLoggedIn')
 			->willReturn(true);