Fix custom trusted proxies configuration (#104)

Author: alexander-schranz

src/bref/src/LaravelHttpHandler.php

@@ -21,6 +21,8 @@ class LaravelHttpHandler extends HttpHandler
     public function __construct(Kernel $kernel)
     {
         $this->kernel = $kernel;
+
+        Request::setTrustedProxies(['127.0.0.1'], Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO);
     }
 
     public function handleRequest(HttpRequestEvent $event, Context $context): HttpResponse

src/bref/src/SymfonyHttpHandler.php

@@ -6,6 +6,7 @@
 use Bref\Event\Http\HttpHandler;
 use Bref\Event\Http\HttpRequestEvent;
 use Bref\Event\Http\HttpResponse;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\TerminableInterface;
 
@@ -21,6 +22,8 @@ class SymfonyHttpHandler extends HttpHandler
     public function __construct(HttpKernelInterface $kernel)
     {
         $this->kernel = $kernel;
+
+        Request::setTrustedProxies(['127.0.0.1'], Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO);
     }
 
     public function handleRequest(HttpRequestEvent $event, Context $context): HttpResponse

src/bref/src/SymfonyRequestBridge.php

@@ -22,8 +22,6 @@ class SymfonyRequestBridge
 {
     public static function convertRequest(HttpRequestEvent $event, Context $context): Request
     {
-        Request::setTrustedProxies(['127.0.0.1'], Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO);
-
         // CGI Version 1.1 - Section 4.1
         $server = array_filter([
             'AUTH_TYPE' => $event->getHeaders()['auth-type'] ?? null, // 4.1.1

src/bref/tests/SymfonyRequestBridgeTest.php

@@ -7,6 +7,7 @@
 use PHPUnit\Framework\TestCase;
 use Runtime\Bref\SymfonyRequestBridge;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Symfony\Component\HttpFoundation\Request;
 
 class SymfonyRequestBridgeTest extends TestCase
 {
@@ -150,6 +151,9 @@ public function testLambdaContext()
 
     private function getContext()
     {
+        // this is set in LaravelHttpHandler and SymfonyHttpHandler to allow overwrite of this value
+        Request::setTrustedProxies(['127.0.0.1'], Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO);
+
         return new Context('id', 1000, 'function', 'trace');
     }
 }