Store host port in connection data fixes beyondcode|expose#42

app/Client/Client.php

@@ -93,17 +93,19 @@ public function connectToServer(string $sharedUrl, $subdomain, $serverHost = nul
 
         $exposeVersion = config('app.version');
 
+        $serverPort = $this->configuration->port();
+
         $wsProtocol = $this->configuration->port() === 443 ? 'wss' : 'ws';
 
         connect($wsProtocol."://{$this->configuration->host()}:{$this->configuration->port()}/expose/control?authToken={$authToken}&version={$exposeVersion}", [], [
             'X-Expose-Control' => 'enabled',
         ], $this->loop)
-            ->then(function (WebSocket $clientConnection) use ($sharedUrl, $subdomain, $serverHost, $deferred, $authToken) {
+            ->then(function (WebSocket $clientConnection) use ($sharedUrl, $subdomain, $serverHost, $serverPort, $deferred, $authToken) {
                 $this->connectionRetries = 0;
 
                 $connection = ControlConnection::create($clientConnection);
 
-                $connection->authenticate($sharedUrl, $subdomain, $serverHost);
+                $connection->authenticate($sharedUrl, $subdomain, $serverHost, $serverPort);
 
                 $clientConnection->on('close', function () use ($sharedUrl, $subdomain, $serverHost, $authToken) {
                     $this->logger->error('Connection to server closed.');

app/Client/Connections/ControlConnection.php

@@ -57,14 +57,15 @@ public function createTcpProxy($data)
         $this->proxyManager->createTcpProxy($this->clientId, $data);
     }
 
-    public function authenticate(string $sharedHost, string $subdomain, $serverHost = null)
+    public function authenticate(string $sharedHost, string $subdomain, $serverHost = null, $serverPort = null)
     {
         $this->socket->send(json_encode([
             'event' => 'authenticate',
             'data' => [
                 'type' => 'http',
                 'host' => $sharedHost,
                 'server_host' => $serverHost,
+                'server_port' => $serverPort,
                 'subdomain' => empty($subdomain) ? null : $subdomain,
             ],
         ]));

app/Contracts/ConnectionManager.php

@@ -8,7 +8,7 @@
 
 interface ConnectionManager
 {
-    public function storeConnection(string $host, ?string $subdomain, ?string $serverHost, ConnectionInterface $connection): ControlConnection;
+    public function storeConnection(string $host, ?string $subdomain, ?string $serverHost, ?string $serverPort, ConnectionInterface $connection): ControlConnection;
 
     public function storeTcpConnection(int $port, ConnectionInterface $connection): ControlConnection;
 

app/Server/Connections/ConnectionManager.php

@@ -53,7 +53,7 @@ public function limitConnectionLength(ControlConnection $connection, int $maximu
         });
     }
 
-    public function storeConnection(string $host, ?string $subdomain, ?string $serverHost, ConnectionInterface $connection): ControlConnection
+    public function storeConnection(string $host, ?string $subdomain, ?string $serverHost, ?string $serverPort, ConnectionInterface $connection): ControlConnection
     {
         $clientId = (string) uniqid();
 
@@ -65,6 +65,7 @@ public function storeConnection(string $host, ?string $subdomain, ?string $serve
             $subdomain ?? $this->subdomainGenerator->generateSubdomain(),
             $clientId,
             $serverHost,
+            $serverPort,
             $this->getAuthTokenFromConnection($connection)
         );
 

app/Server/Connections/ControlConnection.php

@@ -14,6 +14,7 @@ class ControlConnection
     public $socket;
     public $host;
     public $serverHost;
+    public $serverPort;
     public $authToken;
     public $subdomain;
     public $client_id;
@@ -22,14 +23,15 @@ class ControlConnection
     public $proxies = [];
     protected $shared_at;
 
-    public function __construct(ConnectionInterface $socket, string $host, string $subdomain, string $clientId, string $serverHost, string $authToken = '')
+    public function __construct(ConnectionInterface $socket, string $host, string $subdomain, string $clientId, string $serverHost, string $serverPort = '', string $authToken = '')
     {
         $this->socket = $socket;
         $this->host = $host;
         $this->subdomain = $subdomain;
         $this->client_id = $clientId;
         $this->authToken = $authToken;
         $this->serverHost = $serverHost;
+        $this->serverPort = $serverPort;
         $this->shared_at = now()->toDateTimeString();
         $this->client_version = QueryParameters::create($socket->httpRequest)->get('version');
     }
@@ -69,6 +71,7 @@ public function toArray()
             'host' => $this->host,
             'remote_address' => $this->socket->remoteAddress ?? null,
             'server_host' => $this->serverHost,
+            'server_port' => $this->serverPort,
             'client_id' => $this->client_id,
             'client_version' => $this->client_version,
             'auth_token' => $this->authToken,

app/Server/Http/Controllers/ControlMessageController.php

@@ -183,7 +183,7 @@ protected function handleHttpConnection(ConnectionInterface $connection, $data,
 
                 $data->subdomain = $subdomain;
 
-                $connectionInfo = $this->connectionManager->storeConnection($data->host, $data->subdomain, $data->server_host, $connection);
+                $connectionInfo = $this->connectionManager->storeConnection($data->host, $data->subdomain, $data->server_host, $data->server_port, $connection);
 
                 $this->connectionManager->limitConnectionLength($connectionInfo, config('expose.admin.maximum_connection_length'));
 

resources/views/server/sites/index.twig

@@ -29,7 +29,7 @@
                                 @{ site.host }
                             </td>
                             <td class="px-6 py-4 whitespace-no-wrap border-b border-gray-200 text-sm leading-5 text-gray-500">
-                                @{ site.subdomain }.{{ configuration.hostname()}}:{{ configuration.port() }}
+                                @{ site.subdomain }.@{ site.server_host}:@{ site.server_port }
                             </td>
                             <td class="px-6 py-4 whitespace-no-wrap border-b border-gray-200 text-sm leading-5 text-gray-500">
                                 @{ site.user?.name }