|
|
|
@ -8,6 +8,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
namespace Test\Core\Middleware;
|
|
|
|
namespace Test\Core\Middleware;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
use OC\AppFramework\Http\Attributes\TwoFactorSetUpDoneRequired;
|
|
|
|
use OC\AppFramework\Http\Request;
|
|
|
|
use OC\AppFramework\Http\Request;
|
|
|
|
use OC\Authentication\Exceptions\TwoFactorAuthRequiredException;
|
|
|
|
use OC\Authentication\Exceptions\TwoFactorAuthRequiredException;
|
|
|
|
use OC\Authentication\Exceptions\UserAlreadyLoggedInException;
|
|
|
|
use OC\Authentication\Exceptions\UserAlreadyLoggedInException;
|
|
|
|
@ -17,7 +18,9 @@ use OC\Core\Controller\TwoFactorChallengeController;
|
|
|
|
use OC\Core\Middleware\TwoFactorMiddleware;
|
|
|
|
use OC\Core\Middleware\TwoFactorMiddleware;
|
|
|
|
use OC\User\Session;
|
|
|
|
use OC\User\Session;
|
|
|
|
use OCP\AppFramework\Controller;
|
|
|
|
use OCP\AppFramework\Controller;
|
|
|
|
|
|
|
|
use OCP\AppFramework\Http\Attribute\NoTwoFactorRequired;
|
|
|
|
use OCP\AppFramework\Http\RedirectResponse;
|
|
|
|
use OCP\AppFramework\Http\RedirectResponse;
|
|
|
|
|
|
|
|
use OCP\AppFramework\Http\Response;
|
|
|
|
use OCP\AppFramework\Utility\IControllerMethodReflector;
|
|
|
|
use OCP\AppFramework\Utility\IControllerMethodReflector;
|
|
|
|
use OCP\Authentication\TwoFactorAuth\ALoginSetupController;
|
|
|
|
use OCP\Authentication\TwoFactorAuth\ALoginSetupController;
|
|
|
|
use OCP\Authentication\TwoFactorAuth\IProvider;
|
|
|
|
use OCP\Authentication\TwoFactorAuth\IProvider;
|
|
|
|
@ -28,33 +31,52 @@ use OCP\ISession;
|
|
|
|
use OCP\IURLGenerator;
|
|
|
|
use OCP\IURLGenerator;
|
|
|
|
use OCP\IUser;
|
|
|
|
use OCP\IUser;
|
|
|
|
use OCP\IUserSession;
|
|
|
|
use OCP\IUserSession;
|
|
|
|
|
|
|
|
use PHPUnit\Framework\Attributes\DataProvider;
|
|
|
|
use PHPUnit\Framework\MockObject\MockObject;
|
|
|
|
use PHPUnit\Framework\MockObject\MockObject;
|
|
|
|
|
|
|
|
use Psr\Log\LoggerInterface;
|
|
|
|
use Test\TestCase;
|
|
|
|
use Test\TestCase;
|
|
|
|
|
|
|
|
|
|
|
|
class TwoFactorMiddlewareTest extends TestCase {
|
|
|
|
class HasTwoFactorAnnotationController extends Controller {
|
|
|
|
/** @var Manager|MockObject */
|
|
|
|
#[NoTwoFactorRequired]
|
|
|
|
private $twoFactorManager;
|
|
|
|
public function index(): Response {
|
|
|
|
|
|
|
|
return new Response();
|
|
|
|
/** @var IUserSession|MockObject */
|
|
|
|
}
|
|
|
|
private $userSession;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/** @var ISession|MockObject */
|
|
|
|
|
|
|
|
private $session;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** @var IURLGenerator|MockObject */
|
|
|
|
class LoginSetupController extends ALoginSetupController {
|
|
|
|
private $urlGenerator;
|
|
|
|
public function index(): Response {
|
|
|
|
|
|
|
|
return new Response();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/** @var IControllerMethodReflector|MockObject */
|
|
|
|
class NoTwoFactorAnnotationController extends Controller {
|
|
|
|
private $reflector;
|
|
|
|
public function index(): Response {
|
|
|
|
|
|
|
|
return new Response();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/** @var IRequest|MockObject */
|
|
|
|
class NoTwoFactorChallengeAnnotationController extends TwoFactorChallengeController {
|
|
|
|
private $request;
|
|
|
|
public function index(): Response {
|
|
|
|
|
|
|
|
return new Response();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/** @var TwoFactorMiddleware */
|
|
|
|
class HasTwoFactorSetUpDoneAnnotationController extends TwoFactorChallengeController {
|
|
|
|
private $middleware;
|
|
|
|
#[TwoFactorSetUpDoneRequired]
|
|
|
|
|
|
|
|
public function index(): Response {
|
|
|
|
|
|
|
|
return new Response();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/** @var Controller */
|
|
|
|
class TwoFactorMiddlewareTest extends TestCase {
|
|
|
|
private $controller;
|
|
|
|
private Manager&MockObject $twoFactorManager;
|
|
|
|
|
|
|
|
private IUserSession&MockObject $userSession;
|
|
|
|
|
|
|
|
private ISession&MockObject $session;
|
|
|
|
|
|
|
|
private IURLGenerator&MockObject $urlGenerator;
|
|
|
|
|
|
|
|
private IControllerMethodReflector&MockObject $reflector;
|
|
|
|
|
|
|
|
private IRequest $request;
|
|
|
|
|
|
|
|
private TwoFactorMiddleware $middleware;
|
|
|
|
|
|
|
|
private LoggerInterface&MockObject $logger;
|
|
|
|
|
|
|
|
|
|
|
|
protected function setUp(): void {
|
|
|
|
protected function setUp(): void {
|
|
|
|
parent::setUp();
|
|
|
|
parent::setUp();
|
|
|
|
@ -68,6 +90,7 @@ class TwoFactorMiddlewareTest extends TestCase {
|
|
|
|
$this->session = $this->createMock(ISession::class);
|
|
|
|
$this->session = $this->createMock(ISession::class);
|
|
|
|
$this->urlGenerator = $this->createMock(IURLGenerator::class);
|
|
|
|
$this->urlGenerator = $this->createMock(IURLGenerator::class);
|
|
|
|
$this->reflector = $this->createMock(IControllerMethodReflector::class);
|
|
|
|
$this->reflector = $this->createMock(IControllerMethodReflector::class);
|
|
|
|
|
|
|
|
$this->logger = $this->createMock(LoggerInterface::class);
|
|
|
|
$this->request = new Request(
|
|
|
|
$this->request = new Request(
|
|
|
|
[
|
|
|
|
[
|
|
|
|
'server' => [
|
|
|
|
'server' => [
|
|
|
|
@ -78,8 +101,7 @@ class TwoFactorMiddlewareTest extends TestCase {
|
|
|
|
$this->createMock(IConfig::class)
|
|
|
|
$this->createMock(IConfig::class)
|
|
|
|
);
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
|
|
$this->middleware = new TwoFactorMiddleware($this->twoFactorManager, $this->userSession, $this->session, $this->urlGenerator, $this->reflector, $this->request);
|
|
|
|
$this->middleware = new TwoFactorMiddleware($this->twoFactorManager, $this->userSession, $this->session, $this->urlGenerator, $this->reflector, $this->request, $this->logger);
|
|
|
|
$this->controller = $this->createMock(Controller::class);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public function testBeforeControllerNotLoggedIn(): void {
|
|
|
|
public function testBeforeControllerNotLoggedIn(): void {
|
|
|
|
@ -90,12 +112,14 @@ class TwoFactorMiddlewareTest extends TestCase {
|
|
|
|
$this->userSession->expects($this->never())
|
|
|
|
$this->userSession->expects($this->never())
|
|
|
|
->method('getUser');
|
|
|
|
->method('getUser');
|
|
|
|
|
|
|
|
|
|
|
|
$this->middleware->beforeController($this->controller, 'index');
|
|
|
|
$controller = $this->getMockBuilder(NoTwoFactorAnnotationController::class)
|
|
|
|
|
|
|
|
->disableOriginalConstructor()
|
|
|
|
|
|
|
|
->getMock();
|
|
|
|
|
|
|
|
$this->middleware->beforeController($controller, 'index');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public function testBeforeSetupController(): void {
|
|
|
|
public function testBeforeSetupController(): void {
|
|
|
|
$user = $this->createMock(IUser::class);
|
|
|
|
$user = $this->createMock(IUser::class);
|
|
|
|
$controller = $this->createMock(ALoginSetupController::class);
|
|
|
|
|
|
|
|
$this->userSession->expects($this->any())
|
|
|
|
$this->userSession->expects($this->any())
|
|
|
|
->method('getUser')
|
|
|
|
->method('getUser')
|
|
|
|
->willReturn($user);
|
|
|
|
->willReturn($user);
|
|
|
|
@ -105,7 +129,7 @@ class TwoFactorMiddlewareTest extends TestCase {
|
|
|
|
$this->userSession->expects($this->never())
|
|
|
|
$this->userSession->expects($this->never())
|
|
|
|
->method('isLoggedIn');
|
|
|
|
->method('isLoggedIn');
|
|
|
|
|
|
|
|
|
|
|
|
$this->middleware->beforeController($controller, 'create');
|
|
|
|
$this->middleware->beforeController(new LoginSetupController('foo', $this->request), 'index');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public function testBeforeControllerNoTwoFactorCheckNeeded(): void {
|
|
|
|
public function testBeforeControllerNoTwoFactorCheckNeeded(): void {
|
|
|
|
@ -122,7 +146,10 @@ class TwoFactorMiddlewareTest extends TestCase {
|
|
|
|
->with($user)
|
|
|
|
->with($user)
|
|
|
|
->willReturn(false);
|
|
|
|
->willReturn(false);
|
|
|
|
|
|
|
|
|
|
|
|
$this->middleware->beforeController($this->controller, 'index');
|
|
|
|
$controller = $this->getMockBuilder(NoTwoFactorAnnotationController::class)
|
|
|
|
|
|
|
|
->disableOriginalConstructor()
|
|
|
|
|
|
|
|
->getMock();
|
|
|
|
|
|
|
|
$this->middleware->beforeController($controller, 'index');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -146,7 +173,10 @@ class TwoFactorMiddlewareTest extends TestCase {
|
|
|
|
->with($user)
|
|
|
|
->with($user)
|
|
|
|
->willReturn(true);
|
|
|
|
->willReturn(true);
|
|
|
|
|
|
|
|
|
|
|
|
$this->middleware->beforeController($this->controller, 'index');
|
|
|
|
$controller = $this->getMockBuilder(NoTwoFactorAnnotationController::class)
|
|
|
|
|
|
|
|
->disableOriginalConstructor()
|
|
|
|
|
|
|
|
->getMock();
|
|
|
|
|
|
|
|
$this->middleware->beforeController($controller, 'index');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -155,9 +185,6 @@ class TwoFactorMiddlewareTest extends TestCase {
|
|
|
|
|
|
|
|
|
|
|
|
$user = $this->createMock(IUser::class);
|
|
|
|
$user = $this->createMock(IUser::class);
|
|
|
|
|
|
|
|
|
|
|
|
$this->reflector
|
|
|
|
|
|
|
|
->method('hasAnnotation')
|
|
|
|
|
|
|
|
->willReturn(false);
|
|
|
|
|
|
|
|
$this->userSession->expects($this->once())
|
|
|
|
$this->userSession->expects($this->once())
|
|
|
|
->method('isLoggedIn')
|
|
|
|
->method('isLoggedIn')
|
|
|
|
->willReturn(true);
|
|
|
|
->willReturn(true);
|
|
|
|
@ -173,7 +200,7 @@ class TwoFactorMiddlewareTest extends TestCase {
|
|
|
|
->with($user)
|
|
|
|
->with($user)
|
|
|
|
->willReturn(false);
|
|
|
|
->willReturn(false);
|
|
|
|
|
|
|
|
|
|
|
|
$twoFactorChallengeController = $this->getMockBuilder(TwoFactorChallengeController::class)
|
|
|
|
$twoFactorChallengeController = $this->getMockBuilder(NoTwoFactorChallengeAnnotationController::class)
|
|
|
|
->disableOriginalConstructor()
|
|
|
|
->disableOriginalConstructor()
|
|
|
|
->getMock();
|
|
|
|
->getMock();
|
|
|
|
$this->middleware->beforeController($twoFactorChallengeController, 'index');
|
|
|
|
$this->middleware->beforeController($twoFactorChallengeController, 'index');
|
|
|
|
@ -188,7 +215,8 @@ class TwoFactorMiddlewareTest extends TestCase {
|
|
|
|
->willReturn('test/url');
|
|
|
|
->willReturn('test/url');
|
|
|
|
$expected = new RedirectResponse('test/url');
|
|
|
|
$expected = new RedirectResponse('test/url');
|
|
|
|
|
|
|
|
|
|
|
|
$this->assertEquals($expected, $this->middleware->afterException($this->controller, 'index', $ex));
|
|
|
|
$controller = new HasTwoFactorAnnotationController('foo', $this->request);
|
|
|
|
|
|
|
|
$this->assertEquals($expected, $this->middleware->afterException($controller, 'index', $ex));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public function testAfterException(): void {
|
|
|
|
public function testAfterException(): void {
|
|
|
|
@ -200,17 +228,13 @@ class TwoFactorMiddlewareTest extends TestCase {
|
|
|
|
->willReturn('redirect/url');
|
|
|
|
->willReturn('redirect/url');
|
|
|
|
$expected = new RedirectResponse('redirect/url');
|
|
|
|
$expected = new RedirectResponse('redirect/url');
|
|
|
|
|
|
|
|
|
|
|
|
$this->assertEquals($expected, $this->middleware->afterException($this->controller, 'index', $ex));
|
|
|
|
$controller = new HasTwoFactorAnnotationController('foo', $this->request);
|
|
|
|
|
|
|
|
$this->assertEquals($expected, $this->middleware->afterException($controller, 'index', $ex));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public function testRequires2FASetupDoneAnnotated(): void {
|
|
|
|
public function testRequires2FASetupDoneAnnotated(): void {
|
|
|
|
$user = $this->createMock(IUser::class);
|
|
|
|
$user = $this->createMock(IUser::class);
|
|
|
|
|
|
|
|
|
|
|
|
$this->reflector
|
|
|
|
|
|
|
|
->method('hasAnnotation')
|
|
|
|
|
|
|
|
->willReturnCallback(function (string $annotation) {
|
|
|
|
|
|
|
|
return $annotation === 'TwoFactorSetUpDoneRequired';
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
$this->userSession->expects($this->once())
|
|
|
|
$this->userSession->expects($this->once())
|
|
|
|
->method('isLoggedIn')
|
|
|
|
->method('isLoggedIn')
|
|
|
|
->willReturn(true);
|
|
|
|
->willReturn(true);
|
|
|
|
@ -228,10 +252,10 @@ class TwoFactorMiddlewareTest extends TestCase {
|
|
|
|
|
|
|
|
|
|
|
|
$this->expectException(UserAlreadyLoggedInException::class);
|
|
|
|
$this->expectException(UserAlreadyLoggedInException::class);
|
|
|
|
|
|
|
|
|
|
|
|
$twoFactorChallengeController = $this->getMockBuilder(TwoFactorChallengeController::class)
|
|
|
|
$controller = $this->getMockBuilder(HasTwoFactorSetUpDoneAnnotationController::class)
|
|
|
|
->disableOriginalConstructor()
|
|
|
|
->disableOriginalConstructor()
|
|
|
|
->getMock();
|
|
|
|
->getMock();
|
|
|
|
$this->middleware->beforeController($twoFactorChallengeController, 'index');
|
|
|
|
$this->middleware->beforeController($controller, 'index');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public static function dataRequires2FASetupDone(): array {
|
|
|
|
public static function dataRequires2FASetupDone(): array {
|
|
|
|
@ -243,7 +267,7 @@ class TwoFactorMiddlewareTest extends TestCase {
|
|
|
|
];
|
|
|
|
];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#[\PHPUnit\Framework\Attributes\DataProvider('dataRequires2FASetupDone')]
|
|
|
|
#[DataProvider('dataRequires2FASetupDone')]
|
|
|
|
public function testRequires2FASetupDone(bool $hasProvider, bool $missingProviders, bool $expectEception): void {
|
|
|
|
public function testRequires2FASetupDone(bool $hasProvider, bool $missingProviders, bool $expectEception): void {
|
|
|
|
if ($hasProvider) {
|
|
|
|
if ($hasProvider) {
|
|
|
|
$provider = $this->createMock(IProvider::class);
|
|
|
|
$provider = $this->createMock(IProvider::class);
|
|
|
|
@ -257,9 +281,6 @@ class TwoFactorMiddlewareTest extends TestCase {
|
|
|
|
|
|
|
|
|
|
|
|
$user = $this->createMock(IUser::class);
|
|
|
|
$user = $this->createMock(IUser::class);
|
|
|
|
|
|
|
|
|
|
|
|
$this->reflector
|
|
|
|
|
|
|
|
->method('hasAnnotation')
|
|
|
|
|
|
|
|
->willReturn(false);
|
|
|
|
|
|
|
|
$this->userSession
|
|
|
|
$this->userSession
|
|
|
|
->method('getUser')
|
|
|
|
->method('getUser')
|
|
|
|
->willReturn($user);
|
|
|
|
->willReturn($user);
|
|
|
|
@ -278,9 +299,9 @@ class TwoFactorMiddlewareTest extends TestCase {
|
|
|
|
$this->assertTrue(true);
|
|
|
|
$this->assertTrue(true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
$twoFactorChallengeController = $this->getMockBuilder(TwoFactorChallengeController::class)
|
|
|
|
$controller = $this->getMockBuilder(NoTwoFactorChallengeAnnotationController::class)
|
|
|
|
->disableOriginalConstructor()
|
|
|
|
->disableOriginalConstructor()
|
|
|
|
->getMock();
|
|
|
|
->getMock();
|
|
|
|
$this->middleware->beforeController($twoFactorChallengeController, 'index');
|
|
|
|
$this->middleware->beforeController($controller, 'index');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Carl Schwan