!!!TASK: Remove deprecated Http objects and replace with PSR-7 implementation

Neos.Flow/Classes/Command/RoutingCommandController.php

@@ -11,6 +11,8 @@
  * source code.
  */
 
+use GuzzleHttp\Psr7\ServerRequest;
+use GuzzleHttp\Psr7\Uri;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Cli\CommandController;
 use Neos\Flow\Configuration\ConfigurationManager;
@@ -179,7 +181,7 @@ public function routePathCommand(string $path, string $method = 'GET')
             'REQUEST_URI' => $path,
             'REQUEST_METHOD' => $method
         ];
-        $httpRequest = new Request([], [], [], $server);
+        $httpRequest = new ServerRequest($method, new Uri('http://localhost/'), [], '', '1.1', $server);
         $routeContext = new RouteContext($httpRequest, RouteParameters::createEmpty());
 
         /** @var Route $route */
@@ -201,7 +203,7 @@ public function routePathCommand(string $path, string $method = 'GET')
                 $this->outputLine('  Action: ' . (isset($routeValues['@action']) ? $routeValues['@action'] : '-'));
                 $this->outputLine('  Format: ' . (isset($routeValues['@format']) ? $routeValues['@format'] : '-'));
 
-                $controllerObjectName = $this->getControllerObjectName($routeValues['@package'], (isset($routeValues['@subpackage']) ? $routeValues['@subpackage'] : null), $routeValues['@controller']);
+                $controllerObjectName = $this->getControllerObjectName($routeValues['@package'], (isset($routeValues['@subpackage']) ? $routeValues['@subpackage'] : ''), $routeValues['@controller']);
                 if ($controllerObjectName === null) {
                     $this->outputLine('<b>Controller Error:</b>');
                     $this->outputLine('  !!! No Controller Object found !!!');

Neos.Flow/Classes/Core/Booting/Scripts.php

@@ -309,10 +309,11 @@ protected static function initializeExceptionStorage(Bootstrap $bootstrap): Thro
                 return $output;
             }
 
-            $request = RequestInformationHelper::renderRequest($requestHandler->getHttpRequest());
-            $response = (string)$requestHandler->getHttpResponse();
-            $output .= PHP_EOL . 'HTTP REQUEST:' . PHP_EOL . ($request == '' ? '[request was empty]' : $request) . PHP_EOL;
-            $output .= PHP_EOL . 'HTTP RESPONSE:' . PHP_EOL . ($response == '' ? '[response was empty]' : $response) . PHP_EOL;
+            $request = $requestHandler->getHttpRequest();
+            $response = $requestHandler->getHttpResponse();
+            // TODO: Sensible error output
+            $output .= PHP_EOL . 'HTTP REQUEST:' . PHP_EOL . ($request ? '[request was empty]' : RequestInformationHelper::renderRequestHeaders($request)) . PHP_EOL;
+            $output .= PHP_EOL . 'HTTP RESPONSE:' . PHP_EOL . ($response ? '[response was empty]' : $response->getStatusCode()) . PHP_EOL;
             $output .= PHP_EOL . 'PHP PROCESS:' . PHP_EOL . 'Inode: ' . getmyinode() . PHP_EOL . 'PID: ' . getmypid() . PHP_EOL . 'UID: ' . getmyuid() . PHP_EOL . 'GID: ' . getmygid() . PHP_EOL . 'User: ' . get_current_user() . PHP_EOL;
 
             return $output;

Neos.Flow/Classes/Error/AbstractExceptionHandler.php

@@ -11,11 +11,11 @@
  * source code.
  */
 
+use GuzzleHttp\Psr7\ServerRequest;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Cli\Response as CliResponse;
 use Neos\Flow\Exception as FlowException;
 use Neos\Flow\Http\Helper\ResponseInformationHelper;
-use Neos\Flow\Http\Request;
 use Neos\Flow\Log\SystemLoggerInterface;
 use Neos\Flow\Log\ThrowableStorageInterface;
 use Neos\Flow\Mvc\ActionRequest;
@@ -166,7 +166,7 @@ protected function buildView(\Throwable $exception, array $renderingOptions): Vi
         $view = $viewClassName::createWithOptions($renderingOptions['viewOptions']);
         $view = $this->applyLegacyViewOptions($view, $renderingOptions);
 
-        $httpRequest = Request::createFromEnvironment();
+        $httpRequest = ServerRequest::fromGlobals();
         $request = new ActionRequest($httpRequest);
         $request->setControllerPackageKey('Neos.Flow');
         $uriBuilder = new UriBuilder();

Neos.Flow/Classes/Http/Client/Browser.php

@@ -11,12 +11,14 @@
  * source code.
  */
 
+use GuzzleHttp\Psr7\ServerRequest;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Http\Headers;
 use Neos\Flow\Http\Response;
 use Neos\Flow\Http\Uri;
 use Neos\Flow\Http\Request;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\UploadedFileInterface;
 use Symfony\Component\DomCrawler\Crawler;
 use Symfony\Component\DomCrawler\Form;
 
@@ -121,7 +123,7 @@ public function removeAutomaticRequestHeader($name)
      * @param string|Uri $uri
      * @param string $method Request method, for example "GET"
      * @param array $arguments Arguments to send in the request body
-     * @param array $files
+     * @param UploadedFileInterface[] $files
      * @param array $server
      * @param string $content
      * @return Response The HTTP response
@@ -138,11 +140,14 @@ public function request($uri, $method = 'GET', array $arguments = [], array $fil
             throw new \InvalidArgumentException('$uri must be a URI object or a valid string representation of a URI.', 1333443624);
         }
 
-        $request = Request::create($uri, $method, $arguments, $files, $server);
-
-        if ($content !== null) {
-            $request->setContent($content);
+        $request = new ServerRequest($method, $uri, [], $content, '1.1', $server);
+        if (!empty($arguments)) {
+            $request = $request->withQueryParams($arguments);
+        }
+        if (!empty($files)) {
+            $request = $request->withUploadedFiles($files);
         }
+
         $response = $this->sendRequest($request);
 
         $location = $response->getHeader('Location');

Neos.Flow/Classes/Http/Component/BaseUriComponent.php

@@ -0,0 +1,51 @@
+<?php
+namespace Neos\Flow\Http\Component;
+
+use GuzzleHttp\Psr7\Uri;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Configuration\ConfigurationManager;
+use Neos\Flow\Http\Helper\RequestInformationHelper;
+use Neos\Flow\Http\HttpRequestHandlerInterface;
+use Neos\Flow\ObjectManagement\ObjectManagerInterface;
+
+/**
+ * Defines the baseUri attribute for the current request.
+ *
+ * This is done after the TrustedProxiesComponent to make sure
+ * the proxy headers are evaluated correctly.
+ */
+class BaseUriComponent implements ComponentInterface
+{
+    /**
+     * @Flow\Inject
+     * @var ObjectManagerInterface
+     */
+    protected $objectManager;
+
+    /**
+     * @inheritDoc
+     */
+    public function handle(ComponentContext $componentContext)
+    {
+        $request = $componentContext->getHttpRequest();
+        $baseUri = RequestInformationHelper::generateBaseUri($request);
+        $baseUriSetting = self::getConfiguredBaseUri($this->objectManager);
+        if (!empty($baseUriSetting)) {
+            $baseUri = new Uri($baseUriSetting);
+        }
+
+        $request = $request->withAttribute(HttpRequestHandlerInterface::ATTRIBUTE_BASE_URI, $baseUri);
+        $componentContext->replaceHttpRequest($request);
+    }
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     * @return string
+     * @throws \Neos\Flow\Configuration\Exception\InvalidConfigurationTypeException
+     */
+    public static function getConfiguredBaseUri(ObjectManagerInterface $objectManager): string
+    {
+        return (string)$objectManager->get(ConfigurationManager::class)->getConfiguration(ConfigurationManager::CONFIGURATION_TYPE_SETTINGS, 'Neos.Flow.http.baseUri');
+    }
+
+}

Neos.Flow/Classes/Http/Component/PoweredByComponent.php

@@ -0,0 +1,99 @@
+<?php
+namespace Neos\Flow\Http\Component;
+
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Configuration\ConfigurationManager;
+use Neos\Flow\ObjectManagement\ObjectManagerInterface;
+use Neos\Flow\Package\PackageManager;
+
+/**
+ * Adds the "X-Flow-Powered" to the response.
+ */
+class PoweredByComponent implements ComponentInterface
+{
+    /**
+     * @Flow\Inject
+     * @var ObjectManagerInterface
+     */
+    protected $objectManager;
+
+    /**
+     * @inheritDoc
+     */
+    public function handle(ComponentContext $componentContext)
+    {
+        $token = static::prepareApplicationToken($this->objectManager);
+        if ($token === '') {
+            return;
+        }
+
+        $response = $componentContext->getHttpResponse();
+        $response = $response->withAddedHeader('X-Flow-Powered', $token);
+        $componentContext->replaceHttpResponse($response);
+    }
+
+    /**
+     * Renders a major version out of a full version string
+     *
+     * @param string $version For example "2.3.7"
+     * @return string For example "2"
+     */
+    protected static function renderMajorVersion($version)
+    {
+        preg_match('/^(\d+)/', $version, $versionMatches);
+
+        return isset($versionMatches[1]) ? $versionMatches[1] : '';
+    }
+
+    /**
+     * Renders a minor version out of a full version string
+     *
+     * @param string $version For example "2.3.7"
+     * @return string For example "2.3"
+     */
+    protected static function renderMinorVersion($version)
+    {
+        preg_match('/^(\d+\.\d+)/', $version, $versionMatches);
+
+        return isset($versionMatches[1]) ? $versionMatches[1] : '';
+    }
+
+    /**
+     * Generate an application information header for the response based on settings and package versions.
+     * Will statically compile in production for performance benefits.
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @return string
+     * @throws \Neos\Flow\Configuration\Exception\InvalidConfigurationTypeException
+     * @Flow\CompileStatic
+     */
+    public static function prepareApplicationToken(ObjectManagerInterface $objectManager): string
+    {
+        $configurationManager = $objectManager->get(ConfigurationManager::class);
+        $tokenSetting = $configurationManager->getConfiguration(ConfigurationManager::CONFIGURATION_TYPE_SETTINGS, 'Neos.Flow.http.applicationToken');
+
+        if (!in_array($tokenSetting, ['ApplicationName', 'MinorVersion', 'MajorVersion'])) {
+            return '';
+        }
+
+        $applicationPackageKey = $configurationManager->getConfiguration(ConfigurationManager::CONFIGURATION_TYPE_SETTINGS, 'Neos.Flow.core.applicationPackageKey');
+        $applicationName = $configurationManager->getConfiguration(ConfigurationManager::CONFIGURATION_TYPE_SETTINGS, 'Neos.Flow.core.applicationName');
+        $applicationIsNotFlow = ($applicationPackageKey !== 'Neos.Flow');
+
+        if ($tokenSetting === 'ApplicationName') {
+            return 'Flow' . ($applicationIsNotFlow ? ' ' . $applicationName : '');
+        }
+
+        $packageManager = $objectManager->get(PackageManager::class);
+        $flowPackage = $packageManager->getPackage('Neos.Flow');
+        $applicationPackage = $applicationIsNotFlow ? $packageManager->getPackage($applicationPackageKey) : null;
+
+        // At this point the $tokenSetting must be either "MinorVersion" or "MajorVersion" so lets use it.
+
+        $versionRenderer = 'render' . $tokenSetting;
+        $flowVersion = static::$versionRenderer($flowPackage->getInstalledVersion());
+        $applicationVersion = $applicationIsNotFlow ? static::$versionRenderer($applicationPackage->getInstalledVersion()) : null;
+
+        return 'Flow/' . ($flowVersion ?: 'dev') . ($applicationIsNotFlow ? ' ' . $applicationName . '/' . ($applicationVersion ?: 'dev') : '');
+    }
+}

Neos.Flow/Classes/Http/Component/TrustedProxiesComponent.php

@@ -12,7 +12,7 @@
  */
 
 use Neos\Flow\Annotations as Flow;
-use Neos\Flow\Http\Request;
+use Neos\Flow\Http\HttpRequestHandlerInterface;
 use Neos\Flow\Utility\Ip as IpUtility;
 use Psr\Http\Message\ServerRequestInterface;
 
@@ -46,9 +46,9 @@ public function handle(ComponentContext $componentContext)
     {
         $request = $componentContext->getHttpRequest();
 
-        $trustedRequest = $request->withAttribute(Request::ATTRIBUTE_TRUSTED_PROXY, $this->isFromTrustedProxy($request));
+        $trustedRequest = $request->withAttribute(HttpRequestHandlerInterface::ATTRIBUTE_TRUSTED_PROXY, $this->isFromTrustedProxy($request));
 
-        $trustedRequest = $trustedRequest->withAttribute(Request::ATTRIBUTE_CLIENT_IP, $this->getTrustedClientIpAddress($trustedRequest));
+        $trustedRequest = $trustedRequest->withAttribute(HttpRequestHandlerInterface::ATTRIBUTE_CLIENT_IP, $this->getTrustedClientIpAddress($trustedRequest));
 
         $protocolHeader = $this->getFirstTrustedProxyHeaderValue(self::HEADER_PROTOCOL, $trustedRequest);
         if ($protocolHeader !== null) {
@@ -94,10 +94,10 @@ protected function unquoteArray($array): array
 
     /**
      * @param string $type The header value type to retrieve from the Forwarded header value. One of the HEADER_* constants.
-     * @param string $headerValue The Forwarded header value, e.g. "for=192.168.178.5; host=www.acme.org:8080"
+     * @param array $headerValues The Forwarded header value, e.g. "for=192.168.178.5; host=www.acme.org:8080"
      * @return array|null The array of values for the header type or null if the header
      */
-    protected function getForwardedHeader($type, $headerValue)
+    protected function getForwardedHeader($type, array $headerValues)
     {
         $patterns = [
             self::HEADER_CLIENT_IP => self::FOR_PATTERN,
@@ -107,6 +107,7 @@ protected function getForwardedHeader($type, $headerValue)
         if (!isset($patterns[$type])) {
             return null;
         }
+        $headerValue = reset($headerValues);
         preg_match_all('/' . $patterns[$type] . '/i', $headerValue, $matches);
         $matchedHeader = $this->unquoteArray($matches[1]);
         if ($matchedHeader === []) {
@@ -129,7 +130,7 @@ protected function getTrustedProxyHeaderValues($type, ServerRequestInterface $re
         } else {
             $trustedHeaders = $this->settings['headers'][$type] ?? '';
         }
-        if ($trustedHeaders === '' || !$request->getAttribute(Request::ATTRIBUTE_TRUSTED_PROXY)) {
+        if ($trustedHeaders === '' || !$request->getAttribute(HttpRequestHandlerInterface::ATTRIBUTE_TRUSTED_PROXY)) {
             yield null;
             return;
         }
@@ -145,7 +146,7 @@ protected function getTrustedProxyHeaderValues($type, ServerRequestInterface $re
                     yield $forwardedHeaderValue;
                 }
             } else {
-                yield array_map('trim', explode(',', $request->getHeader($trustedHeader)));
+                yield array_map('trim', explode(', ', implode(',', $request->getHeader($trustedHeader))));
             }
         }
 

Neos.Flow/Classes/Http/Helper/RequestInformationHelper.php

@@ -55,6 +55,7 @@ public static function getScriptRequestPath(ServerRequestInterface $request): st
         // FIXME: Shouldn't this be a simple dirname on getScriptRequestPathAndFilename
         $requestPathSegments = explode('/', self::getScriptRequestPathAndFilename($request));
         array_pop($requestPathSegments);
+
         return implode('/', $requestPathSegments) . '/';
     }
 
@@ -139,4 +140,45 @@ public static function getContentCharset(RequestInterface $request): string
 
         return '';
     }
+
+    /**
+     * @param RequestInterface $request
+     * @param string $headerName
+     * @return string
+     */
+    public static function getFirstRequestHeaderValue(RequestInterface $request, string $headerName):? string
+    {
+        $headerValues = $request->getHeader($headerName);
+        $firstHeaderValue = reset($headerValues);
+
+        return $firstHeaderValue;
+    }
+
+    /**
+     * Extract header key/value pairs from a $_SERVER array.
+     *
+     * @param array $server
+     * @return array
+     */
+    public static function extractHeadersFromServerVariables(array $server): array
+    {
+        $headerFields = [];
+        if (isset($server['PHP_AUTH_USER']) && isset($server['PHP_AUTH_PW'])) {
+            $headerFields['Authorization'] = 'Basic ' . base64_encode($server['PHP_AUTH_USER'] . ':' . $server['PHP_AUTH_PW']);
+        }
+
+        foreach ($server as $name => $value) {
+            if (strpos($name, 'HTTP_') === 0) {
+                $name = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))));
+                $headerFields[$name] = $value;
+            } elseif ($name == 'REDIRECT_REMOTE_AUTHORIZATION' && !isset($headerFields['Authorization'])) {
+                $headerFields['Authorization'] = $value;
+            } elseif (in_array($name, ['CONTENT_TYPE', 'CONTENT_LENGTH'])) {
+                $name = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', $name))));
+                $headerFields[$name] = $value;
+            }
+        }
+
+        return $headerFields;
+    }
 }

Neos.Flow/Classes/Http/Helper/ResponseInformationHelper.php

@@ -182,8 +182,8 @@ public static function prepareHeaders(ResponseInterface $response): array
         if ($headers instanceof Headers) {
             $preparedHeaders = array_merge($preparedHeaders, $headers->getPreparedValues());
         } else {
-            foreach (array_keys($headers) as $name) {
-                $preparedHeaders[] = $response->getHeaderLine($name);
+            foreach ($response->getHeaders() as $name => $values) {
+                $preparedHeaders[] = $name . ': ' . implode(', ', $values);
             }
         }