-
-
Notifications
You must be signed in to change notification settings - Fork 4.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move passwordconfirmation to its own midleware
Add tests Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
- Loading branch information
Showing
7 changed files
with
228 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
81 changes: 81 additions & 0 deletions
81
lib/private/AppFramework/Middleware/Security/PasswordConfirmationMiddleware.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| <?php | ||
| /** | ||
| * @copyright 2018, Roeland Jago Douma <roeland@famdouma.nl> | ||
| * | ||
| * @author Roeland Jago Douma <roeland@famdouma.nl> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
| namespace OC\AppFramework\Middleware\Security; | ||
|
|
||
| use OC\AppFramework\Middleware\Security\Exceptions\NotConfirmedException; | ||
| use OC\AppFramework\Utility\ControllerMethodReflector; | ||
| use OCP\AppFramework\Controller; | ||
| use OCP\AppFramework\Middleware; | ||
| use OCP\AppFramework\Utility\ITimeFactory; | ||
| use OCP\ISession; | ||
| use OCP\IUserSession; | ||
|
|
||
| class PasswordConfirmationMiddleware extends Middleware { | ||
| /** @var ControllerMethodReflector */ | ||
| private $reflector; | ||
| /** @var ISession */ | ||
| private $session; | ||
| /** @var IUserSession */ | ||
| private $userSession; | ||
| /** @var ITimeFactory */ | ||
| private $timeFactory; | ||
|
|
||
| /** | ||
| * PasswordConfirmationMiddleware constructor. | ||
| * | ||
| * @param ControllerMethodReflector $reflector | ||
| * @param ISession $session | ||
| * @param IUserSession $userSession | ||
| * @param ITimeFactory $timeFactory | ||
| */ | ||
| public function __construct(ControllerMethodReflector $reflector, | ||
| ISession $session, | ||
| IUserSession $userSession, | ||
| ITimeFactory $timeFactory) { | ||
| $this->reflector = $reflector; | ||
| $this->session = $session; | ||
| $this->userSession = $userSession; | ||
| $this->timeFactory = $timeFactory; | ||
| } | ||
|
|
||
| /** | ||
| * @param Controller $controller | ||
| * @param string $methodName | ||
| * @throws NotConfirmedException | ||
| */ | ||
| public function beforeController($controller, $methodName) { | ||
| if ($this->reflector->hasAnnotation('PasswordConfirmationRequired')) { | ||
| $user = $this->userSession->getUser(); | ||
| $backendClassName = ''; | ||
| if ($user !== null) { | ||
| $backendClassName = $user->getBackendClassName(); | ||
| } | ||
|
|
||
| $lastConfirm = (int) $this->session->get('last-password-confirm'); | ||
| // we can't check the password against a SAML backend, so skip password confirmation in this case | ||
| if ($backendClassName !== 'user_saml' && $lastConfirm < ($this->timeFactory->getTime() - (30 * 60 + 15))) { // allow 15 seconds delay | ||
| throw new NotConfirmedException(); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
129 changes: 129 additions & 0 deletions
129
tests/lib/AppFramework/Middleware/Security/PasswordConfirmationMiddlewareTest.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| <?php | ||
| /** | ||
| * @copyright 2018, Roeland Jago Douma <roeland@famdouma.nl> | ||
| * | ||
| * @author Roeland Jago Douma <roeland@famdouma.nl> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
| namespace Test\AppFramework\Middleware\Security; | ||
|
|
||
| use OC\AppFramework\Middleware\Security\Exceptions\NotConfirmedException; | ||
| use OC\AppFramework\Middleware\Security\PasswordConfirmationMiddleware; | ||
| use OC\AppFramework\Utility\ControllerMethodReflector; | ||
| use OCP\AppFramework\Controller; | ||
| use OCP\AppFramework\Utility\ITimeFactory; | ||
| use OCP\ISession; | ||
| use OCP\IUser; | ||
| use OCP\IUserSession; | ||
| use Test\TestCase; | ||
|
|
||
| class PasswordConfirmationMiddlewareTest extends TestCase { | ||
| /** @var ControllerMethodReflector */ | ||
| private $reflector; | ||
| /** @var ISession|\PHPUnit_Framework_MockObject_MockObject */ | ||
| private $session; | ||
| /** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */ | ||
| private $userSession; | ||
| /** @var IUser|\PHPUnit_Framework_MockObject_MockObject */ | ||
| private $user; | ||
| /** @var PasswordConfirmationMiddleware */ | ||
| private $middleware; | ||
| /** @var Controller */ | ||
| private $contoller; | ||
| /** @var ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */ | ||
| private $timeFactory; | ||
|
|
||
| protected function setUp() { | ||
| $this->reflector = new ControllerMethodReflector(); | ||
| $this->session = $this->createMock(ISession::class); | ||
| $this->userSession = $this->createMock(IUserSession::class); | ||
| $this->user = $this->createMock(IUser::class); | ||
| $this->contoller = $this->createMock(Controller::class); | ||
| $this->timeFactory = $this->createMock(ITimeFactory::class); | ||
|
|
||
| $this->middleware = new PasswordConfirmationMiddleware( | ||
| $this->reflector, | ||
| $this->session, | ||
| $this->userSession, | ||
| $this->timeFactory | ||
| ); | ||
| } | ||
|
|
||
| public function testNoAnnotation() { | ||
| $this->reflector->reflect(__CLASS__, __FUNCTION__); | ||
| $this->session->expects($this->never()) | ||
| ->method($this->anything()); | ||
| $this->userSession->expects($this->never()) | ||
| ->method($this->anything()); | ||
|
|
||
| $this->middleware->beforeController($this->contoller, __FUNCTION__); | ||
| } | ||
|
|
||
| /** | ||
| * @TestAnnotation | ||
| */ | ||
| public function testDifferentAnnotation() { | ||
| $this->reflector->reflect(__CLASS__, __FUNCTION__); | ||
| $this->session->expects($this->never()) | ||
| ->method($this->anything()); | ||
| $this->userSession->expects($this->never()) | ||
| ->method($this->anything()); | ||
|
|
||
| $this->middleware->beforeController($this->contoller, __FUNCTION__); | ||
| } | ||
|
|
||
| /** | ||
| * @PasswordConfirmationRequired | ||
| * @dataProvider testProvider | ||
| */ | ||
| public function testAnnotation($backend, $lastConfirm, $currentTime, $exception) { | ||
| $this->reflector->reflect(__CLASS__, __FUNCTION__); | ||
|
|
||
| $this->user->method('getBackendClassName') | ||
| ->willReturn($backend); | ||
| $this->userSession->method('getUser') | ||
| ->willReturn($this->user); | ||
|
|
||
| $this->session->method('get') | ||
| ->with('last-password-confirm') | ||
| ->willReturn($lastConfirm); | ||
|
|
||
| $this->timeFactory->method('getTime') | ||
| ->willReturn($currentTime); | ||
|
|
||
| $thrown = false; | ||
| try { | ||
| $this->middleware->beforeController($this->contoller, __FUNCTION__); | ||
| } catch (NotConfirmedException $e) { | ||
| $thrown = true; | ||
| } | ||
|
|
||
| $this->assertSame($exception, $thrown); | ||
| } | ||
|
|
||
| public function testProvider() { | ||
| return [ | ||
| ['foo', 2000, 4000, true], | ||
| ['foo', 2000, 3000, false], | ||
| ['user_saml', 2000, 4000, false], | ||
| ['user_saml', 2000, 3000, false], | ||
| ['foo', 2000, 3815, false], | ||
| ['foo', 2000, 3816, true], | ||
| ]; | ||
| } | ||
| } |
Oops, something went wrong.