Skip to content

[stable21] Remove 2FA exemption from PublicPage annotation #28741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LukasReschke merged 2 commits into from
Sep 7, 2021
Merged

[stable21] Remove 2FA exemption from PublicPage annotation #28741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2e4f34
Remove 2FA exemption from PublicPage annotation
LukasReschke Sep 6, 2021
694d103
Adjust tests
LukasReschke Sep 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions core/Middleware/TwoFactorMiddleware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')) {
Expand Down
27 changes: 0 additions & 27 deletions tests/Core/Middleware/TwoFactorMiddlewareTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand Down