Fix max requests per minute

abrahamfast · Feb 13, 2023 · b8a894b · b8a894b
1 parent ecbf63a
commit b8a894b
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 13 deletions.
diff --git a/src/Services/IpUtils.php b/src/Services/IpUtils.php
@@ -10,7 +10,7 @@ trait IpUtils
 
     public function getIpAddress(): string|null
     {
-        if ($this->ipAddress !== null) {
+        if ($this->ipAddress !== null && filled($this->ipAddress)) {
             return $this->ipAddress;
         }
 
@@ -20,13 +20,13 @@ public function getIpAddress(): string|null
             $this->ipAddress = $this->removePortFromIPv4($this->ipAddress);
         }
 
-        if ($this->ipAddress !== null) {
+        if ($this->ipAddress !== null && filled($this->ipAddress)) {
             return $this->ipAddress;
         }
 
         $this->ipAddress = request()->ip();
 
-        if ($this->ipAddress !== null) {
+        if ($this->ipAddress !== null && filled($this->ipAddress)) {
             return $this->ipAddress;
         }
 

diff --git a/src/Services/Middleware.php b/src/Services/Middleware.php
@@ -152,11 +152,7 @@ public function blockAttackAttemps(): string
 
         $rateLimitingKey = $this->rateLimitingKey();
 
-        $response = RateLimiter::attempt(
-            $rateLimitingKey,
-            $this->config('attacks.max-per-minute', 30),
-            fn() => 'allow',
-        );
+        $response = RateLimiter::attempt($rateLimitingKey, $this->maxRequestsPerMinute(), fn() => 'allow');
 
         if ($response !== 'allow' && ($ipAddress = $this->getIpAddress()) !== null) {
             $this->addIpAddressToBlockList($ipAddress);
@@ -175,7 +171,14 @@ public function addIpAddressToBlockList(string $ipAddress): void
 
         $ipAddresses[] = $ipAddress;
 
-        $domain->block = implode("\n", $ipAddresses);
+        if (count($ipAddresses) > dd($this->config('attacks.max-blocked-ip-addresses', 500))) {
+            return;
+        }
+
+        $domain->block = collect($ipAddresses)
+            ->unique()
+            ->filter()
+            ->implode("\n");
 
         $domain->save();
     }

diff --git a/src/Services/Responder.php b/src/Services/Responder.php
@@ -10,7 +10,7 @@ class Responder
     public function respond(array $data = []): mixed
     {
         if ($data['code'] === 200) {
-            return;
+            return null;
         }
 
         if ($data['should_abort']) {

diff --git a/src/Services/TwillFirewall.php b/src/Services/TwillFirewall.php
@@ -80,14 +80,19 @@ public function blockAttacks(bool $force = false): string|null
 
     public function addBlockedToBlockList(bool $force = false): string|null
     {
-        return $this->get('attacks.add_blocked_to_list', 'add_blocked_to_list', $force);
+        return $this->get('attacks.add-blocked-to-list', 'add_blocked_to_list', $force);
     }
 
     public function published(bool $force = false): string|null
     {
         return $this->get('enabled', 'published', $force);
     }
 
+    public function maxRequestsPerMinute(bool $force = false): string|null
+    {
+        return $this->get('attacks.max_requests_per_minute', 'max_requests_per_minute', $force);
+    }
+
     public function get(string $configKey, string $databaseColumn, bool $force = false): string|null
     {
         if (!$force && (!$this->isConfigured() || !$this->enabled())) {

diff --git a/src/config/twill-firewall.php b/src/config/twill-firewall.php
@@ -61,8 +61,9 @@
 
     'attacks' => [
         'block' => env('TWILL_BLOCK_ATTACKS_ENABLED', false),
-        'add_blocked_to_list' => env('TWILL_ADD_BLOCKED_TO_BLOCK_LIST', false),
-        'max-per-minute' => env('TWILL_BLOCK_ATTACKS_RATE_PER_MIUTE', 30),
+        'add-blocked-to-list' => env('TWILL_ADD_BLOCKED_TO_BLOCK_LIST', false),
+        'max-per-minute' => env('TWILL_BLOCK_ATTACKS_RATE_PER_MINUTE', 30),
+        'max-automatic-ip-addresses' => env('TWILL_BLOCK_ATTACKS_MAX_IPS', 1000),
     ],
 
     'responses' => [