Merge pull request #3060 from CachetHQ/trusted-proxies

configure trusted proxies via env
cachethq · Jun 1, 2018 · 18459d7 · 18459d7
2 parents 525bc7f + 2a57bb9
commit 18459d7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 30 deletions.
diff --git a/.env.example b/.env.example
@@ -39,3 +39,5 @@ GITHUB_TOKEN=null
 NEXMO_KEY=null
 NEXMO_SECRET=null
 NEXMO_SMS_FROM=Cachet
+
+TRUSTED_PROXIES=
diff --git a/config/trustedproxy.php b/config/trustedproxy.php
@@ -27,36 +27,7 @@
     |
     */
 
-    'proxies' => [
-        '103.21.244.0/22',
-        '103.22.200.0/22',
-        '103.31.4.0/22',
-        '104.16.0.0/12',
-        '108.162.192.0/18',
-        '131.0.72.0/22',
-        '141.101.64.0/18',
-        '162.158.0.0/15',
-        '172.64.0.0/13',
-        '173.245.48.0/20',
-        '188.114.96.0/20',
-        '190.93.240.0/20',
-        '197.234.240.0/22',
-        '198.41.128.0/17',
-        '199.27.128.0/21',
-        '2400:cb00::/32',
-        '2405:8100::/32',
-        '2405:b500::/32',
-        '2606:4700::/32',
-        '2803:f800::/32',
-        '2c0f:f248::/32',
-        '2a06:98c0::/29',
-
-        // Local IPs
-        '10.0.0.0/8',
-        '172.16.0.0/12',
-        '192.168.0.0/16',
-        'fc00::/7',
-    ],
+    'proxies' => empty(env('TRUSTED_PROXIES')) ? '*' : explode(',', trim(env('TRUSTED_PROXIES'))),
 
     /*
     |--------------------------------------------------------------------------