8149945a91
This makes the new `@BruteForceProtection` annotation more clever and moves the relevant code into it's own middleware. Basically you can now set `@BruteForceProtection(action=$key)` as annotation and that will make the controller bruteforce protected. However, the difference to before is that you need to call `$responmse->throttle()` to increase the counter. Before the counter was increased every time which leads to all kind of unexpected problems. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
83 lines
2.7 KiB
PHP
83 lines
2.7 KiB
PHP
<?php
|
|
/**
|
|
* @copyright Copyright (c) 2017 Lukas Reschke <lukas@statuscode.ch>
|
|
*
|
|
* @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\Utility\ControllerMethodReflector;
|
|
use OC\Security\Bruteforce\Throttler;
|
|
use OCP\AppFramework\Http\Response;
|
|
use OCP\AppFramework\Middleware;
|
|
use OCP\IRequest;
|
|
|
|
/**
|
|
* Class BruteForceMiddleware performs the bruteforce protection for controllers
|
|
* that are annotated with @BruteForceProtection(action=$action) whereas $action
|
|
* is the action that should be logged within the database.
|
|
*
|
|
* @package OC\AppFramework\Middleware\Security
|
|
*/
|
|
class BruteForceMiddleware extends Middleware {
|
|
/** @var ControllerMethodReflector */
|
|
private $reflector;
|
|
/** @var Throttler */
|
|
private $throttler;
|
|
/** @var IRequest */
|
|
private $request;
|
|
|
|
/**
|
|
* @param ControllerMethodReflector $controllerMethodReflector
|
|
* @param Throttler $throttler
|
|
* @param IRequest $request
|
|
*/
|
|
public function __construct(ControllerMethodReflector $controllerMethodReflector,
|
|
Throttler $throttler,
|
|
IRequest $request) {
|
|
$this->reflector = $controllerMethodReflector;
|
|
$this->throttler = $throttler;
|
|
$this->request = $request;
|
|
}
|
|
|
|
/**
|
|
* {@inheritDoc}
|
|
*/
|
|
public function beforeController($controller, $methodName) {
|
|
parent::beforeController($controller, $methodName);
|
|
|
|
if($this->reflector->hasAnnotation('BruteForceProtection')) {
|
|
$action = $this->reflector->getAnnotationParameter('BruteForceProtection', 'action');
|
|
$this->throttler->sleepDelay($this->request->getRemoteAddress(), $action);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* {@inheritDoc}
|
|
*/
|
|
public function afterController($controller, $methodName, Response $response) {
|
|
if($this->reflector->hasAnnotation('BruteForceProtection') && $response->isThrottled()) {
|
|
$action = $this->reflector->getAnnotationParameter('BruteForceProtection', 'action');
|
|
$ip = $this->request->getRemoteAddress();
|
|
$this->throttler->sleepDelay($ip, $action);
|
|
$this->throttler->registerAttempt($action, $ip);
|
|
}
|
|
|
|
return parent::afterController($controller, $methodName, $response);
|
|
}
|
|
}
|