This commit is contained in:
Marcel Pociot
2020-04-18 00:13:56 +02:00
parent 97dcd2ab1e
commit 1f8865145f
3 changed files with 6 additions and 7 deletions

View File

@@ -5,13 +5,14 @@ namespace App\Server\Messages\RequestModifiers;
use App\Server\Connections\Connection; use App\Server\Connections\Connection;
use App\Server\Connections\ConnectionManager; use App\Server\Connections\ConnectionManager;
use GuzzleHttp\Psr7\Request; use GuzzleHttp\Psr7\Request;
use Psr\Http\Message\RequestInterface;
use function GuzzleHttp\Psr7\modify_request; use function GuzzleHttp\Psr7\modify_request;
class ModifyHeaders implements RequestModifier class ModifyHeaders implements RequestModifier
{ {
public function modify(Request $request, string $requestId, Connection $clientConnection, ConnectionManager $connectionManager): Request public function modify(RequestInterface $request, string $requestId, Connection $clientConnection, ConnectionManager $connectionManager): RequestInterface
{ {
$request = modify_request($request, [ return modify_request($request, [
'set_headers' => [ 'set_headers' => [
'Host' => $clientConnection->host, 'Host' => $clientConnection->host,
'X-Expose-Request-ID' => $requestId, 'X-Expose-Request-ID' => $requestId,
@@ -19,7 +20,5 @@ class ModifyHeaders implements RequestModifier
'X-Original-Host' => "{$clientConnection->subdomain}.{$connectionManager->host()}:{$connectionManager->port()}", 'X-Original-Host' => "{$clientConnection->subdomain}.{$connectionManager->host()}:{$connectionManager->port()}",
] ]
]); ]);
return $request;
} }
} }

View File

@@ -4,9 +4,9 @@ namespace App\Server\Messages\RequestModifiers;
use App\Server\Connections\Connection; use App\Server\Connections\Connection;
use App\Server\Connections\ConnectionManager; use App\Server\Connections\ConnectionManager;
use GuzzleHttp\Psr7\Request; use Psr\Http\Message\RequestInterface;
interface RequestModifier interface RequestModifier
{ {
public function modify(Request $request, string $requestId, Connection $clientConnection, ConnectionManager $connectionManager): Request; public function modify(RequestInterface $request, string $requestId, Connection $clientConnection, ConnectionManager $connectionManager): RequestInterface;
} }

View File

@@ -6,7 +6,7 @@ use App\Server\Connections\Connection;
use App\Server\Connections\ConnectionManager; use App\Server\Connections\ConnectionManager;
use App\Server\Connections\HttpRequestConnection; use App\Server\Connections\HttpRequestConnection;
use App\Server\Connections\IoConnection; use App\Server\Connections\IoConnection;
use App\Server\Messages\RequestModifiers\ModifyHostHeader; use App\Server\Messages\RequestModifiers\ModifyHeaders;
use BFunky\HttpParser\HttpRequestParser; use BFunky\HttpParser\HttpRequestParser;
use GuzzleHttp\Psr7\Request; use GuzzleHttp\Psr7\Request;
use GuzzleHttp\Psr7\Response; use GuzzleHttp\Psr7\Response;