Add database ratelimiting backendtags/v23.0.0beta1
@@ -0,0 +1,44 @@ | |||
<?php | |||
declare(strict_types=1); | |||
namespace OC\Core\Migrations; | |||
use Closure; | |||
use OCP\DB\ISchemaWrapper; | |||
use OCP\DB\Types; | |||
use OCP\Migration\IOutput; | |||
use OCP\Migration\SimpleMigrationStep; | |||
class Version23000Date20210906132259 extends SimpleMigrationStep { | |||
private const TABLE_NAME = 'ratelimit_entries'; | |||
/** | |||
* @param IOutput $output | |||
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` | |||
* @param array $options | |||
* @return null|ISchemaWrapper | |||
*/ | |||
public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { | |||
/** @var ISchemaWrapper $schema */ | |||
$schema = $schemaClosure(); | |||
$hasTable = $schema->hasTable(self::TABLE_NAME); | |||
if (!$hasTable) { | |||
$table = $schema->createTable(self::TABLE_NAME); | |||
$table->addColumn('hash', Types::STRING, [ | |||
'notnull' => true, | |||
'length' => 128, | |||
]); | |||
$table->addColumn('delete_after', Types::DATETIME, [ | |||
'notnull' => true, | |||
]); | |||
$table->addIndex(['hash'], 'ratelimit_hash'); | |||
$table->addIndex(['delete_after'], 'ratelimit_delete_after'); | |||
return $schema; | |||
} | |||
return null; | |||
} | |||
} |
@@ -971,6 +971,7 @@ return array( | |||
'OC\\Core\\Migrations\\Version21000Date20210309185126' => $baseDir . '/core/Migrations/Version21000Date20210309185126.php', | |||
'OC\\Core\\Migrations\\Version21000Date20210309185127' => $baseDir . '/core/Migrations/Version21000Date20210309185127.php', | |||
'OC\\Core\\Migrations\\Version22000Date20210216080825' => $baseDir . '/core/Migrations/Version22000Date20210216080825.php', | |||
'OC\\Core\\Migrations\\Version23000Date20210906132259' => $baseDir . '/core/Migrations/Version23000Date20210906132259.php', | |||
'OC\\Core\\Notification\\CoreNotifier' => $baseDir . '/core/Notification/CoreNotifier.php', | |||
'OC\\Core\\Service\\LoginFlowV2Service' => $baseDir . '/core/Service/LoginFlowV2Service.php', | |||
'OC\\DB\\Adapter' => $baseDir . '/lib/private/DB/Adapter.php', | |||
@@ -1367,8 +1368,9 @@ return array( | |||
'OC\\Security\\IdentityProof\\Manager' => $baseDir . '/lib/private/Security/IdentityProof/Manager.php', | |||
'OC\\Security\\IdentityProof\\Signer' => $baseDir . '/lib/private/Security/IdentityProof/Signer.php', | |||
'OC\\Security\\Normalizer\\IpAddress' => $baseDir . '/lib/private/Security/Normalizer/IpAddress.php', | |||
'OC\\Security\\RateLimiting\\Backend\\DatabaseBackend' => $baseDir . '/lib/private/Security/RateLimiting/Backend/DatabaseBackend.php', | |||
'OC\\Security\\RateLimiting\\Backend\\IBackend' => $baseDir . '/lib/private/Security/RateLimiting/Backend/IBackend.php', | |||
'OC\\Security\\RateLimiting\\Backend\\MemoryCache' => $baseDir . '/lib/private/Security/RateLimiting/Backend/MemoryCache.php', | |||
'OC\\Security\\RateLimiting\\Backend\\MemoryCacheBackend' => $baseDir . '/lib/private/Security/RateLimiting/Backend/MemoryCacheBackend.php', | |||
'OC\\Security\\RateLimiting\\Exception\\RateLimitExceededException' => $baseDir . '/lib/private/Security/RateLimiting/Exception/RateLimitExceededException.php', | |||
'OC\\Security\\RateLimiting\\Limiter' => $baseDir . '/lib/private/Security/RateLimiting/Limiter.php', | |||
'OC\\Security\\SecureRandom' => $baseDir . '/lib/private/Security/SecureRandom.php', |
@@ -1000,6 +1000,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c | |||
'OC\\Core\\Migrations\\Version21000Date20210309185126' => __DIR__ . '/../../..' . '/core/Migrations/Version21000Date20210309185126.php', | |||
'OC\\Core\\Migrations\\Version21000Date20210309185127' => __DIR__ . '/../../..' . '/core/Migrations/Version21000Date20210309185127.php', | |||
'OC\\Core\\Migrations\\Version22000Date20210216080825' => __DIR__ . '/../../..' . '/core/Migrations/Version22000Date20210216080825.php', | |||
'OC\\Core\\Migrations\\Version23000Date20210906132259' => __DIR__ . '/../../..' . '/core/Migrations/Version23000Date20210906132259.php', | |||
'OC\\Core\\Notification\\CoreNotifier' => __DIR__ . '/../../..' . '/core/Notification/CoreNotifier.php', | |||
'OC\\Core\\Service\\LoginFlowV2Service' => __DIR__ . '/../../..' . '/core/Service/LoginFlowV2Service.php', | |||
'OC\\DB\\Adapter' => __DIR__ . '/../../..' . '/lib/private/DB/Adapter.php', | |||
@@ -1396,8 +1397,9 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c | |||
'OC\\Security\\IdentityProof\\Manager' => __DIR__ . '/../../..' . '/lib/private/Security/IdentityProof/Manager.php', | |||
'OC\\Security\\IdentityProof\\Signer' => __DIR__ . '/../../..' . '/lib/private/Security/IdentityProof/Signer.php', | |||
'OC\\Security\\Normalizer\\IpAddress' => __DIR__ . '/../../..' . '/lib/private/Security/Normalizer/IpAddress.php', | |||
'OC\\Security\\RateLimiting\\Backend\\DatabaseBackend' => __DIR__ . '/../../..' . '/lib/private/Security/RateLimiting/Backend/DatabaseBackend.php', | |||
'OC\\Security\\RateLimiting\\Backend\\IBackend' => __DIR__ . '/../../..' . '/lib/private/Security/RateLimiting/Backend/IBackend.php', | |||
'OC\\Security\\RateLimiting\\Backend\\MemoryCache' => __DIR__ . '/../../..' . '/lib/private/Security/RateLimiting/Backend/MemoryCache.php', | |||
'OC\\Security\\RateLimiting\\Backend\\MemoryCacheBackend' => __DIR__ . '/../../..' . '/lib/private/Security/RateLimiting/Backend/MemoryCacheBackend.php', | |||
'OC\\Security\\RateLimiting\\Exception\\RateLimitExceededException' => __DIR__ . '/../../..' . '/lib/private/Security/RateLimiting/Exception/RateLimitExceededException.php', | |||
'OC\\Security\\RateLimiting\\Limiter' => __DIR__ . '/../../..' . '/lib/private/Security/RateLimiting/Limiter.php', | |||
'OC\\Security\\SecureRandom' => __DIR__ . '/../../..' . '/lib/private/Security/SecureRandom.php', |
@@ -0,0 +1,124 @@ | |||
<?php | |||
declare(strict_types=1); | |||
/** | |||
* @copyright Copyright (c) 2021 Lukas Reschke <lukas@statuscode.ch> | |||
* | |||
* @author 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\Security\RateLimiting\Backend; | |||
use OCP\AppFramework\Utility\ITimeFactory; | |||
use OCP\DB\QueryBuilder\IQueryBuilder; | |||
use OCP\IDBConnection; | |||
class DatabaseBackend implements IBackend { | |||
private const TABLE_NAME = 'ratelimit_entries'; | |||
/** @var IDBConnection */ | |||
private $dbConnection; | |||
/** @var ITimeFactory */ | |||
private $timeFactory; | |||
/** | |||
* @param IDBConnection $dbConnection | |||
* @param ITimeFactory $timeFactory | |||
*/ | |||
public function __construct( | |||
IDBConnection $dbConnection, | |||
ITimeFactory $timeFactory | |||
) { | |||
$this->dbConnection = $dbConnection; | |||
$this->timeFactory = $timeFactory; | |||
} | |||
/** | |||
* @param string $methodIdentifier | |||
* @param string $userIdentifier | |||
* @return string | |||
*/ | |||
private function hash(string $methodIdentifier, | |||
string $userIdentifier): string { | |||
return hash('sha512', $methodIdentifier . $userIdentifier); | |||
} | |||
/** | |||
* @param string $identifier | |||
* @param int $seconds | |||
* @return int | |||
* @throws \OCP\DB\Exception | |||
*/ | |||
private function getExistingAttemptCount( | |||
string $identifier | |||
): int { | |||
$currentTime = $this->timeFactory->getDateTime(); | |||
$qb = $this->dbConnection->getQueryBuilder(); | |||
$qb->delete(self::TABLE_NAME) | |||
->where( | |||
$qb->expr()->lte('delete_after', $qb->createNamedParameter($currentTime, IQueryBuilder::PARAM_DATE)) | |||
) | |||
->executeStatement(); | |||
$qb = $this->dbConnection->getQueryBuilder(); | |||
$qb->select($qb->func()->count()) | |||
->from(self::TABLE_NAME) | |||
->where( | |||
$qb->expr()->eq('hash', $qb->createNamedParameter($identifier, IQueryBuilder::PARAM_STR)) | |||
) | |||
->andWhere( | |||
$qb->expr()->gte('delete_after', $qb->createNamedParameter($currentTime, IQueryBuilder::PARAM_DATE)) | |||
); | |||
$cursor = $qb->executeQuery(); | |||
$row = $cursor->fetchOne(); | |||
$cursor->closeCursor(); | |||
return (int)$row; | |||
} | |||
/** | |||
* {@inheritDoc} | |||
*/ | |||
public function getAttempts(string $methodIdentifier, | |||
string $userIdentifier): int { | |||
$identifier = $this->hash($methodIdentifier, $userIdentifier); | |||
return $this->getExistingAttemptCount($identifier); | |||
} | |||
/** | |||
* {@inheritDoc} | |||
*/ | |||
public function registerAttempt(string $methodIdentifier, | |||
string $userIdentifier, | |||
int $period) { | |||
$identifier = $this->hash($methodIdentifier, $userIdentifier); | |||
$deleteAfter = $this->timeFactory->getDateTime()->add(new \DateInterval("PT{$period}S")); | |||
$qb = $this->dbConnection->getQueryBuilder(); | |||
$qb->insert(self::TABLE_NAME) | |||
->values([ | |||
'hash' => $qb->createNamedParameter($identifier, IQueryBuilder::PARAM_STR), | |||
'delete_after' => $qb->createNamedParameter($deleteAfter, IQueryBuilder::PARAM_DATE), | |||
]) | |||
->executeStatement(); | |||
} | |||
} |
@@ -35,16 +35,14 @@ namespace OC\Security\RateLimiting\Backend; | |||
*/ | |||
interface IBackend { | |||
/** | |||
* Gets the amount of attempts within the last specified seconds | |||
* Gets the number of attempts for the specified method | |||
* | |||
* @param string $methodIdentifier Identifier for the method | |||
* @param string $userIdentifier Identifier for the user | |||
* @param int $seconds Seconds to look back at | |||
* @return int | |||
*/ | |||
public function getAttempts(string $methodIdentifier, | |||
string $userIdentifier, | |||
int $seconds): int; | |||
string $userIdentifier): int; | |||
/** | |||
* Registers an attempt |
@@ -33,12 +33,12 @@ use OCP\ICache; | |||
use OCP\ICacheFactory; | |||
/** | |||
* Class MemoryCache uses the configured distributed memory cache for storing | |||
* Class MemoryCacheBackend uses the configured distributed memory cache for storing | |||
* rate limiting data. | |||
* | |||
* @package OC\Security\RateLimiting\Backend | |||
*/ | |||
class MemoryCache implements IBackend { | |||
class MemoryCacheBackend implements IBackend { | |||
/** @var ICache */ | |||
private $cache; | |||
/** @var ITimeFactory */ | |||
@@ -86,16 +86,14 @@ class MemoryCache implements IBackend { | |||
* {@inheritDoc} | |||
*/ | |||
public function getAttempts(string $methodIdentifier, | |||
string $userIdentifier, | |||
int $seconds): int { | |||
string $userIdentifier): int { | |||
$identifier = $this->hash($methodIdentifier, $userIdentifier); | |||
$existingAttempts = $this->getExistingAttempts($identifier); | |||
$count = 0; | |||
$currentTime = $this->timeFactory->getTime(); | |||
/** @var array $existingAttempts */ | |||
foreach ($existingAttempts as $attempt) { | |||
if (($attempt + $seconds) > $currentTime) { | |||
foreach ($existingAttempts as $expirationTime) { | |||
if ($expirationTime > $currentTime) { | |||
$count++; | |||
} | |||
} | |||
@@ -113,16 +111,16 @@ class MemoryCache implements IBackend { | |||
$existingAttempts = $this->getExistingAttempts($identifier); | |||
$currentTime = $this->timeFactory->getTime(); | |||
// Unset all attempts older than $period | |||
foreach ($existingAttempts as $key => $attempt) { | |||
if (($attempt + $period) < $currentTime) { | |||
// Unset all attempts that are already expired | |||
foreach ($existingAttempts as $key => $expirationTime) { | |||
if ($expirationTime < $currentTime) { | |||
unset($existingAttempts[$key]); | |||
} | |||
} | |||
$existingAttempts = array_values($existingAttempts); | |||
// Store the new attempt | |||
$existingAttempts[] = (string)$currentTime; | |||
$existingAttempts[] = (string)($currentTime + $period); | |||
$this->cache->set($identifier, json_encode($existingAttempts)); | |||
} | |||
} |
@@ -29,23 +29,17 @@ namespace OC\Security\RateLimiting; | |||
use OC\Security\Normalizer\IpAddress; | |||
use OC\Security\RateLimiting\Backend\IBackend; | |||
use OC\Security\RateLimiting\Exception\RateLimitExceededException; | |||
use OCP\AppFramework\Utility\ITimeFactory; | |||
use OCP\IUser; | |||
class Limiter { | |||
/** @var IBackend */ | |||
private $backend; | |||
/** @var ITimeFactory */ | |||
private $timeFactory; | |||
/** | |||
* @param ITimeFactory $timeFactory | |||
* @param IBackend $backend | |||
*/ | |||
public function __construct(ITimeFactory $timeFactory, | |||
IBackend $backend) { | |||
public function __construct(IBackend $backend) { | |||
$this->backend = $backend; | |||
$this->timeFactory = $timeFactory; | |||
} | |||
/** | |||
@@ -59,12 +53,12 @@ class Limiter { | |||
string $userIdentifier, | |||
int $period, | |||
int $limit): void { | |||
$existingAttempts = $this->backend->getAttempts($methodIdentifier, $userIdentifier, $period); | |||
$existingAttempts = $this->backend->getAttempts($methodIdentifier, $userIdentifier); | |||
if ($existingAttempts >= $limit) { | |||
throw new RateLimitExceededException(); | |||
} | |||
$this->backend->registerAttempt($methodIdentifier, $userIdentifier, $this->timeFactory->getTime()); | |||
$this->backend->registerAttempt($methodIdentifier, $userIdentifier, $period); | |||
} | |||
/** |
@@ -787,10 +787,20 @@ class Server extends ServerContainer implements IServerContainer { | |||
$this->registerDeprecatedAlias('Search', ISearch::class); | |||
$this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) { | |||
return new \OC\Security\RateLimiting\Backend\MemoryCache( | |||
$this->get(ICacheFactory::class), | |||
new \OC\AppFramework\Utility\TimeFactory() | |||
); | |||
$cacheFactory = $c->get(ICacheFactory::class); | |||
if ($cacheFactory->isAvailable()) { | |||
$backend = new \OC\Security\RateLimiting\Backend\MemoryCacheBackend( | |||
$this->get(ICacheFactory::class), | |||
new \OC\AppFramework\Utility\TimeFactory() | |||
); | |||
} else { | |||
$backend = new \OC\Security\RateLimiting\Backend\DatabaseBackend( | |||
$c->get(IDBConnection::class), | |||
new \OC\AppFramework\Utility\TimeFactory() | |||
); | |||
} | |||
return $backend; | |||
}); | |||
$this->registerAlias(\OCP\Security\ISecureRandom::class, SecureRandom::class); |
@@ -24,20 +24,20 @@ declare(strict_types=1); | |||
namespace Test\Security\RateLimiting\Backend; | |||
use OC\Security\RateLimiting\Backend\MemoryCache; | |||
use OC\Security\RateLimiting\Backend\MemoryCacheBackend; | |||
use OCP\AppFramework\Utility\ITimeFactory; | |||
use OCP\ICache; | |||
use OCP\ICacheFactory; | |||
use Test\TestCase; | |||
class MemoryCacheTest extends TestCase { | |||
class MemoryCacheBackendTest extends TestCase { | |||
/** @var ICacheFactory|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $cacheFactory; | |||
/** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $timeFactory; | |||
/** @var ICache|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $cache; | |||
/** @var MemoryCache */ | |||
/** @var MemoryCacheBackend */ | |||
private $memoryCache; | |||
protected function setUp(): void { | |||
@@ -50,10 +50,10 @@ class MemoryCacheTest extends TestCase { | |||
$this->cacheFactory | |||
->expects($this->once()) | |||
->method('createDistributed') | |||
->with('OC\Security\RateLimiting\Backend\MemoryCache') | |||
->with('OC\Security\RateLimiting\Backend\MemoryCacheBackend') | |||
->willReturn($this->cache); | |||
$this->memoryCache = new MemoryCache( | |||
$this->memoryCache = new MemoryCacheBackend( | |||
$this->cacheFactory, | |||
$this->timeFactory | |||
); | |||
@@ -66,7 +66,7 @@ class MemoryCacheTest extends TestCase { | |||
->with('eea460b8d756885099c7f0a4c083bf6a745069ee4a301984e726df58fd4510bffa2dac4b7fd5d835726a6753ffa8343ba31c7e902bbef78fc68c2e743667cb4b') | |||
->willReturn(null); | |||
$this->assertSame(0, $this->memoryCache->getAttempts('Method', 'User', 123)); | |||
$this->assertSame(0, $this->memoryCache->getAttempts('Method', 'User')); | |||
} | |||
public function testGetAttempts() { | |||
@@ -82,12 +82,12 @@ class MemoryCacheTest extends TestCase { | |||
'1', | |||
'2', | |||
'87', | |||
'123', | |||
'123', | |||
'124', | |||
'223', | |||
'223', | |||
'224', | |||
])); | |||
$this->assertSame(3, $this->memoryCache->getAttempts('Method', 'User', 123)); | |||
$this->assertSame(3, $this->memoryCache->getAttempts('Method', 'User')); | |||
} | |||
public function testRegisterAttemptWithNoAttemptsBefore() { | |||
@@ -106,7 +106,7 @@ class MemoryCacheTest extends TestCase { | |||
->method('set') | |||
->with( | |||
'eea460b8d756885099c7f0a4c083bf6a745069ee4a301984e726df58fd4510bffa2dac4b7fd5d835726a6753ffa8343ba31c7e902bbef78fc68c2e743667cb4b', | |||
json_encode(['123']) | |||
json_encode(['223']) | |||
); | |||
$this->memoryCache->registerAttempt('Method', 'User', 100); | |||
@@ -116,7 +116,7 @@ class MemoryCacheTest extends TestCase { | |||
$this->timeFactory | |||
->expects($this->once()) | |||
->method('getTime') | |||
->willReturn(129); | |||
->willReturn(86); | |||
$this->cache | |||
->expects($this->once()) | |||
@@ -140,7 +140,7 @@ class MemoryCacheTest extends TestCase { | |||
'123', | |||
'123', | |||
'124', | |||
'129', | |||
'186', | |||
]) | |||
); | |||
@@ -26,13 +26,10 @@ namespace Test\Security\RateLimiting; | |||
use OC\Security\RateLimiting\Backend\IBackend; | |||
use OC\Security\RateLimiting\Limiter; | |||
use OCP\AppFramework\Utility\ITimeFactory; | |||
use OCP\IUser; | |||
use Test\TestCase; | |||
class LimiterTest extends TestCase { | |||
/** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $timeFactory; | |||
/** @var IBackend|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $backend; | |||
/** @var Limiter */ | |||
@@ -41,11 +38,9 @@ class LimiterTest extends TestCase { | |||
protected function setUp(): void { | |||
parent::setUp(); | |||
$this->timeFactory = $this->createMock(ITimeFactory::class); | |||
$this->backend = $this->createMock(IBackend::class); | |||
$this->limiter = new Limiter( | |||
$this->timeFactory, | |||
$this->backend | |||
); | |||
} | |||
@@ -60,8 +55,7 @@ class LimiterTest extends TestCase { | |||
->method('getAttempts') | |||
->with( | |||
'MyIdentifier', | |||
'4664f0d9c88dcb7552be47b37bb52ce35977b2e60e1ac13757cf625f31f87050a41f3da064887fa87d49fd042e4c8eb20de8f10464877d3959677ab011b73a47', | |||
100 | |||
'4664f0d9c88dcb7552be47b37bb52ce35977b2e60e1ac13757cf625f31f87050a41f3da064887fa87d49fd042e4c8eb20de8f10464877d3959677ab011b73a47' | |||
) | |||
->willReturn(101); | |||
@@ -69,17 +63,12 @@ class LimiterTest extends TestCase { | |||
} | |||
public function testRegisterAnonRequestSuccess() { | |||
$this->timeFactory | |||
->expects($this->once()) | |||
->method('getTime') | |||
->willReturn(2000); | |||
$this->backend | |||
->expects($this->once()) | |||
->method('getAttempts') | |||
->with( | |||
'MyIdentifier', | |||
'4664f0d9c88dcb7552be47b37bb52ce35977b2e60e1ac13757cf625f31f87050a41f3da064887fa87d49fd042e4c8eb20de8f10464877d3959677ab011b73a47', | |||
100 | |||
'4664f0d9c88dcb7552be47b37bb52ce35977b2e60e1ac13757cf625f31f87050a41f3da064887fa87d49fd042e4c8eb20de8f10464877d3959677ab011b73a47' | |||
) | |||
->willReturn(99); | |||
$this->backend | |||
@@ -88,7 +77,7 @@ class LimiterTest extends TestCase { | |||
->with( | |||
'MyIdentifier', | |||
'4664f0d9c88dcb7552be47b37bb52ce35977b2e60e1ac13757cf625f31f87050a41f3da064887fa87d49fd042e4c8eb20de8f10464877d3959677ab011b73a47', | |||
2000 | |||
100 | |||
); | |||
$this->limiter->registerAnonRequest('MyIdentifier', 100, 100, '127.0.0.1'); | |||
@@ -110,8 +99,7 @@ class LimiterTest extends TestCase { | |||
->method('getAttempts') | |||
->with( | |||
'MyIdentifier', | |||
'ddb2ec50fa973fd49ecf3d816f677c8095143e944ad10485f30fb3dac85c13a346dace4dae2d0a15af91867320957bfd38a43d9eefbb74fe6919e15119b6d805', | |||
100 | |||
'ddb2ec50fa973fd49ecf3d816f677c8095143e944ad10485f30fb3dac85c13a346dace4dae2d0a15af91867320957bfd38a43d9eefbb74fe6919e15119b6d805' | |||
) | |||
->willReturn(101); | |||
@@ -126,17 +114,12 @@ class LimiterTest extends TestCase { | |||
->method('getUID') | |||
->willReturn('MyUid'); | |||
$this->timeFactory | |||
->expects($this->once()) | |||
->method('getTime') | |||
->willReturn(2000); | |||
$this->backend | |||
->expects($this->once()) | |||
->method('getAttempts') | |||
->with( | |||
'MyIdentifier', | |||
'ddb2ec50fa973fd49ecf3d816f677c8095143e944ad10485f30fb3dac85c13a346dace4dae2d0a15af91867320957bfd38a43d9eefbb74fe6919e15119b6d805', | |||
100 | |||
'ddb2ec50fa973fd49ecf3d816f677c8095143e944ad10485f30fb3dac85c13a346dace4dae2d0a15af91867320957bfd38a43d9eefbb74fe6919e15119b6d805' | |||
) | |||
->willReturn(99); | |||
$this->backend | |||
@@ -145,7 +128,7 @@ class LimiterTest extends TestCase { | |||
->with( | |||
'MyIdentifier', | |||
'ddb2ec50fa973fd49ecf3d816f677c8095143e944ad10485f30fb3dac85c13a346dace4dae2d0a15af91867320957bfd38a43d9eefbb74fe6919e15119b6d805', | |||
2000 | |||
100 | |||
); | |||
$this->limiter->registerUserRequest('MyIdentifier', 100, 100, $user); |
@@ -30,7 +30,7 @@ | |||
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel | |||
// when updating major/minor version number. | |||
$OC_Version = [23, 0, 0, 0]; | |||
$OC_Version = [23, 0, 0, 1]; | |||
// The human readable string | |||
$OC_VersionString = '23.0.0 alpha'; |