Add bruteforce capabilities

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2017-07-12 21:46:25 +02:00
parent 598835b06f
commit 6a1f2ac076
No known key found for this signature in database
GPG Key ID: F941078878347C0C
3 changed files with 123 additions and 0 deletions

View File

@ -0,0 +1,52 @@
<?php
/**
* @copyright Copyright (c) 2017 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\Security\Bruteforce;
use OCP\Capabilities\IPublicCapability;
use OCP\IRequest;
class Capabilities implements IPublicCapability {
/** @var IRequest */
private $request;
/** @var Throttler */
private $throttler;
/**
* Capabilities constructor.
*
* @param IRequest $request
* @param Throttler $throttler
*/
public function __construct(IRequest $request,
Throttler $throttler) {
$this->request = $request;
$this->throttler = $throttler;
}
public function getCapabilities() {
return [
'bruteforce' => [
'delay' => $this->throttler->getDelay($this->request->getRemoteAddress())
]
];
}
}

View File

@ -836,6 +836,9 @@ class Server extends ServerContainer implements IServerContainer {
$manager->registerCapability(function () use ($c) { $manager->registerCapability(function () use ($c) {
return new \OC\OCS\CoreCapabilities($c->getConfig()); return new \OC\OCS\CoreCapabilities($c->getConfig());
}); });
$manager->registerCapability(function () use ($c) {
return $c->query(\OC\Security\Bruteforce\Capabilities::class);
});
return $manager; return $manager;
}); });
$this->registerAlias('CapabilitiesManager', \OC\CapabilitiesManager::class); $this->registerAlias('CapabilitiesManager', \OC\CapabilitiesManager::class);

View File

@ -0,0 +1,68 @@
<?php
/**
* @copyright Copyright (c) 2017 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\Security\Bruteforce;
use OC\Security\Bruteforce\Capabilities;
use OC\Security\Bruteforce\Throttler;
use OCP\IRequest;
use Test\TestCase;
class CapabilitiesTest extends TestCase {
/** @var Capabilities */
private $capabilities;
/** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */
private $request;
/** @var Throttler|\PHPUnit_Framework_MockObject_MockObject */
private $throttler;
public function setUp() {
parent::setUp();
$this->request = $this->createMock(IRequest::class);
$this->request->method('getRemoteAddress')
->willReturn('10.10.10.10');
$this->throttler = $this->createMock(Throttler::class);
$this->capabilities = new Capabilities(
$this->request,
$this->throttler
);
}
public function testGetCapabilities() {
$this->throttler->expects($this->atLeastOnce())
->method('getDelay')
->with('10.10.10.10')
->willReturn(42);
$expected = [
'bruteforce' => [
'delay' => 42
]
];
$result = $this->capabilities->getCapabilities();
$this->assertEquals($expected, $result);
}
}