Handle not cached IPs

mchev · Feb 21, 2023 · b9e48ac · b9e48ac
1 parent b99044d
commit b9e48ac
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/IP.php b/src/IP.php
@@ -10,7 +10,7 @@ class IP
 {
     public static function ban(string|array $ips): void
     {
-        $bannedIps = Cache::get('banned-ips');
+        $bannedIps = self::getBannedIPsFromCache();
 
         foreach ((array) $ips as $ip) {
             if (! in_array($ip, $bannedIps)) {
@@ -43,4 +43,11 @@ public static function banned(): Builder
             ->notExpired()
             ->groupBy('ip');
     }
+
+    public function getBannedIPsFromCache(): Array
+    {
+        return Cache::has('banned-ips')
+            ? Cache::get('banned-ips')
+            : self::self::banned()->pluck('ip')->toArray();
+    }
 }
diff --git a/src/Middleware/IPBanned.php b/src/Middleware/IPBanned.php
@@ -10,7 +10,7 @@ class IPBanned
 {
     public function handle($request, Closure $next): Response
     {
-        if ($request->ip() && in_array($request->ip(), Cache::get('banned-ips'))) {
+        if ($request->ip() && in_array($request->ip(), IP::getBannedIPsFromCache())) {
             return (config('ban.fallback_url'))
                 ? redirect(config('ban.fallback_url'))
                 : abort(403, config('ban.message'));

diff --git a/src/Middleware/LogoutBanned.php b/src/Middleware/LogoutBanned.php
@@ -11,7 +11,7 @@ class LogoutBanned
     public function handle($request, Closure $next): Response
     {
         if ($request->user() && $request->user()->isBanned()
-            || $request->ip() && in_array($request->ip(), Cache::get('banned-ips'))) {
+            || $request->ip() && in_array($request->ip(), IP::getBannedIPsFromCache())) {
             if ($request->user()) {
                 auth()->logout();
                 $request->session()->invalidate();