Merge pull request #4 from josiasmontag/laravel-9

Laravel 9
jdavidbakr · Feb 23, 2022 · 7a2fea0 · 7a2fea0
2 parents 259a294 + 221613a
commit 7a2fea0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -14,13 +14,13 @@
         "role": "Developer"
     }],
     "require": {
-        "illuminate/support": "5.6.*|5.7.*|5.8.*|6.*|7.*|8.*",
+        "illuminate/support": "5.6.*|5.7.*|5.8.*|6.*|7.*|8.*|^9.0",
         "guzzlehttp/guzzle": "^6.3|^7.0"
     },
     "require-dev": {
         "mockery/mockery": "~1.0",
-        "phpunit/phpunit": "~7.0|~8.0",
-        "orchestra/testbench": "~3.0|~4.0|~5.0|6.x-dev"
+        "phpunit/phpunit": "~7.0|~8.0|^9.0",
+        "orchestra/testbench": "~3.0|~4.0|~5.0|~6.0|^7.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/config/cloudfront-proxies.php b/config/cloudfront-proxies.php
@@ -11,5 +11,9 @@
     /**
      * Headers defined in the TrustProxies class
      */
-    'trust-proxies-headers' => Request::HEADER_X_FORWARDED_ALL,
+    'trust-proxies-headers' => Request::HEADER_X_FORWARDED_FOR |
+        Request::HEADER_X_FORWARDED_HOST |
+        Request::HEADER_X_FORWARDED_PORT |
+        Request::HEADER_X_FORWARDED_PROTO |
+        Request::HEADER_X_FORWARDED_AWS_ELB,
 ];
diff --git a/tests/CloudfrontProxiesTest.php b/tests/CloudfrontProxiesTest.php
@@ -12,7 +12,11 @@ class CloudfrontProxiesTest extends BaseTestCase
     protected function getEnvironmentSetUp($app)
     {
         $app['config']->set('cloudfront-proxies.ip-range-data-url', 'https://ip-ranges.amazonaws.com/ip-ranges.json');
-        $app['config']->set('cloudfront-proxies.trust-proxies-headers', Request::HEADER_X_FORWARDED_ALL);
+        $app['config']->set('cloudfront-proxies.trust-proxies-headers', Request::HEADER_X_FORWARDED_FOR |
+            Request::HEADER_X_FORWARDED_HOST |
+            Request::HEADER_X_FORWARDED_PORT |
+            Request::HEADER_X_FORWARDED_PROTO |
+            Request::HEADER_X_FORWARDED_AWS_ELB);
     }
 
     /**
@@ -73,7 +77,11 @@ public function it_retains_existing_trusted_ip_addresses()
             ], // server
             null // content
         );
-        $request->setTrustedProxies(['123.45.67/8'], Request::HEADER_X_FORWARDED_ALL);
+        $request->setTrustedProxies(['123.45.67/8'], Request::HEADER_X_FORWARDED_FOR |
+            Request::HEADER_X_FORWARDED_HOST |
+            Request::HEADER_X_FORWARDED_PORT |
+            Request::HEADER_X_FORWARDED_PROTO |
+            Request::HEADER_X_FORWARDED_AWS_ELB);
         $middleware = new CloudfrontProxies;
         $mock = Mockery::mock(Guzzle::class);
         $response = Mockery::mock(ResponseInterface::class);