upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-20 00:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 38

Apply suggestions from code review

Browse source 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Co-authored-by: Joas Schilling <213943+nickvergessen@users.noreply.github.com>
This commit is contained in:
Lukas Reschke 2021-09-13 10:43:01 +02:00 committed by GitHub
parent 471167019c
commit 358eaba7dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/Migrations/Version23000Date20210906132259.php
View file

@ -31,13 +31,14 @@ class Version23000Date20210906132259 extends SimpleMigrationStep {
'notnull' => true,
'length' => 128,
]);
$table->addColumn('delete_after', 'datetime', [
$table->addColumn('delete_after', Types::DATETIME, [
'notnull' => true,
]);
$table->addIndex(['hash'], 'ratelimit_hash_idx');
$table->addIndex(['delete_after'], 'ratelimit_delete_after_idx');
return $schema;
}
return $schema;
return null;
}
}

12
lib/private/Security/RateLimiting/Backend/DatabaseBackend.php
View file

@ -73,21 +73,19 @@ class DatabaseBackend implements IBackend {
$qb = $this->dbConnection->getQueryBuilder();
$qb->delete(self::TABLE_NAME)
->where(
$qb->expr()->lte('delete_after', $qb->createParameter('currentTime'))
)
->setParameter('currentTime', $currentTime, 'datetime')
$qb->expr()->lte('delete_after', $qb->createNamedParameter($currentTime, IQueryBuilder::PARAM_DATE))
);
->executeStatement();
$qb = $this->dbConnection->getQueryBuilder();
$qb->selectAlias($qb->createFunction('COUNT(*)'), 'count')
$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->createParameter('currentTime'))
)
->setParameter('currentTime', $currentTime, 'datetime');
$qb->expr()->gte('delete_after', $qb->createNamedParameter($currentTime, IQueryBuilder::PARAM_DATE))
);
$cursor = $qb->executeQuery();
$row = $cursor->fetch();