fix: fix APP_TRUST_PROXIES (#5955)

Signed-off-by: Alexis Saettler <[email protected]>

Author: asbiin

app/Console/Kernel.php

@@ -50,7 +50,7 @@ protected function schedule(Schedule $schedule)
         $this->scheduleCommand($schedule, 'monica:ping', 'daily');
         $this->scheduleCommand($schedule, 'monica:clean', 'daily');
         $this->scheduleCommand($schedule, 'monica:updategravatars', 'weekly');
-        if (config('monica.cloudflare')) {
+        if (config('app.cloudflare')) {
             $this->scheduleCommand($schedule, 'cloudflare:reload', 'daily');
         }
         $this->scheduleCommand($schedule, 'model:prune', 'daily');

app/Http/Kernel.php

@@ -14,7 +14,7 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $middleware = [
-        \Monicahq\Cloudflare\Http\Middleware\TrustProxies::class,
+        \App\Http\Middleware\TrustProxies::class,
         \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,

app/Http/Middleware/TrustProxies.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Monicahq\Cloudflare\Http\Middleware\TrustProxies as Middleware;
+
+class TrustProxies extends Middleware
+{
+    /**
+     * Get the trusted proxies.
+     *
+     * @return array|string|null
+     */
+    protected function proxies()
+    {
+        return config('app.trust_proxies');
+    }
+}

app/Providers/AppServiceProvider.php

@@ -114,7 +114,7 @@ public function boot()
         });
 
         LaravelCloudflare::getProxiesUsing(function (): array {
-            return config('monica.cloudflare') ? CloudflareProxies::load() : [];
+            return config('app.cloudflare') ? CloudflareProxies::load() : [];
         });
     }
 

config/app.php

@@ -139,6 +139,28 @@
 
     'password_rules' => env('APP_PASSWORD_RULES', 'mixedCase,letters,numbers,symbols,uncompromised'),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Trust proxies
+    |--------------------------------------------------------------------------
+    |
+    | List of trusted proxies.
+    | Example: set it to '*' to allow any proxy.
+    |
+    */
+
+    'trust_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/monica.php

@@ -284,12 +284,4 @@
     */
     'export_size' => (int) env('EXPORT_SIZE', 5),
 
-    /*
-    |--------------------------------------------------------------------------
-    | Enable cloudflare trusted proxies
-    |--------------------------------------------------------------------------
-    |
-    */
-    'cloudflare' => (bool) env('APP_TRUSTED_CLOUDFLARE', false),
-
 ];