Merge branch 'master' into tcp

app/Server/Connections/ConnectionManager.php

@@ -4,6 +4,7 @@ namespace App\Server\Connections;
 
 use App\Contracts\ConnectionManager as ConnectionManagerContract;
 use App\Contracts\SubdomainGenerator;
+use App\Http\QueryParameters;
 use Ratchet\ConnectionInterface;
 use React\EventLoop\LoopInterface;
 use React\Socket\Server;
@@ -47,7 +48,13 @@ class ConnectionManager implements ConnectionManagerContract
 
         $connection->client_id = $clientId;
 
-        $storedConnection = new ControlConnection($connection, $host, $subdomain ?? $this->subdomainGenerator->generateSubdomain(), $clientId);
+        $storedConnection = new ControlConnection(
+            $connection,
+            $host,
+            $subdomain ?? $this->subdomainGenerator->generateSubdomain(),
+            $clientId,
+            $this->getAuthTokenFromConnection($connection)
+        );
 
         $this->connections[] = $storedConnection;
 
@@ -60,7 +67,13 @@ class ConnectionManager implements ConnectionManagerContract
 
         $connection->client_id = $clientId;
 
-        $storedConnection = new TcpControlConnection($connection, $port, $this->getSharedTcpServer(), $clientId);
+        $storedConnection = new TcpControlConnection(
+            $connection,
+            $port,
+            $this->getSharedTcpServer(),
+            $clientId,
+            $this->getAuthTokenFromConnection($connection)
+        );
 
         $this->connections[] = $storedConnection;
 
@@ -118,4 +131,21 @@ class ConnectionManager implements ConnectionManagerContract
     {
         return $this->connections;
     }
+
+    protected function getAuthTokenFromConnection(ConnectionInterface $connection): string
+    {
+        return QueryParameters::create($connection->httpRequest)->get('authToken');
+    }
+
+    public function getConnectionsForAuthToken(string $authToken): array
+    {
+        return collect($this->connections)
+            ->filter(function ($connection) use ($authToken) {
+                return $connection->authToken === $authToken;
+            })
+            ->map(function ($connection) {
+                return $connection->toArray();
+            })
+            ->toArray();
+    }
 }

app/Server/Connections/ControlConnection.php

@@ -12,17 +12,19 @@ class ControlConnection
     /** @var ConnectionInterface */
     public $socket;
     public $host;
+    public $authToken;
     public $subdomain;
     public $client_id;
     public $proxies = [];
     protected $shared_at;
 
-    public function __construct(ConnectionInterface $socket, string $host, string $subdomain, string $clientId)
+    public function __construct(ConnectionInterface $socket, string $host, string $subdomain, string $clientId, string $authToken = '')
     {
         $this->socket = $socket;
         $this->host = $host;
         $this->subdomain = $subdomain;
         $this->client_id = $clientId;
+        $this->authToken = $authToken;
         $this->shared_at = now()->toDateTimeString();
     }
 
@@ -58,6 +60,7 @@ class ControlConnection
             'type' => 'http',
             'host' => $this->host,
             'client_id' => $this->client_id,
+            'auth_token' => $this->authToken,
             'subdomain' => $this->subdomain,
             'shared_at' => $this->shared_at,
         ];

app/Server/Connections/TcpControlConnection.php

@@ -14,7 +14,7 @@ class TcpControlConnection extends ControlConnection
     public $shared_port;
     public $shared_server;
 
-    public function __construct(ConnectionInterface $socket, int $port, Server $sharedServer, string $clientId)
+    public function __construct(ConnectionInterface $socket, int $port, Server $sharedServer, string $clientId, string $authToken = '')
     {
         $this->socket = $socket;
         $this->client_id = $clientId;
@@ -22,6 +22,7 @@ class TcpControlConnection extends ControlConnection
         $this->port = $port;
         $this->shared_at = now()->toDateTimeString();
         $this->shared_port = parse_url($sharedServer->getAddress(), PHP_URL_PORT);
+        $this->authToken = $authToken;
 
         $this->configureServer($sharedServer);
     }
@@ -85,7 +86,6 @@ class TcpControlConnection extends ControlConnection
 
             $this->once('tcp_proxy_ready_'.$requestId, function (ConnectionInterface $proxy) use ($connection) {
                 $this->proxy = $proxy;
-                dump("Proxy ready");
 
                 $connection->on('data', function($data) use ($proxy) {
                     $proxy->send($data);