fix: fix laravel cloudflare proxy (#6264)

Author: asbiin

app/Http/Middleware/TrustProxies.php

@@ -13,6 +13,6 @@ class TrustProxies extends Middleware
      */
     protected function proxies()
     {
-        return config('app.trust_proxies');
+        return config('app.trust_proxies') ?? $this->proxies;
     }
 }

app/Providers/AppServiceProvider.php

@@ -15,12 +15,10 @@
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Cache\RateLimiting\Limit;
 use Illuminate\Validation\Rules\Password;
-use Monicahq\Cloudflare\LaravelCloudflare;
 use Illuminate\Support\Facades\RateLimiter;
 use Illuminate\Auth\Notifications\VerifyEmail;
 use Werk365\EtagConditionals\EtagConditionals;
 use Illuminate\Auth\Notifications\ResetPassword;
-use Monicahq\Cloudflare\Facades\CloudflareProxies;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -114,10 +112,6 @@ public function boot()
                 return sha1($url);
             });
         });
-
-        LaravelCloudflare::getProxiesUsing(function (): array {
-            return config('app.cloudflare') ? CloudflareProxies::load() : [];
-        });
     }
 
     /**

composer.lock

@@ -151,16 +151,6 @@
 
     'trust_proxies' => env('APP_TRUSTED_PROXIES', env('APP_TRUST_PROXIES')),
 
-    /*
-    |--------------------------------------------------------------------------
-    | Enable cloudflare trusted proxies
-    |--------------------------------------------------------------------------
-    |
-    | Enable to trust cloudflare proxies.
-    |
-    */
-    'cloudflare' => (bool) env('APP_TRUSTED_CLOUDFLARE', false),
-
     /*
     |--------------------------------------------------------------------------
     | Autoloaded Service Providers

config/app.php

@@ -0,0 +1,62 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Enable or disable the middleware proxy and the reload
+    |--------------------------------------------------------------------------
+    |
+    | If you set it to false, the middleware and the reload command will never
+    | be executed.
+    |
+    */
+
+    'enabled' => (bool) env('LARAVEL_CLOUDFLARE_ENABLED', env('APP_TRUSTED_CLOUDFLARE', false)),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Name of the cache to store values of the proxies
+    |--------------------------------------------------------------------------
+    |
+    | This value is the key used in the cache (table, redis, etc.) to store the
+    | values.
+    |
+    */
+
+    'cache' => 'cloudflare.proxies',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Cloudflare main url
+    |--------------------------------------------------------------------------
+    |
+    | This is the url for the cloudflare api.
+    |
+    */
+
+    'url' => 'https://www.cloudflare.com',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Cloudflare uri for ipv4 ips response
+    |--------------------------------------------------------------------------
+    |
+    | This is the path to get the values of ipv4 ips from Cloudflare.
+    |
+    */
+
+    'ipv4-path' => 'ips-v4',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Cloudflare uri for ipv6 ips response
+    |--------------------------------------------------------------------------
+    |
+    | This is the path to get the values of ipv6 ips from Cloudflare.
+    |
+    */
+
+    'ipv6-path' => 'ips-v6',
+
+];

config/debugbar.php

@@ -72,5 +72,6 @@
     <env name="MAIL_PORT" value=""/>
     <env name="MAIL_ENCRYPTION" value=""/>
     <env name="APP_EMAIL_NEW_USERS_NOTIFICATION" value=""/>
+    <env name="LARAVEL_CLOUDFLARE_ENABLED" value="false"/>
   </php>
 </phpunit>