upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 08:44:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge pull request #28741 from nextcloud/backport/28725/stable21

Browse source 
[stable21] Remove 2FA exemption from PublicPage annotation
This commit is contained in:
Lukas Reschke 2021-09-07 12:47:03 +02:00 committed by GitHub
commit 9ee93ed0bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/Middleware/TwoFactorMiddleware.php
View file

@ -83,11 +83,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')) {

27
tests/Core/Middleware/TwoFactorMiddlewareTest.php
View file

@ -97,10 +97,6 @@ class TwoFactorMiddlewareTest extends TestCase {
}
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 @@ class TwoFactorMiddlewareTest extends TestCase {
$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 @@ class TwoFactorMiddlewareTest extends TestCase {
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 @@ class TwoFactorMiddlewareTest extends TestCase {
$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);