Fixed leak state server

Author: root-aza

composer.json

@@ -41,10 +41,11 @@
         "ext-json": "*",
         "psr/http-factory": "^1.0.1",
         "psr/http-message": "^1.0.1 || ^2.0",
+        "roadrunner-php/roadrunner-api-dto": "^1.6",
         "spiral/roadrunner": "^2023.3 || ^2024.1 || ^2025.1",
         "spiral/roadrunner-worker": "^3.5",
-        "roadrunner-php/roadrunner-api-dto": "^1.6",
-        "symfony/polyfill-php83": "^1.29"
+        "symfony/polyfill-php83": "^1.29",
+        "symfony/var-dumper": "^6.4"
     },
     "require-dev": {
         "jetbrains/phpstorm-attributes": "^1.0",

src/GlobalState.php

@@ -19,31 +19,33 @@ final class GlobalState
      */
     public static function populateServer(Request $request): array
     {
-        static $server = [];
+        static $originalServer = null;
 
-        if ([] == $server) {
-            $server = $_SERVER;
+        if ($originalServer == null) {
+            $originalServer = $_SERVER;
         }
 
-        $server['REQUEST_URI'] = $request->uri;
-        $server['REQUEST_TIME'] = time();
-        $server['REQUEST_TIME_FLOAT'] = microtime(true);
-        $server['REMOTE_ADDR'] = $request->getRemoteAddr();
-        $server['REQUEST_METHOD'] = $request->method;
-        $server['HTTP_USER_AGENT'] = '';
+        $newServer = $originalServer;
+
+        $newServer['REQUEST_URI'] = $request->uri;
+        $newServer['REQUEST_TIME'] = time();
+        $newServer['REQUEST_TIME_FLOAT'] = microtime(true);
+        $newServer['REMOTE_ADDR'] = $request->getRemoteAddr();
+        $newServer['REQUEST_METHOD'] = $request->method;
+        $newServer['HTTP_USER_AGENT'] = '';
 
         foreach ($request->headers as $key => $value) {
             $key = strtoupper(str_replace('-', '_', $key));
 
             if ($key == 'CONTENT_TYPE' || $key == 'CONTENT_LENGTH') {
-                $server[$key] = implode(', ', $value);
+                $newServer[$key] = implode(', ', $value);
 
                 continue;
             }
 
-            $server['HTTP_' . $key] = implode(', ', $value);
+            $newServer['HTTP_' . $key] = implode(', ', $value);
         }
 
-        return $server;
+        return $newServer;
     }
 }

tests/Unit/PSR7WorkerTest.php

@@ -2,61 +2,65 @@
 
 declare(strict_types=1);
 
-namespace Spiral\RoadRunner\Tests\Http\Unit;
-
 use Nyholm\Psr7\Factory\Psr17Factory;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use Spiral\Goridge\Frame;
-use Spiral\RoadRunner\Http\HttpWorker;
+use Spiral\RoadRunner\Http\GlobalState;
 use Spiral\RoadRunner\Http\PSR7Worker;
 use Spiral\RoadRunner\Tests\Http\Unit\Stub\TestRelay;
 use Spiral\RoadRunner\Worker;
 
+
+#[CoversClass(PSR7Worker::class)]
+#[CoversClass(GlobalState::class)]
 final class PSR7WorkerTest extends TestCase
 {
-    /**
+    /***
      * @param array $headers
-     *
-     * @dataProvider testStateLeakDataProvider
      */
-    public function testStateLeak(array $headers): void
+    public function testStateServerLeak(): void
     {
         $psrFactory = new Psr17Factory();
         $relay      = new TestRelay();
-
-        $body = [
-            'headers' => $headers,
-            'rawQuery' => '',
-            'remoteAddr' => '127.0.0.1',
-            'protocol' => 'HTTP/1.1',
-            'method' => 'GET',
-            'uri' => 'http://localhost',
-            'parsed' => false,
-        ];
-
-        $head = (string)\json_encode($body, \JSON_THROW_ON_ERROR);
-        $frame = new Frame($head .'test', [\strlen($head)]);
-
-        $relay->addFrames($frame);
-
-        $psrWorker = new PSR7Worker(
+        $psrWorker  = new PSR7Worker(
             new Worker($relay),
             $psrFactory,
             $psrFactory,
             $psrFactory,
         );
 
-        $psrWorker->waitRequest();
+        //dataProvider is always random and we need to keep the order
+        $fixtures = [
+            [['Content-Type' => ['application/html'], 'Connection' => ['keep-alive']], ['REQUEST_URI' => 'http://localhost', 'REMOTE_ADDR' => '127.0.0.1', 'REQUEST_METHOD' => 'GET', 'HTTP_USER_AGENT' => '', 'CONTENT_TYPE' => 'application/html', 'HTTP_CONNECTION' => 'keep-alive',]],
+            [['Content-Type' => ['application/json']], ['REQUEST_URI' => 'http://localhost', 'REMOTE_ADDR' => '127.0.0.1', 'REQUEST_METHOD' => 'GET', 'HTTP_USER_AGENT' => '', 'CONTENT_TYPE' => 'application/json']],
+        ];
 
+        foreach ($fixtures as [$headers, $expectedServer]) {
+            $body = [
+                'headers' => $headers,
+                'rawQuery' => '',
+                'remoteAddr' => '127.0.0.1',
+                'protocol' => 'HTTP/1.1',
+                'method' => 'GET',
+                'uri' => 'http://localhost',
+                'parsed' => false,
+            ];
 
-        var_dump($_SERVER);
-    }
+            $head = (string)\json_encode($body, \JSON_THROW_ON_ERROR);
+            $frame = new Frame($head .'test', [\strlen($head)]);
 
+            $relay->addFrames($frame);
 
-    public static function testStateLeakDataProvider(): iterable
-    {
-        yield [['Content-Type' => ['application/json'], 'Accept' => ['application/html']]];
-        yield [['Content-Type' => ['application/json']]];
+            $_SERVER = [];
+
+            $psrWorker->waitRequest();
+
+            unset($_SERVER['REQUEST_TIME']);
+            unset($_SERVER['REQUEST_TIME_FLOAT']);
+
+            self::assertEquals($expectedServer, $_SERVER);
+        }
     }