From 981adc9a24a39d3754cc8ebbd286ba480fb37b52 Mon Sep 17 00:00:00 2001 From: Marcel Pociot Date: Mon, 27 Apr 2020 12:28:05 +0200 Subject: [PATCH] wip --- .../Http/Controllers/TunnelMessageController.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/Server/Http/Controllers/TunnelMessageController.php b/app/Server/Http/Controllers/TunnelMessageController.php index f25a93a..20e4b50 100644 --- a/app/Server/Http/Controllers/TunnelMessageController.php +++ b/app/Server/Http/Controllers/TunnelMessageController.php @@ -83,12 +83,18 @@ class TunnelMessageController extends PostController { $request::setTrustedProxies([$controlConnection->socket->remoteAddress, '127.0.0.1'], Request::HEADER_X_FORWARDED_ALL); + $host = $this->configuration->hostname(); + + if (! $request->isSecure()) { + $host .= ":{$this->configuration->port()}"; + } + $request->headers->set('Host', $controlConnection->host); $request->headers->set('X-Forwarded-Proto', $request->isSecure() ? 'https' : 'http'); $request->headers->set('X-Expose-Request-ID', uniqid()); - $request->headers->set('Upgrade-Insecure-Requests', true); + $request->headers->set('Upgrade-Insecure-Requests', 1); $request->headers->set('X-Exposed-By', config('app.name') . ' '. config('app.version')); - $request->headers->set('X-Original-Host', "{$controlConnection->subdomain}.{$this->configuration->hostname()}:{$this->configuration->port()}"); + $request->headers->set('X-Original-Host', "{$controlConnection->subdomain}.{$host}"); return $request; }