6af2efb679
This fixes infinite loops that are caused whenever a user is about to solve a 2FA challenge, but the provider app is disabled at the same time. Since the session value usually indicates that the challenge needs to be solved before we grant access we have to remove that value instead in this special case.
138 lines
4.3 KiB
PHP
138 lines
4.3 KiB
PHP
<?php
|
|
/**
|
|
* @copyright Copyright (c) 2016, ownCloud, Inc.
|
|
*
|
|
* @author Christoph Wurst <christoph@owncloud.com>
|
|
* @author Joas Schilling <coding@schilljs.com>
|
|
*
|
|
* @license AGPL-3.0
|
|
*
|
|
* This code is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Affero General Public License, version 3,
|
|
* as published by the Free Software Foundation.
|
|
*
|
|
* 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, version 3,
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
*
|
|
*/
|
|
|
|
namespace OC\Core\Middleware;
|
|
|
|
use Exception;
|
|
use OC\Authentication\Exceptions\TwoFactorAuthRequiredException;
|
|
use OC\Authentication\Exceptions\UserAlreadyLoggedInException;
|
|
use OC\Authentication\TwoFactorAuth\Manager;
|
|
use OC\Core\Controller\LoginController;
|
|
use OC\Core\Controller\TwoFactorChallengeController;
|
|
use OC\User\Session;
|
|
use OCP\AppFramework\Controller;
|
|
use OCP\AppFramework\Http\RedirectResponse;
|
|
use OCP\AppFramework\Middleware;
|
|
use OCP\AppFramework\Utility\IControllerMethodReflector;
|
|
use OCP\IRequest;
|
|
use OCP\ISession;
|
|
use OCP\IURLGenerator;
|
|
use OCP\IUser;
|
|
|
|
class TwoFactorMiddleware extends Middleware {
|
|
|
|
/** @var Manager */
|
|
private $twoFactorManager;
|
|
|
|
/** @var Session */
|
|
private $userSession;
|
|
|
|
/** @var ISession */
|
|
private $session;
|
|
|
|
/** @var IURLGenerator */
|
|
private $urlGenerator;
|
|
|
|
/** @var IControllerMethodReflector */
|
|
private $reflector;
|
|
|
|
/** @var IRequest */
|
|
private $request;
|
|
|
|
/**
|
|
* @param Manager $twoFactorManager
|
|
* @param Session $userSession
|
|
* @param ISession $session
|
|
* @param IURLGenerator $urlGenerator
|
|
*/
|
|
public function __construct(Manager $twoFactorManager, Session $userSession, ISession $session,
|
|
IURLGenerator $urlGenerator, IControllerMethodReflector $reflector, IRequest $request) {
|
|
$this->twoFactorManager = $twoFactorManager;
|
|
$this->userSession = $userSession;
|
|
$this->session = $session;
|
|
$this->urlGenerator = $urlGenerator;
|
|
$this->reflector = $reflector;
|
|
$this->request = $request;
|
|
}
|
|
|
|
/**
|
|
* @param Controller $controller
|
|
* @param string $methodName
|
|
*/
|
|
public function beforeController($controller, $methodName) {
|
|
if ($this->reflector->hasAnnotation('PublicPage')) {
|
|
// Don't block public pages
|
|
return;
|
|
}
|
|
|
|
if ($controller instanceof LoginController && $methodName === 'logout') {
|
|
// Don't block the logout page, to allow canceling the 2FA
|
|
return;
|
|
}
|
|
|
|
if ($this->userSession->isLoggedIn()) {
|
|
$user = $this->userSession->getUser();
|
|
|
|
if ($this->twoFactorManager->isTwoFactorAuthenticated($user)) {
|
|
$this->checkTwoFactor($controller, $methodName, $user);
|
|
} else if ($controller instanceof TwoFactorChallengeController) {
|
|
// Allow access to the two-factor controllers only if two-factor authentication
|
|
// is in progress.
|
|
throw new UserAlreadyLoggedInException();
|
|
}
|
|
}
|
|
// TODO: dont check/enforce 2FA if a auth token is used
|
|
}
|
|
|
|
private function checkTwoFactor($controller, $methodName, IUser $user) {
|
|
// If two-factor auth is in progress disallow access to any controllers
|
|
// defined within "LoginController".
|
|
$needsSecondFactor = $this->twoFactorManager->needsSecondFactor($user);
|
|
$twoFactor = $controller instanceof TwoFactorChallengeController;
|
|
|
|
// Disallow access to any controller if 2FA needs to be checked
|
|
if ($needsSecondFactor && !$twoFactor) {
|
|
throw new TwoFactorAuthRequiredException();
|
|
}
|
|
|
|
// Allow access to the two-factor controllers only if two-factor authentication
|
|
// is in progress.
|
|
if (!$needsSecondFactor && $twoFactor) {
|
|
throw new UserAlreadyLoggedInException();
|
|
}
|
|
}
|
|
|
|
public function afterException($controller, $methodName, Exception $exception) {
|
|
if ($exception instanceof TwoFactorAuthRequiredException) {
|
|
return new RedirectResponse($this->urlGenerator->linkToRoute('core.TwoFactorChallenge.selectChallenge', [
|
|
'redirect_url' => urlencode($this->request->server['REQUEST_URI']),
|
|
]));
|
|
}
|
|
if ($exception instanceof UserAlreadyLoggedInException) {
|
|
return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index'));
|
|
}
|
|
|
|
throw $exception;
|
|
}
|
|
|
|
}
|