diff --git a/docker-compose.yml b/docker-compose.yml index 0599ca8545..a139da027b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,6 +10,15 @@ services: ports: - "9307:3306" + adminer: + image: adminer + container_name: abuse-adminer + restart: always + ports: + - 9506:8080 + networks: + - abuse + redis: image: redis:6.0-alpine container_name: redis diff --git a/tests/Abuse/Base.php b/tests/Abuse/Base.php index 1b88f411f6..2b7e291bed 100644 --- a/tests/Abuse/Base.php +++ b/tests/Abuse/Base.php @@ -53,11 +53,11 @@ abstract class Base extends TestCase public function testCleanup(): void { - // Check that there is only one log + // Check that there are 3 logs $logs = $this->abuse->getLogs(0, 10); $this->assertEquals(3, \count($logs)); - sleep(5); + sleep(2); // Delete the log $status = $this->abuse->cleanup($this->getCleanupDateTime()); diff --git a/tests/Abuse/Bench/Database/TimeLimitBench.php b/tests/Abuse/Bench/Database.php similarity index 94% rename from tests/Abuse/Bench/Database/TimeLimitBench.php rename to tests/Abuse/Bench/Database.php index 0525c44d81..a24c9ed4a7 100644 --- a/tests/Abuse/Bench/Database/TimeLimitBench.php +++ b/tests/Abuse/Bench/Database.php @@ -1,6 +1,6 @@ redis = new Client(null, ['redis-cluster-0:6379', 'redis-cluster-1:6379', 'redis-cluster-2:6379', 'redis-cluster-3:6379']); + $this->adapter = new RedisCluster('login-attempt-from-{{ip}}', 3, 60 * 5, $this->redis); + $this->abuse = new Abuse($this->adapter); + } +} diff --git a/tests/Abuse/DatabaseTest.php b/tests/Abuse/DatabaseTest.php index f4a9252caa..8ca37426bf 100755 --- a/tests/Abuse/DatabaseTest.php +++ b/tests/Abuse/DatabaseTest.php @@ -45,7 +45,6 @@ class DatabaseTest extends Base $adapter->setParam('{{ip}}', '127.0.0.1'); $this->abuse = new Abuse($adapter); - $this->abuse->cleanup($this->getCleanupDateTime()); } public function getAdapter(string $key, int $limit, int $seconds): Adapter @@ -55,6 +54,6 @@ class DatabaseTest extends Base public function getCleanupDateTime(): string { - return DateTime::addSeconds(new \DateTime(), -1); + return DateTime::format(new \DateTime()); } } diff --git a/tests/Abuse/RedisClusterTest.php b/tests/Abuse/RedisClusterTest.php index 3d39c56667..ba1a60da96 100644 --- a/tests/Abuse/RedisClusterTest.php +++ b/tests/Abuse/RedisClusterTest.php @@ -23,7 +23,6 @@ class RedisClusterTest extends Base $adapter = new TimeLimit('login-attempt-from-{{ip}}', 3, 1, $this->redis); $adapter->setParam('{{ip}}', '127.0.0.1'); $this->abuse = new Abuse($adapter); - $this->abuse->cleanup($this->getCleanupDateTime()); } public function getAdapter(string $key, int $limit, int $seconds): Adapter @@ -33,7 +32,7 @@ class RedisClusterTest extends Base public function getCleanupDateTime(): string { - $interval = DateInterval::createFromDateString(1 . ' seconds'); + $interval = DateInterval::createFromDateString('now'); return strval((new \DateTime())->sub($interval)->getTimestamp()); } } diff --git a/tests/Abuse/RedisTest.php b/tests/Abuse/RedisTest.php index 8423db8608..e0bf69858a 100644 --- a/tests/Abuse/RedisTest.php +++ b/tests/Abuse/RedisTest.php @@ -24,7 +24,6 @@ class RedisTest extends Base $adapter = new TimeLimit('login-attempt-from-{{ip}}', 3, 1, $this->redis); $adapter->setParam('{{ip}}', '127.0.0.1'); $this->abuse = new Abuse($adapter); - $this->abuse->cleanup($this->getCleanupDateTime()); } public function getAdapter(string $key, int $limit, int $seconds): Adapter @@ -34,7 +33,7 @@ class RedisTest extends Base public function getCleanupDateTime(): string { - $interval = DateInterval::createFromDateString(1 . ' seconds'); + $interval = DateInterval::createFromDateString('now'); return strval((new \DateTime())->sub($interval)->getTimestamp()); } }