Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>tags/v21.0.0beta1
@@ -1239,6 +1239,7 @@ return array( | |||
'OC\\Remote\\User' => $baseDir . '/lib/private/Remote/User.php', | |||
'OC\\Repair' => $baseDir . '/lib/private/Repair.php', | |||
'OC\\RepairException' => $baseDir . '/lib/private/RepairException.php', | |||
'OC\\Repair\\AddBruteForceCleanupJob' => $baseDir . '/lib/private/Repair/AddBruteForceCleanupJob.php', | |||
'OC\\Repair\\AddCleanupUpdaterBackupsJob' => $baseDir . '/lib/private/Repair/AddCleanupUpdaterBackupsJob.php', | |||
'OC\\Repair\\CleanTags' => $baseDir . '/lib/private/Repair/CleanTags.php', | |||
'OC\\Repair\\ClearFrontendCaches' => $baseDir . '/lib/private/Repair/ClearFrontendCaches.php', | |||
@@ -1275,6 +1276,7 @@ return array( | |||
'OC\\Search\\SearchComposer' => $baseDir . '/lib/private/Search/SearchComposer.php', | |||
'OC\\Search\\SearchQuery' => $baseDir . '/lib/private/Search/SearchQuery.php', | |||
'OC\\Security\\Bruteforce\\Capabilities' => $baseDir . '/lib/private/Security/Bruteforce/Capabilities.php', | |||
'OC\\Security\\Bruteforce\\CleanupJob' => $baseDir . '/lib/private/Security/Bruteforce/CleanupJob.php', | |||
'OC\\Security\\Bruteforce\\Throttler' => $baseDir . '/lib/private/Security/Bruteforce/Throttler.php', | |||
'OC\\Security\\CSP\\ContentSecurityPolicy' => $baseDir . '/lib/private/Security/CSP/ContentSecurityPolicy.php', | |||
'OC\\Security\\CSP\\ContentSecurityPolicyManager' => $baseDir . '/lib/private/Security/CSP/ContentSecurityPolicyManager.php', |
@@ -1268,6 +1268,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c | |||
'OC\\Remote\\User' => __DIR__ . '/../../..' . '/lib/private/Remote/User.php', | |||
'OC\\Repair' => __DIR__ . '/../../..' . '/lib/private/Repair.php', | |||
'OC\\RepairException' => __DIR__ . '/../../..' . '/lib/private/RepairException.php', | |||
'OC\\Repair\\AddBruteForceCleanupJob' => __DIR__ . '/../../..' . '/lib/private/Repair/AddBruteForceCleanupJob.php', | |||
'OC\\Repair\\AddCleanupUpdaterBackupsJob' => __DIR__ . '/../../..' . '/lib/private/Repair/AddCleanupUpdaterBackupsJob.php', | |||
'OC\\Repair\\CleanTags' => __DIR__ . '/../../..' . '/lib/private/Repair/CleanTags.php', | |||
'OC\\Repair\\ClearFrontendCaches' => __DIR__ . '/../../..' . '/lib/private/Repair/ClearFrontendCaches.php', | |||
@@ -1304,6 +1305,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c | |||
'OC\\Search\\SearchComposer' => __DIR__ . '/../../..' . '/lib/private/Search/SearchComposer.php', | |||
'OC\\Search\\SearchQuery' => __DIR__ . '/../../..' . '/lib/private/Search/SearchQuery.php', | |||
'OC\\Security\\Bruteforce\\Capabilities' => __DIR__ . '/../../..' . '/lib/private/Security/Bruteforce/Capabilities.php', | |||
'OC\\Security\\Bruteforce\\CleanupJob' => __DIR__ . '/../../..' . '/lib/private/Security/Bruteforce/CleanupJob.php', | |||
'OC\\Security\\Bruteforce\\Throttler' => __DIR__ . '/../../..' . '/lib/private/Security/Bruteforce/Throttler.php', | |||
'OC\\Security\\CSP\\ContentSecurityPolicy' => __DIR__ . '/../../..' . '/lib/private/Security/CSP/ContentSecurityPolicy.php', | |||
'OC\\Security\\CSP\\ContentSecurityPolicyManager' => __DIR__ . '/../../..' . '/lib/private/Security/CSP/ContentSecurityPolicyManager.php', |
@@ -35,6 +35,7 @@ | |||
namespace OC; | |||
use OC\Avatar\AvatarManager; | |||
use OC\Repair\AddBruteForceCleanupJob; | |||
use OC\Repair\AddCleanupUpdaterBackupsJob; | |||
use OC\Repair\CleanTags; | |||
use OC\Repair\ClearFrontendCaches; | |||
@@ -162,6 +163,7 @@ class Repair implements IOutput { | |||
\OC::$server->query(EncryptionLegacyCipher::class), | |||
\OC::$server->query(EncryptionMigration::class), | |||
\OC::$server->get(ShippedDashboardEnable::class), | |||
\OC::$server->get(AddBruteForceCleanupJob::class), | |||
]; | |||
} | |||
@@ -0,0 +1,49 @@ | |||
<?php | |||
declare(strict_types=1); | |||
/** | |||
* @copyright Copyright (c) 2020, 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\Repair; | |||
use OC\Security\Bruteforce\CleanupJob; | |||
use OCP\BackgroundJob\IJobList; | |||
use OCP\Migration\IOutput; | |||
use OCP\Migration\IRepairStep; | |||
class AddBruteForceCleanupJob implements IRepairStep { | |||
/** @var IJobList */ | |||
protected $jobList; | |||
public function __construct(IJobList $jobList) { | |||
$this->jobList = $jobList; | |||
} | |||
public function getName() { | |||
return 'Add job to cleanup the bruteforce entries'; | |||
} | |||
public function run(IOutput $output) { | |||
$this->jobList->add(CleanupJob::class); | |||
} | |||
} |
@@ -0,0 +1,55 @@ | |||
<?php | |||
declare(strict_types=1); | |||
/** | |||
* @copyright Copyright (c) 2020, 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\Security\Bruteforce; | |||
use OCP\AppFramework\Utility\ITimeFactory; | |||
use OCP\BackgroundJob\TimedJob; | |||
use OCP\DB\QueryBuilder\IQueryBuilder; | |||
use OCP\IDBConnection; | |||
class CleanupJob extends TimedJob { | |||
/** @var IDBConnection */ | |||
private $connection; | |||
public function __construct(ITimeFactory $time, IDBConnection $connection) { | |||
parent::__construct($time); | |||
$this->connection = $connection; | |||
// Run once a day | |||
$this->setInterval(3600 * 24); | |||
} | |||
protected function run($argument) { | |||
// Delete all entries more than 48 hours old | |||
$time = $this->time->getTime() - (48 * 3600); | |||
$qb = $this->connection->getQueryBuilder(); | |||
$qb->delete('bruteforce_attempts') | |||
->where($qb->expr()->lt('occurred', $qb->createNamedParameter($time), IQueryBuilder::PARAM_INT)); | |||
$qb->execute(); | |||
} | |||
} |
@@ -29,7 +29,7 @@ | |||
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel | |||
// when updating major/minor version number. | |||
$OC_Version = [21, 0, 0, 0]; | |||
$OC_Version = [21, 0, 0, 1]; | |||
// The human readable string | |||
$OC_VersionString = '21.0.0 alpha'; |