Merge branch '1.0' of github.com:beyondcode/phunnel into 1.0

Apply fixes from StyleCI

Dockerfile

@@ -21,3 +21,4 @@ ENV password=password
 ENV exposeConfigPath=/src/config/expose.php
 
 CMD sed -i "s|username|${username}|g" ${exposeConfigPath} && sed -i "s|password|${password}|g" ${exposeConfigPath} && php expose serve ${domain} --port ${port} --validateAuthTokens
+ENTRYPOINT ["/src/expose"]

app/Client/Client.php

@@ -45,15 +45,10 @@ class Client
         $sharedUrl = $this->prepareSharedUrl($sharedUrl);
 
         foreach ($subdomains as $subdomain) {
-            $this->connectToServer($sharedUrl, $subdomain, config('expose.auth_token'));
+            $this->connectToServer($sharedUrl, $subdomain, $this->configuration->auth());
         }
     }
 
-    public function sharePort(int $port)
-    {
-        $this->connectToServerAndShareTcp($port, config('expose.auth_token'));
-    }
-
     protected function prepareSharedUrl(string $sharedUrl): string
     {
         if (! $parsedUrl = parse_url($sharedUrl)) {
@@ -92,12 +87,14 @@ class Client
                 $clientConnection->on('close', function () use ($sharedUrl, $subdomain, $authToken) {
                     $this->logger->error('Connection to server closed.');
 
-                    $this->retryConnectionOrExit(function () use ($sharedUrl, $subdomain, $authToken) {
-                        $this->connectToServer($sharedUrl, $subdomain, $authToken);
-                    });
+                    $this->retryConnectionOrExit($sharedUrl, $subdomain, $authToken);
                 });
 
-                $this->attachCommonConnectionListeners($connection, $deferred);
+                $connection->on('authenticationFailed', function ($data) use ($deferred) {
+                    $this->logger->error($data->message);
+
+                    $this->exit($deferred);
+                });
 
                 $connection->on('subdomainTaken', function ($data) use ($deferred) {
                     $this->logger->error($data->message);
@@ -105,6 +102,20 @@ class Client
                     $this->exit($deferred);
                 });
 
+                $connection->on('setMaximumConnectionLength', function ($data) {
+                    $timeoutSection = $this->logger->getOutput()->section();
+
+                    $this->loop->addPeriodicTimer(1, function () use ($data, $timeoutSection) {
+                        $this->timeConnected++;
+
+                        $secondsRemaining = $data->length * 60 - $this->timeConnected;
+                        $remaining = Carbon::now()->diff(Carbon::now()->addSeconds($secondsRemaining));
+
+                        $timeoutSection->clear();
+                        $timeoutSection->writeln('Remaining time: '.$remaining->format('%H:%I:%S'));
+                    });
+                });
+
                 $connection->on('authenticated', function ($data) use ($deferred, $sharedUrl) {
                     $httpProtocol = $this->configuration->port() === 443 ? 'https' : 'http';
                     $host = $this->configuration->host();
@@ -125,9 +136,7 @@ class Client
                 });
             }, function (\Exception $e) use ($deferred, $sharedUrl, $subdomain, $authToken) {
                 if ($this->connectionRetries > 0) {
-                    $this->retryConnectionOrExit(function () use ($sharedUrl, $subdomain, $authToken) {
-                        $this->connectToServer($sharedUrl, $subdomain, $authToken);
-                    });
+                    $this->retryConnectionOrExit($sharedUrl, $subdomain, $authToken);
 
                     return;
                 }
@@ -140,92 +149,6 @@ class Client
         return $promise;
     }
 
-    public function connectToServerAndShareTcp(int $port, $authToken = ''): PromiseInterface
-    {
-        $deferred = new Deferred();
-        $promise = $deferred->promise();
-
-        $wsProtocol = $this->configuration->port() === 443 ? 'wss' : 'ws';
-
-        connect($wsProtocol."://{$this->configuration->host()}:{$this->configuration->port()}/expose/control?authToken={$authToken}", [], [
-            'X-Expose-Control' => 'enabled',
-        ], $this->loop)
-            ->then(function (WebSocket $clientConnection) use ($port, $deferred, $authToken) {
-                $this->connectionRetries = 0;
-
-                $connection = ControlConnection::create($clientConnection);
-
-                $connection->authenticateTcp($port);
-
-                $this->attachCommonConnectionListeners($connection, $deferred);
-
-                $clientConnection->on('close', function () use ($port, $authToken) {
-                    $this->logger->error('Connection to server closed.');
-
-                    $this->retryConnectionOrExit(function () use ($port, $authToken) {
-                        $this->connectToServerAndShareTcp($port, $authToken);
-                    });
-                });
-
-                $connection->on('authenticated', function ($data) use ($deferred, $port) {
-                    $host = $this->configuration->host();
-
-                    $this->logger->info($data->message);
-                    $this->logger->info("Local-Port:\t\t{$port}");
-                    $this->logger->info("Shared-Port:\t\t{$data->shared_port}");
-                    $this->logger->info("Expose-URL:\t\ttcp://{$host}:{$data->shared_port}.");
-                    $this->logger->line('');
-
-                    $deferred->resolve($data);
-                });
-            }, function (\Exception $e) use ($deferred, $port, $authToken) {
-                if ($this->connectionRetries > 0) {
-                    $this->retryConnectionOrExit(function () use ($port, $authToken) {
-                        $this->connectToServerAndShareTcp($port, $authToken);
-                    });
-
-                    return;
-                }
-                $this->logger->error('Could not connect to the server.');
-                $this->logger->error($e->getMessage());
-
-                $this->exit($deferred);
-            });
-
-        return $promise;
-    }
-
-    protected function attachCommonConnectionListeners(ControlConnection $connection, Deferred $deferred)
-    {
-        $connection->on('info', function ($data) {
-            $this->logger->info($data->message);
-        });
-
-        $connection->on('error', function ($data) {
-            $this->logger->error($data->message);
-        });
-
-        $connection->on('authenticationFailed', function ($data) use ($deferred) {
-            $this->logger->error($data->message);
-
-            $this->exit($deferred);
-        });
-
-        $connection->on('setMaximumConnectionLength', function ($data) {
-            $timeoutSection = $this->logger->getOutput()->section();
-
-            $this->loop->addPeriodicTimer(1, function () use ($data, $timeoutSection) {
-                $this->timeConnected++;
-
-                $secondsRemaining = $data->length * 60 - $this->timeConnected;
-                $remaining = Carbon::now()->diff(Carbon::now()->addSeconds($secondsRemaining));
-
-                $timeoutSection->clear();
-                $timeoutSection->writeln('Remaining time: '.$remaining->format('%H:%I:%S'));
-            });
-        });
-    }
-
     protected function exit(Deferred $deferred)
     {
         $deferred->reject();
@@ -235,15 +158,15 @@ class Client
         });
     }
 
-    protected function retryConnectionOrExit(callable $retry)
+    protected function retryConnectionOrExit(string $sharedUrl, $subdomain, $authToken = '')
     {
         $this->connectionRetries++;
 
         if ($this->connectionRetries <= static::MAX_CONNECTION_RETRIES) {
-            $this->loop->addTimer($this->connectionRetries, function () use ($retry) {
+            $this->loop->addTimer($this->connectionRetries, function () use ($sharedUrl, $subdomain, $authToken) {
                 $this->logger->info("Retrying connection ({$this->connectionRetries}/".static::MAX_CONNECTION_RETRIES.')');
 
-                $retry();
+                $this->connectToServer($sharedUrl, $subdomain, $authToken);
             });
         } else {
             exit(1);

app/Client/Configuration.php

@@ -36,16 +36,4 @@ class Configuration
     {
         return intval($this->port);
     }
-
-    public function getUrl(string $subdomain): string
-    {
-        $httpProtocol = $this->port() === 443 ? 'https' : 'http';
-        $host = $this->host();
-
-        if ($httpProtocol !== 'https') {
-            $host .= ":{$this->port()}";
-        }
-
-        return "{$subdomain}.{$host}";
-    }
 }

app/Client/Connections/ControlConnection.php

@@ -52,34 +52,17 @@ class ControlConnection
         $this->proxyManager->createProxy($this->clientId, $data);
     }
 
-    public function createTcpProxy($data)
-    {
-        $this->proxyManager->createTcpProxy($this->clientId, $data);
-    }
-
     public function authenticate(string $sharedHost, string $subdomain)
     {
         $this->socket->send(json_encode([
             'event' => 'authenticate',
             'data' => [
-                'type' => 'http',
                 'host' => $sharedHost,
                 'subdomain' => empty($subdomain) ? null : $subdomain,
             ],
         ]));
     }
 
-    public function authenticateTcp(int $port)
-    {
-        $this->socket->send(json_encode([
-            'event' => 'authenticate',
-            'data' => [
-                'type' => 'tcp',
-                'port' => $port,
-            ],
-        ]));
-    }
-
     public function ping()
     {
         $this->socket->send(json_encode([

app/Client/Factory.php

@@ -2,7 +2,6 @@
 
 namespace App\Client;
 
-use App\Client\Fileserver\Fileserver;
 use App\Client\Http\Controllers\AttachDataToLogController;
 use App\Client\Http\Controllers\ClearLogsController;
 use App\Client\Http\Controllers\CreateTunnelController;
@@ -34,9 +33,6 @@ class Factory
     /** @var App */
     protected $app;
 
-    /** @var Fileserver */
-    protected $fileserver;
-
     /** @var RouteGenerator */
     protected $router;
 
@@ -113,22 +109,6 @@ class Factory
         return $this;
     }
 
-    public function sharePort(int $port)
-    {
-        app('expose.client')->sharePort($port);
-
-        return $this;
-    }
-
-    public function shareFolder(string $folder, string $name, $subdomain = null)
-    {
-        $host = $this->createFileServer($folder, $name);
-
-        $this->share($host, $subdomain);
-
-        return $this;
-    }
-
     protected function addRoutes()
     {
         $this->router->get('/', DashboardController::class);
@@ -147,18 +127,18 @@ class Factory
         }
     }
 
-    protected function detectNextAvailablePort($startPort = 4040): int
+    protected function detectNextFreeDashboardPort($port = 4040): int
     {
-        while (is_resource(@fsockopen('127.0.0.1', $startPort))) {
-            $startPort++;
+        while (is_resource(@fsockopen('127.0.0.1', $port))) {
+            $port++;
         }
 
-        return $startPort;
+        return $port;
     }
 
     public function createHttpServer()
     {
-        $dashboardPort = $this->detectNextAvailablePort();
+        $dashboardPort = $this->detectNextFreeDashboardPort();
 
         config()->set('expose.dashboard_port', $dashboardPort);
 
@@ -169,25 +149,11 @@ class Factory
         return $this;
     }
 
-    public function createFileServer(string $folder, string $name)
-    {
-        $port = $this->detectNextAvailablePort(8090);
-
-        $this->fileserver = new Fileserver($folder, $name, $port, '0.0.0.0', $this->loop);
-
-        return "127.0.0.1:{$port}";
-    }
-
     public function getApp(): App
     {
         return $this->app;
     }
 
-    public function getFileserver(): Fileserver
-    {
-        return $this->fileserver;
-    }
-
     public function run()
     {
         $this->loop->run();

app/Client/Fileserver/ConnectionHandler.php

@@ -1,135 +0,0 @@
-<?php
-
-namespace App\Client\Fileserver;
-
-use App\Http\Controllers\Concerns\LoadsViews;
-use App\Http\QueryParameters;
-use GuzzleHttp\Psr7\ServerRequest;
-use Illuminate\Http\Request;
-use Psr\Http\Message\ServerRequestInterface;
-use React\EventLoop\LoopInterface;
-use React\Http\Response;
-use React\Stream\ReadableResourceStream;
-use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory;
-use Symfony\Component\Finder\Finder;
-use Symfony\Component\Finder\Iterator\FilenameFilterIterator;
-
-class ConnectionHandler
-{
-    use LoadsViews;
-
-    /** @var string */
-    protected $rootFolder;
-
-    /** @var string */
-    protected $name;
-
-    /** @var LoopInterface */
-    protected $loop;
-
-    public function __construct(string $rootFolder, string $name, LoopInterface $loop)
-    {
-        $this->rootFolder = $rootFolder;
-        $this->name = $name;
-        $this->loop = $loop;
-    }
-
-    public function handle(ServerRequestInterface $request)
-    {
-        $request = $this->createLaravelRequest($request);
-        $targetPath = realpath($this->rootFolder.DIRECTORY_SEPARATOR.$request->path());
-
-        if (! $this->isValidTarget($targetPath)) {
-            return new Response(404);
-        }
-
-        if (is_dir($targetPath)) {
-            // Directory listing
-            $directoryContent = Finder::create()
-                ->depth(0)
-                ->sort(function ($a, $b) {
-                    return strcmp(strtolower($a->getRealpath()), strtolower($b->getRealpath()));
-                })
-                ->in($targetPath);
-
-            if ($this->name !== '') {
-                $directoryContent->name($this->name);
-            }
-
-            $parentPath = explode('/', $request->path());
-            array_pop($parentPath);
-            $parentPath = implode('/', $parentPath);
-
-            return new Response(
-                200,
-                ['Content-Type' => 'text/html'],
-                $this->getView(null, 'client.fileserver', [
-                    'currentPath' => $request->path(),
-                    'parentPath' => $parentPath,
-                    'directory' => $targetPath,
-                    'directoryContent' => $directoryContent,
-                ])
-            );
-        }
-
-        if (is_file($targetPath)) {
-            return new Response(
-                200,
-                ['Content-Type' => mime_content_type($targetPath)],
-                new ReadableResourceStream(fopen($targetPath, 'r'), $this->loop)
-            );
-        }
-    }
-
-    protected function isValidTarget(string $targetPath): bool
-    {
-        if (! file_exists($targetPath)) {
-            return false;
-        }
-
-        if ($this->name !== '') {
-            $filter = new class(basename($targetPath), [$this->name]) extends FilenameFilterIterator {
-                protected $filename;
-
-                public function __construct(string $filename, array $matchPatterns)
-                {
-                    $this->filename = $filename;
-
-                    foreach ($matchPatterns as $pattern) {
-                        $this->matchRegexps[] = $this->toRegex($pattern);
-                    }
-                }
-
-                public function accept()
-                {
-                    return $this->isAccepted($this->filename);
-                }
-            };
-
-            return $filter->accept();
-        }
-
-        return true;
-    }
-
-    protected function createLaravelRequest(ServerRequestInterface $request): Request
-    {
-        try {
-            parse_str($request->getBody(), $bodyParameters);
-        } catch (\Throwable $e) {
-            $bodyParameters = [];
-        }
-
-        $serverRequest = (new ServerRequest(
-            $request->getMethod(),
-            $request->getUri(),
-            $request->getHeaders(),
-            $request->getBody(),
-            $request->getProtocolVersion(),
-        ))
-            ->withQueryParams(QueryParameters::create($request)->all())
-            ->withParsedBody($bodyParameters);
-
-        return Request::createFromBase((new HttpFoundationFactory)->createRequest($serverRequest));
-    }
-}

app/Client/Fileserver/Fileserver.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Client\Fileserver;
-
-use Psr\Http\Message\ServerRequestInterface;
-use React\EventLoop\LoopInterface;
-use React\Http\Server;
-use React\Socket\Server as SocketServer;
-
-class Fileserver
-{
-    /** @var SocketServer */
-    protected $socket;
-
-    public function __construct($rootFolder, $name, $port, $address, LoopInterface $loop)
-    {
-        $server = new Server(function (ServerRequestInterface $request) use ($rootFolder, $name, $loop) {
-            return (new ConnectionHandler($rootFolder, $name, $loop))->handle($request);
-        });
-
-        $this->socket = new SocketServer("{$address}:{$port}", $loop);
-
-        $server->listen($this->socket);
-    }
-
-    public function getSocket(): SocketServer
-    {
-        return $this->socket;
-    }
-}

app/Client/Http/HttpClient.php

@@ -2,7 +2,6 @@
 
 namespace App\Client\Http;
 
-use App\Client\Configuration;
 use App\Client\Http\Modifiers\CheckBasicAuthentication;
 use App\Logger\RequestLogger;
 use Clue\React\Buzz\Browser;
@@ -27,26 +26,19 @@ class HttpClient
     /** @var Request */
     protected $request;
 
-    protected $connectionData;
-
     /** @var array */
     protected $modifiers = [
         CheckBasicAuthentication::class,
     ];
-    /** @var Configuration */
-    protected $configuration;
 
-    public function __construct(LoopInterface $loop, RequestLogger $logger, Configuration $configuration)
+    public function __construct(LoopInterface $loop, RequestLogger $logger)
     {
         $this->loop = $loop;
         $this->logger = $logger;
-        $this->configuration = $configuration;
     }
 
-    public function performRequest(string $requestData, WebSocket $proxyConnection = null, $connectionData = null)
+    public function performRequest(string $requestData, WebSocket $proxyConnection = null, string $requestId = null)
     {
-        $this->connectionData = $connectionData;
-
         $this->request = $this->parseRequest($requestData);
 
         $this->logger->logRequest($requestData, $this->request);
@@ -74,7 +66,6 @@ class HttpClient
     protected function createConnector(): Connector
     {
         return new Connector($this->loop, [
-            'dns' => '127.0.0.1',
             'tls' => [
                 'verify_peer' => false,
                 'verify_peer_name' => false,
@@ -93,8 +84,6 @@ class HttpClient
             ->send($request)
             ->then(function (ResponseInterface $response) use ($proxyConnection) {
                 if (! isset($response->buffer)) {
-                    $response = $this->rewriteResponseHeaders($response);
-
                     $response->buffer = str($response);
                 }
 
@@ -136,25 +125,4 @@ class HttpClient
     {
         return Request::fromString($data);
     }
-
-    protected function rewriteResponseHeaders(ResponseInterface $response)
-    {
-        if (! $response->hasHeader('Location')) {
-            return $response;
-        }
-
-        $location = $response->getHeaderLine('Location');
-
-        if (! strstr($location, $this->connectionData->host)) {
-            return $response;
-        }
-
-        $location = str_replace(
-            $this->connectionData->host,
-            $this->configuration->getUrl($this->connectionData->subdomain),
-            $location
-        );
-
-        return $response->withHeader('Location', $location);
-    }
 }

app/Client/ProxyManager.php

@@ -5,9 +5,7 @@ namespace App\Client;
 use App\Client\Http\HttpClient;
 use function Ratchet\Client\connect;
 use Ratchet\Client\WebSocket;
-use Ratchet\RFC6455\Messaging\Frame;
 use React\EventLoop\LoopInterface;
-use React\Socket\Connector;
 
 class ProxyManager
 {
@@ -32,7 +30,7 @@ class ProxyManager
         ], $this->loop)
             ->then(function (WebSocket $proxyConnection) use ($clientId, $connectionData) {
                 $proxyConnection->on('message', function ($message) use ($proxyConnection, $connectionData) {
-                    $this->performRequest($proxyConnection, (string) $message, $connectionData);
+                    $this->performRequest($proxyConnection, $connectionData->request_id, (string) $message);
                 });
 
                 $proxyConnection->send(json_encode([
@@ -45,39 +43,8 @@ class ProxyManager
             });
     }
 
-    public function createTcpProxy(string $clientId, $connectionData)
+    protected function performRequest(WebSocket $proxyConnection, $requestId, string $requestData)
     {
-        $protocol = $this->configuration->port() === 443 ? 'wss' : 'ws';
-
-        connect($protocol."://{$this->configuration->host()}:{$this->configuration->port()}/expose/control", [], [
-            'X-Expose-Control' => 'enabled',
-        ], $this->loop)
-            ->then(function (WebSocket $proxyConnection) use ($clientId, $connectionData) {
-                $connector = new Connector($this->loop);
-
-                $connector->connect('127.0.0.1:'.$connectionData->port)->then(function ($connection) use ($proxyConnection) {
-                    $connection->on('data', function ($data) use ($proxyConnection) {
-                        $binaryMsg = new Frame($data, true, Frame::OP_BINARY);
-                        $proxyConnection->send($binaryMsg);
-                    });
-
-                    $proxyConnection->on('message', function ($message) use ($connection) {
-                        $connection->write($message);
-                    });
-                });
-
-                $proxyConnection->send(json_encode([
-                    'event' => 'registerTcpProxy',
-                    'data' => [
-                        'tcp_request_id' => $connectionData->tcp_request_id ?? null,
-                        'client_id' => $clientId,
-                    ],
-                ]));
-            });
-    }
-
-    protected function performRequest(WebSocket $proxyConnection, string $requestData, $connectionData)
-    {
-        app(HttpClient::class)->performRequest((string) $requestData, $proxyConnection, $connectionData);
+        app(HttpClient::class)->performRequest((string) $requestData, $proxyConnection, $requestId);
     }
 }

app/Commands/ShareCommand.php

@@ -10,7 +10,7 @@ use Symfony\Component\Console\Output\ConsoleOutput;
 
 class ShareCommand extends Command
 {
-    protected $signature = 'share {host} {--subdomain=} {--auth=}';
+    protected $signature = 'share {host} {--subdomain=} {--auth=} {--server-host=} {--server-port=}';
 
     protected $description = 'Share a local url with a remote expose server';
 
@@ -27,11 +27,15 @@ class ShareCommand extends Command
     {
         $this->configureConnectionLogger();
 
+        $serverHost = $this->option('server-host') ?? config('expose.host', 'localhost');
+        $serverPort = $this->option('server-port') ?? config('expose.port', 8080);
+        $auth = $this->option('auth') ?? config('expose.auth_token', '');
+
         (new Factory())
             ->setLoop(app(LoopInterface::class))
-            ->setHost(config('expose.host', 'localhost'))
-            ->setPort(config('expose.port', 8080))
-            ->setAuth($this->option('auth'))
+            ->setHost($serverHost)
+            ->setPort($serverPort)
+            ->setAuth($auth)
             ->createClient()
             ->share($this->argument('host'), explode(',', $this->option('subdomain')))
             ->createHttpServer()

app/Commands/ShareCurrentWorkingDirectoryCommand.php

@@ -8,12 +8,12 @@ class ShareCurrentWorkingDirectoryCommand extends ShareCommand
 
     public function handle()
     {
-        $subdomain = $this->detectName();
-        $host = $this->prepareSharedHost($subdomain.'.'.$this->detectTld());
+        $host = $this->prepareSharedHost(basename(getcwd()).'.'.$this->detectTld());
 
         $this->input->setArgument('host', $host);
 
         if (! $this->option('subdomain')) {
+            $subdomain = str_replace('.', '-', basename(getcwd()));
             $this->input->setOption('subdomain', $subdomain);
         }
 
@@ -33,32 +33,6 @@ class ShareCurrentWorkingDirectoryCommand extends ShareCommand
         return config('expose.default_tld', 'test');
     }
 
-    protected function detectName(): string
-    {
-        $projectPath = getcwd();
-        $valetSitesPath = ($_SERVER['HOME'] ?? $_SERVER['USERPROFILE']).DIRECTORY_SEPARATOR.'.config'.DIRECTORY_SEPARATOR.'valet'.DIRECTORY_SEPARATOR.'Sites';
-
-        if (is_dir($valetSitesPath)) {
-            $site = collect(scandir($valetSitesPath))
-            ->skip(2)
-            ->map(function ($site) use ($valetSitesPath) {
-                return $valetSitesPath.DIRECTORY_SEPARATOR.$site;
-            })->mapWithKeys(function ($site) {
-                return [$site => readlink($site)];
-            })->filter(function ($sourcePath) use ($projectPath) {
-                return $sourcePath === $projectPath;
-            })
-            ->keys()
-            ->first();
-
-            if ($site) {
-                $projectPath = $site;
-            }
-        }
-
-        return str_replace('.', '-', basename($projectPath));
-    }
-
     protected function prepareSharedHost($host): string
     {
         $certificateFile = ($_SERVER['HOME'] ?? $_SERVER['USERPROFILE']).DIRECTORY_SEPARATOR.'.config'.DIRECTORY_SEPARATOR.'valet'.DIRECTORY_SEPARATOR.'Certificates'.DIRECTORY_SEPARATOR.$host.'.crt';

app/Commands/ShareFilesCommand.php

@@ -1,48 +0,0 @@
-<?php
-
-namespace App\Commands;
-
-use App\Client\Factory;
-use App\Logger\CliRequestLogger;
-use LaravelZero\Framework\Commands\Command;
-use React\EventLoop\LoopInterface;
-use Symfony\Component\Console\Output\ConsoleOutput;
-
-class ShareFilesCommand extends Command
-{
-    protected $signature = 'share-files {folder=.} {--name=} {--subdomain=} {--auth=}';
-
-    protected $description = 'Share a local folder with a remote expose server';
-
-    protected function configureConnectionLogger()
-    {
-        app()->bind(CliRequestLogger::class, function () {
-            return new CliRequestLogger(new ConsoleOutput());
-        });
-
-        return $this;
-    }
-
-    public function handle()
-    {
-        if (! is_dir($this->argument('folder'))) {
-            throw new \InvalidArgumentException('The folder '.$this->argument('folder').' does not exist.');
-        }
-
-        $this->configureConnectionLogger();
-
-        (new Factory())
-            ->setLoop(app(LoopInterface::class))
-            ->setHost(config('expose.host', 'localhost'))
-            ->setPort(config('expose.port', 8080))
-            ->setAuth($this->option('auth'))
-            ->createClient()
-            ->shareFolder(
-                $this->argument('folder'),
-                $this->option('name') ?? '',
-                explode(',', $this->option('subdomain'))
-            )
-            ->createHttpServer()
-            ->run();
-    }
-}

app/Commands/SharePortCommand.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace App\Commands;
-
-use App\Client\Factory;
-use App\Logger\CliRequestLogger;
-use LaravelZero\Framework\Commands\Command;
-use React\EventLoop\LoopInterface;
-use Symfony\Component\Console\Output\ConsoleOutput;
-
-class SharePortCommand extends Command
-{
-    protected $signature = 'share-port {port} {--auth=}';
-
-    protected $description = 'Share a local port with a remote expose server';
-
-    protected function configureConnectionLogger()
-    {
-        app()->bind(CliRequestLogger::class, function () {
-            return new CliRequestLogger(new ConsoleOutput());
-        });
-
-        return $this;
-    }
-
-    public function handle()
-    {
-        $this->configureConnectionLogger();
-
-        (new Factory())
-            ->setLoop(app(LoopInterface::class))
-            ->setHost(config('expose.host', 'localhost'))
-            ->setPort(config('expose.port', 8080))
-            ->setAuth($this->option('auth'))
-            ->createClient()
-            ->sharePort($this->argument('port'))
-            ->createHttpServer()
-            ->run();
-    }
-}

app/Contracts/ConnectionManager.php

@@ -10,8 +10,6 @@ interface ConnectionManager
 {
     public function storeConnection(string $host, ?string $subdomain, ConnectionInterface $connection): ControlConnection;
 
-    public function storeTcpConnection(int $port, ConnectionInterface $connection): ControlConnection;
-
     public function limitConnectionLength(ControlConnection $connection, int $maximumConnectionLength);
 
     public function storeHttpConnection(ConnectionInterface $httpConnection, $requestId): HttpConnection;
@@ -25,8 +23,4 @@ interface ConnectionManager
     public function findControlConnectionForClientId(string $clientId): ?ControlConnection;
 
     public function getConnections(): array;
-
-    public function getConnectionsForAuthToken(string $authToken): array;
-
-    public function getTcpConnectionsForAuthToken(string $authToken): array;
 }

app/Contracts/SubdomainRepository.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Contracts;
-
-use React\Promise\PromiseInterface;
-
-interface SubdomainRepository
-{
-    public function getSubdomains(): PromiseInterface;
-
-    public function getSubdomainById($id): PromiseInterface;
-
-    public function getSubdomainByName(string $name): PromiseInterface;
-
-    public function getSubdomainsByUserId($id): PromiseInterface;
-
-    public function getSubdomainsByUserIdAndName($id, $name): PromiseInterface;
-
-    public function deleteSubdomainForUserId($userId, $subdomainId): PromiseInterface;
-
-    public function storeSubdomain(array $data): PromiseInterface;
-}

app/Http/Controllers/Concerns/LoadsViews.php

@@ -9,7 +9,7 @@ use Twig\Loader\ArrayLoader;
 
 trait LoadsViews
 {
-    protected function getView(?ConnectionInterface $connection, string $view, array $data = [])
+    protected function getView(ConnectionInterface $connection, string $view, array $data = [])
     {
         $templatePath = implode(DIRECTORY_SEPARATOR, explode('.', $view));
 
@@ -23,10 +23,7 @@ trait LoadsViews
         $data = array_merge($data, [
             'request' => $connection->laravelRequest ?? null,
         ]);
-        try {
-            return stream_for($twig->render('template', $data));
-        } catch (\Throwable $e) {
-            var_dump($e->getMessage());
-        }
+
+        return stream_for($twig->render('template', $data));
     }
 }

app/Logger/LoggedRequest.php

@@ -19,8 +19,11 @@ class LoggedRequest implements \JsonSerializable
     /** @var Request */
     protected $parsedRequest;
 
-    /** @var LoggedResponse */
-    protected $response;
+    /** @var string */
+    protected $rawResponse;
+
+    /** @var Response */
+    protected $parsedResponse;
 
     /** @var string */
     protected $id;
@@ -68,8 +71,22 @@ class LoggedRequest implements \JsonSerializable
             ],
         ];
 
-        if ($this->response) {
-            $data['response'] = $this->response->toArray();
+        if ($this->parsedResponse) {
+            $logBody = $this->shouldReturnBody();
+
+            try {
+                $body = $logBody ? $this->parsedResponse->getBody() : '';
+            } catch (\Exception $e) {
+                $body = '';
+            }
+
+            $data['response'] = [
+                'raw' => $logBody ? $this->rawResponse : 'SKIPPED BY CONFIG OR BINARY RESPONSE',
+                'status' => $this->parsedResponse->getStatusCode(),
+                'headers' => $this->parsedResponse->getHeaders()->toArray(),
+                'reason' => $this->parsedResponse->getReasonPhrase(),
+                'body' => $logBody ? $body : 'SKIPPED BY CONFIG OR BINARY RESPONSE',
+            ];
         }
 
         return $data;
@@ -90,6 +107,96 @@ class LoggedRequest implements \JsonSerializable
         return preg_match('~[^\x20-\x7E\t\r\n]~', $string) > 0;
     }
 
+    protected function shouldReturnBody(): bool
+    {
+        if ($this->skipByStatus()) {
+            return false;
+        }
+
+        if ($this->skipByContentType()) {
+            return false;
+        }
+
+        if ($this->skipByExtension()) {
+            return false;
+        }
+
+        if ($this->skipBySize()) {
+            return false;
+        }
+
+        $header = $this->parsedResponse->getHeaders()->get('Content-Type');
+        $contentType = $header ? $header->getMediaType() : '';
+        $patterns = [
+            'application/json',
+            'text/*',
+            '*javascript*',
+        ];
+
+        return Str::is($patterns, $contentType);
+    }
+
+    protected function skipByStatus(): bool
+    {
+        if (empty(config()->get('expose.skip_body_log.status'))) {
+            return false;
+        }
+
+        return Str::is(config()->get('expose.skip_body_log.status'), $this->parsedResponse->getStatusCode());
+    }
+
+    protected function skipByContentType(): bool
+    {
+        if (empty(config()->get('expose.skip_body_log.content_type'))) {
+            return false;
+        }
+
+        $header = $this->parsedResponse->getHeaders()->get('Content-Type');
+        $contentType = $header ? $header->getMediaType() : '';
+
+        return Str::is(config()->get('expose.skip_body_log.content_type'), $contentType);
+    }
+
+    protected function skipByExtension(): bool
+    {
+        if (empty(config()->get('expose.skip_body_log.extension'))) {
+            return false;
+        }
+
+        return Str::is(config()->get('expose.skip_body_log.extension'), $this->parsedRequest->getUri()->getPath());
+    }
+
+    protected function skipBySize(): bool
+    {
+        $configSize = $this->getConfigSize(config()->get('expose.skip_body_log.size', '1MB'));
+        $contentLength = $this->parsedResponse->getHeaders()->get('Content-Length');
+
+        if (! $contentLength) {
+            return false;
+        }
+
+        $contentSize = $contentLength->getFieldValue() ?? 0;
+
+        return $contentSize > $configSize;
+    }
+
+    protected function getConfigSize(string $size): int
+    {
+        $units = ['B', 'KB', 'MB', 'GB'];
+        $number = substr($size, 0, -2);
+        $suffix = strtoupper(substr($size, -2));
+
+        // B or no suffix
+        if (is_numeric(substr($suffix, 0, 1))) {
+            return preg_replace('/[^\d]/', '', $size);
+        }
+
+        // if we have an error in the input, default to GB
+        $exponent = array_flip($units)[$suffix] ?? 5;
+
+        return $number * (1024 ** $exponent);
+    }
+
     public function getRequest()
     {
         return $this->parsedRequest;
@@ -97,7 +204,9 @@ class LoggedRequest implements \JsonSerializable
 
     public function setResponse(string $rawResponse, Response $response)
     {
-        $this->response = new LoggedResponse($rawResponse, $response, $this->getRequest());
+        $this->parsedResponse = $response;
+
+        $this->rawResponse = $rawResponse;
 
         if (is_null($this->stopTime)) {
             $this->stopTime = now();
@@ -114,9 +223,9 @@ class LoggedRequest implements \JsonSerializable
         return $this->rawRequest;
     }
 
-    public function getResponse(): ?LoggedResponse
+    public function getResponse(): ?Response
     {
-        return $this->response;
+        return $this->parsedResponse;
     }
 
     public function getPostData()
@@ -199,12 +308,6 @@ class LoggedRequest implements \JsonSerializable
 
     protected function getRequestAsCurl(): string
     {
-        $maxRequestLength = 256000;
-
-        if (strlen($this->rawRequest) > $maxRequestLength) {
-            return '';
-        }
-
         try {
             return (new CurlFormatter())->format(parse_request($this->rawRequest));
         } catch (\Throwable $e) {

app/Logger/LoggedResponse.php

@@ -1,160 +0,0 @@
-<?php
-
-namespace App\Logger;
-
-use Illuminate\Support\Str;
-use Laminas\Http\Request;
-use Laminas\Http\Response;
-
-class LoggedResponse
-{
-    /** @var string */
-    protected $rawResponse;
-
-    /** @var Response */
-    protected $response;
-
-    /** @var Request */
-    protected $request;
-
-    protected $reasonPhrase;
-    protected $body;
-    protected $statusCode;
-    protected $headers;
-
-    public function __construct(string $rawResponse, Response $response, Request $request)
-    {
-        $this->rawResponse = $rawResponse;
-        $this->response = $response;
-        $this->request = $request;
-
-        if (! $this->shouldReturnBody()) {
-            $this->rawResponse = 'SKIPPED BY CONFIG OR BINARY RESPONSE';
-            $this->body = 'SKIPPED BY CONFIG OR BINARY RESPONSE';
-        } else {
-            try {
-                $this->body = $response->getBody();
-            } catch (\Exception $e) {
-                $this->body = '';
-            }
-        }
-
-        $this->statusCode = $response->getStatusCode();
-        $this->reasonPhrase = $response->getReasonPhrase();
-        $this->headers = $response->getHeaders()->toArray();
-
-        $this->response = null;
-        $this->request = null;
-    }
-
-    protected function shouldReturnBody(): bool
-    {
-        if ($this->skipByStatus()) {
-            return false;
-        }
-
-        if ($this->skipByContentType()) {
-            return false;
-        }
-
-        if ($this->skipByExtension()) {
-            return false;
-        }
-
-        if ($this->skipBySize()) {
-            return false;
-        }
-
-        $header = $this->response->getHeaders()->get('Content-Type');
-        $contentType = $header ? $header->getMediaType() : '';
-        $patterns = [
-            'application/json',
-            'text/*',
-            '*javascript*',
-        ];
-
-        return Str::is($patterns, $contentType);
-    }
-
-    protected function skipByStatus(): bool
-    {
-        if (empty(config()->get('expose.skip_body_log.status'))) {
-            return false;
-        }
-
-        return Str::is(config()->get('expose.skip_body_log.status'), $this->response->getStatusCode());
-    }
-
-    protected function skipByContentType(): bool
-    {
-        if (empty(config()->get('expose.skip_body_log.content_type'))) {
-            return false;
-        }
-
-        $header = $this->response->getHeaders()->get('Content-Type');
-        $contentType = $header ? $header->getMediaType() : '';
-
-        return Str::is(config()->get('expose.skip_body_log.content_type'), $contentType);
-    }
-
-    protected function skipByExtension(): bool
-    {
-        if (empty(config()->get('expose.skip_body_log.extension'))) {
-            return false;
-        }
-
-        return Str::is(config()->get('expose.skip_body_log.extension'), $this->request->getUri()->getPath());
-    }
-
-    protected function skipBySize(): bool
-    {
-        $configSize = $this->getConfigSize(config()->get('expose.skip_body_log.size', '1MB'));
-        $contentLength = $this->response->getHeaders()->get('Content-Length');
-
-        if (! $contentLength) {
-            return false;
-        }
-
-        $contentSize = $contentLength->getFieldValue() ?? 0;
-
-        return $contentSize > $configSize;
-    }
-
-    protected function getConfigSize(string $size): int
-    {
-        $units = ['B', 'KB', 'MB', 'GB'];
-        $number = substr($size, 0, -2);
-        $suffix = strtoupper(substr($size, -2));
-
-        // B or no suffix
-        if (is_numeric(substr($suffix, 0, 1))) {
-            return preg_replace('/[^\d]/', '', $size);
-        }
-
-        // if we have an error in the input, default to GB
-        $exponent = array_flip($units)[$suffix] ?? 5;
-
-        return $number * (1024 ** $exponent);
-    }
-
-    public function getStatusCode()
-    {
-        return $this->statusCode;
-    }
-
-    public function getReasonPhrase()
-    {
-        return $this->reasonPhrase;
-    }
-
-    public function toArray()
-    {
-        return [
-            'raw' => $this->rawResponse,
-            'status' => $this->statusCode,
-            'headers' => $this->headers,
-            'reason' => $this->reasonPhrase,
-            'body' => $this->body,
-        ];
-    }
-}

app/Server/Connections/ConnectionManager.php

@@ -4,11 +4,8 @@ namespace App\Server\Connections;
 
 use App\Contracts\ConnectionManager as ConnectionManagerContract;
 use App\Contracts\SubdomainGenerator;
-use App\Http\QueryParameters;
-use App\Server\Exceptions\NoFreePortAvailable;
 use Ratchet\ConnectionInterface;
 use React\EventLoop\LoopInterface;
-use React\Socket\Server;
 
 class ConnectionManager implements ConnectionManagerContract
 {
@@ -49,62 +46,13 @@ class ConnectionManager implements ConnectionManagerContract
 
         $connection->client_id = $clientId;
 
-        $storedConnection = new ControlConnection(
-            $connection,
-            $host,
-            $subdomain ?? $this->subdomainGenerator->generateSubdomain(),
-            $clientId,
-            $this->getAuthTokenFromConnection($connection)
-        );
+        $storedConnection = new ControlConnection($connection, $host, $subdomain ?? $this->subdomainGenerator->generateSubdomain(), $clientId);
 
         $this->connections[] = $storedConnection;
 
         return $storedConnection;
     }
 
-    public function storeTcpConnection(int $port, ConnectionInterface $connection): ControlConnection
-    {
-        $clientId = (string) uniqid();
-
-        $connection->client_id = $clientId;
-
-        $storedConnection = new TcpControlConnection(
-            $connection,
-            $port,
-            $this->getSharedTcpServer(),
-            $clientId,
-            $this->getAuthTokenFromConnection($connection)
-        );
-
-        $this->connections[] = $storedConnection;
-
-        return $storedConnection;
-    }
-
-    protected function getSharedTcpServer(): Server
-    {
-        $portRange = config('expose.admin.tcp_port_range');
-
-        $port = $portRange['from'] ?? 50000;
-        $maxPort = $portRange['to'] ?? 60000;
-
-        do {
-            try {
-                $portFound = true;
-                $server = new Server('0.0.0.0:'.$port, $this->loop);
-            } catch (\RuntimeException $exception) {
-                $portFound = false;
-                $port++;
-
-                if ($port > $maxPort) {
-                    throw new NoFreePortAvailable();
-                }
-            }
-        } while (! $portFound);
-
-        return $server;
-    }
-
     public function storeHttpConnection(ConnectionInterface $httpConnection, $requestId): HttpConnection
     {
         $this->httpConnections[$requestId] = new HttpConnection($httpConnection);
@@ -127,16 +75,6 @@ class ConnectionManager implements ConnectionManagerContract
 
         if (isset($connection->client_id)) {
             $clientId = $connection->client_id;
-
-            $controlConnection = collect($this->connections)->first(function ($connection) use ($clientId) {
-                return $connection->client_id == $clientId;
-            });
-
-            if ($controlConnection instanceof TcpControlConnection) {
-                $controlConnection->stop();
-                $controlConnection = null;
-            }
-
             $this->connections = collect($this->connections)->reject(function ($connection) use ($clientId) {
                 return $connection->client_id == $clientId;
             })->toArray();
@@ -161,41 +99,4 @@ 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;
-            })
-            ->filter(function ($connection) {
-                return get_class($connection) === ControlConnection::class;
-            })
-            ->map(function ($connection) {
-                return $connection->toArray();
-            })
-            ->values()
-            ->toArray();
-    }
-
-    public function getTcpConnectionsForAuthToken(string $authToken): array
-    {
-        return collect($this->connections)
-            ->filter(function ($connection) use ($authToken) {
-                return $connection->authToken === $authToken;
-            })
-            ->filter(function ($connection) {
-                return get_class($connection) === TcpControlConnection::class;
-            })
-            ->map(function ($connection) {
-                return $connection->toArray();
-            })
-            ->values()
-            ->toArray();
-    }
 }

app/Server/Connections/ControlConnection.php

@@ -12,19 +12,17 @@ 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, string $authToken = '')
+    public function __construct(ConnectionInterface $socket, string $host, string $subdomain, string $clientId)
     {
         $this->socket = $socket;
         $this->host = $host;
         $this->subdomain = $subdomain;
         $this->client_id = $clientId;
-        $this->authToken = $authToken;
         $this->shared_at = now()->toDateTimeString();
     }
 
@@ -43,8 +41,6 @@ class ControlConnection
         $this->socket->send(json_encode([
             'event' => 'createProxy',
             'data' => [
-                'host' => $this->host,
-                'subdomain' => $this->subdomain,
                 'request_id' => $requestId,
                 'client_id' => $this->client_id,
             ],
@@ -59,10 +55,8 @@ class ControlConnection
     public function toArray()
     {
         return [
-            '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

@@ -1,107 +0,0 @@
-<?php
-
-namespace App\Server\Connections;
-
-use Ratchet\ConnectionInterface;
-use Ratchet\RFC6455\Messaging\Frame;
-use React\Socket\Server;
-
-class TcpControlConnection extends ControlConnection
-{
-    public $proxy;
-    public $proxyConnection;
-    public $port;
-    public $shared_port;
-    public $shared_server;
-
-    public function __construct(ConnectionInterface $socket, int $port, Server $sharedServer, string $clientId, string $authToken = '')
-    {
-        $this->socket = $socket;
-        $this->client_id = $clientId;
-        $this->shared_server = $sharedServer;
-        $this->port = $port;
-        $this->shared_at = now()->toDateTimeString();
-        $this->shared_port = parse_url($sharedServer->getAddress(), PHP_URL_PORT);
-        $this->authToken = $authToken;
-
-        $this->configureServer($sharedServer);
-    }
-
-    public function setMaximumConnectionLength(int $maximumConnectionLength)
-    {
-        $this->socket->send(json_encode([
-            'event' => 'setMaximumConnectionLength',
-            'data' => [
-                'length' => $maximumConnectionLength,
-            ],
-        ]));
-    }
-
-    public function registerProxy($requestId)
-    {
-        $this->socket->send(json_encode([
-            'event' => 'createProxy',
-            'data' => [
-                'request_id' => $requestId,
-                'client_id' => $this->client_id,
-            ],
-        ]));
-    }
-
-    public function registerTcpProxy($requestId)
-    {
-        $this->socket->send(json_encode([
-            'event' => 'createTcpProxy',
-            'data' => [
-                'port' => $this->port,
-                'tcp_request_id' => $requestId,
-                'client_id' => $this->client_id,
-            ],
-        ]));
-    }
-
-    public function stop()
-    {
-        $this->shared_server->close();
-        $this->shared_server = null;
-    }
-
-    public function close()
-    {
-        $this->socket->close();
-    }
-
-    public function toArray()
-    {
-        return [
-            'type' => 'tcp',
-            'port' => $this->port,
-            'client_id' => $this->client_id,
-            'shared_port' => $this->shared_port,
-            'shared_at' => $this->shared_at,
-        ];
-    }
-
-    protected function configureServer(Server $sharedServer)
-    {
-        $requestId = uniqid();
-
-        $sharedServer->on('connection', function (\React\Socket\ConnectionInterface $connection) use ($requestId) {
-            $this->proxyConnection = $connection;
-
-            $this->once('tcp_proxy_ready_'.$requestId, function (ConnectionInterface $proxy) use ($connection) {
-                $this->proxy = $proxy;
-
-                $connection->on('data', function ($data) use ($proxy) {
-                    $binaryMsg = new Frame($data, true, Frame::OP_BINARY);
-                    $proxy->send($binaryMsg);
-                });
-
-                $connection->resume();
-            });
-
-            $connection->pause();
-            $this->registerTcpProxy($requestId);
-        });
-    }
-}

app/Server/Exceptions/NoFreePortAvailable.php

@@ -1,7 +0,0 @@
-<?php
-
-namespace App\Server\Exceptions;
-
-class NoFreePortAvailable extends \Exception
-{
-}

app/Server/Factory.php

@@ -4,27 +4,20 @@ namespace App\Server;
 
 use App\Contracts\ConnectionManager as ConnectionManagerContract;
 use App\Contracts\SubdomainGenerator;
-use App\Contracts\SubdomainRepository;
 use App\Contracts\UserRepository;
 use App\Http\RouteGenerator;
 use App\Http\Server as HttpServer;
 use App\Server\Connections\ConnectionManager;
-use App\Server\Http\Controllers\Admin\DeleteSubdomainController;
 use App\Server\Http\Controllers\Admin\DeleteUsersController;
 use App\Server\Http\Controllers\Admin\DisconnectSiteController;
-use App\Server\Http\Controllers\Admin\DisconnectTcpConnectionController;
 use App\Server\Http\Controllers\Admin\GetSettingsController;
 use App\Server\Http\Controllers\Admin\GetSitesController;
-use App\Server\Http\Controllers\Admin\GetTcpConnectionsController;
-use App\Server\Http\Controllers\Admin\GetUserDetailsController;
 use App\Server\Http\Controllers\Admin\GetUsersController;
 use App\Server\Http\Controllers\Admin\ListSitesController;
-use App\Server\Http\Controllers\Admin\ListTcpConnectionsController;
 use App\Server\Http\Controllers\Admin\ListUsersController;
 use App\Server\Http\Controllers\Admin\RedirectToUsersController;
 use App\Server\Http\Controllers\Admin\ShowSettingsController;
 use App\Server\Http\Controllers\Admin\StoreSettingsController;
-use App\Server\Http\Controllers\Admin\StoreSubdomainController;
 use App\Server\Http\Controllers\Admin\StoreUsersController;
 use App\Server\Http\Controllers\ControlMessageController;
 use App\Server\Http\Controllers\TunnelMessageController;
@@ -126,20 +119,14 @@ class Factory
         $this->router->get('/users', ListUsersController::class, $adminCondition);
         $this->router->get('/settings', ShowSettingsController::class, $adminCondition);
         $this->router->get('/sites', ListSitesController::class, $adminCondition);
-        $this->router->get('/tcp', ListTcpConnectionsController::class, $adminCondition);
 
         $this->router->get('/api/settings', GetSettingsController::class, $adminCondition);
         $this->router->post('/api/settings', StoreSettingsController::class, $adminCondition);
         $this->router->get('/api/users', GetUsersController::class, $adminCondition);
         $this->router->post('/api/users', StoreUsersController::class, $adminCondition);
-        $this->router->get('/api/users/{id}', GetUserDetailsController::class, $adminCondition);
-        $this->router->post('/api/subdomains', StoreSubdomainController::class, $adminCondition);
-        $this->router->delete('/api/subdomains/{subdomain}', DeleteSubdomainController::class, $adminCondition);
         $this->router->delete('/api/users/{id}', DeleteUsersController::class, $adminCondition);
         $this->router->get('/api/sites', GetSitesController::class, $adminCondition);
         $this->router->delete('/api/sites/{id}', DisconnectSiteController::class, $adminCondition);
-        $this->router->get('/api/tcp', GetTcpConnectionsController::class, $adminCondition);
-        $this->router->delete('/api/tcp/{id}', DisconnectTcpConnectionController::class, $adminCondition);
     }
 
     protected function bindConfiguration()
@@ -176,7 +163,6 @@ class Factory
         $this->bindConfiguration()
             ->bindSubdomainGenerator()
             ->bindUserRepository()
-            ->bindSubdomainRepository()
             ->bindDatabase()
             ->ensureDatabaseIsInitialized()
             ->bindConnectionManager()
@@ -213,15 +199,6 @@ class Factory
         return $this;
     }
 
-    protected function bindSubdomainRepository()
-    {
-        app()->singleton(SubdomainRepository::class, function () {
-            return app(config('expose.admin.subdomain_repository'));
-        });
-
-        return $this;
-    }
-
     protected function bindDatabase()
     {
         app()->singleton(DatabaseInterface::class, function () {

app/Server/Http/Controllers/Admin/DeleteSubdomainController.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Server\Http\Controllers\Admin;
-
-use App\Contracts\SubdomainRepository;
-use App\Contracts\UserRepository;
-use Illuminate\Http\Request;
-use Ratchet\ConnectionInterface;
-
-class DeleteSubdomainController extends AdminController
-{
-    protected $keepConnectionOpen = true;
-
-    /** @var SubdomainRepository */
-    protected $subdomainRepository;
-
-    /** @var UserRepository */
-    protected $userRepository;
-
-    public function __construct(UserRepository $userRepository, SubdomainRepository $subdomainRepository)
-    {
-        $this->userRepository = $userRepository;
-        $this->subdomainRepository = $subdomainRepository;
-    }
-
-    public function handle(Request $request, ConnectionInterface $httpConnection)
-    {
-        $this->userRepository->getUserByToken($request->get('auth_token', ''))
-            ->then(function ($user) use ($request, $httpConnection) {
-                if (is_null($user)) {
-                    $httpConnection->send(respond_json(['error' => 'The user does not exist'], 404));
-                    $httpConnection->close();
-
-                    return;
-                }
-
-                $this->subdomainRepository->deleteSubdomainForUserId($user['id'], $request->get('subdomain'))
-                    ->then(function ($deleted) use ($httpConnection) {
-                        $httpConnection->send(respond_json(['deleted' => $deleted], 200));
-                        $httpConnection->close();
-                    });
-            });
-    }
-}

app/Server/Http/Controllers/Admin/DisconnectTcpConnectionController.php

@@ -1,42 +0,0 @@
-<?php
-
-namespace App\Server\Http\Controllers\Admin;
-
-use App\Contracts\ConnectionManager;
-use App\Server\Configuration;
-use App\Server\Connections\TcpControlConnection;
-use Illuminate\Http\Request;
-use Ratchet\ConnectionInterface;
-
-class DisconnectTcpConnectionController extends AdminController
-{
-    /** @var ConnectionManager */
-    protected $connectionManager;
-
-    /** @var Configuration */
-    protected $configuration;
-
-    public function __construct(ConnectionManager $connectionManager)
-    {
-        $this->connectionManager = $connectionManager;
-    }
-
-    public function handle(Request $request, ConnectionInterface $httpConnection)
-    {
-        $connection = $this->connectionManager->findControlConnectionForClientId($request->get('id'));
-
-        if (! is_null($connection)) {
-            $connection->close();
-
-            $this->connectionManager->removeControlConnection($connection);
-        }
-
-        $httpConnection->send(respond_json([
-            'tcp_connections' => collect($this->connectionManager->getConnections())
-                ->filter(function ($connection) {
-                    return get_class($connection) === TcpControlConnection::class;
-                })
-                ->values(),
-        ]));
-    }
-}

app/Server/Http/Controllers/Admin/GetSitesController.php

@@ -4,7 +4,6 @@ namespace App\Server\Http\Controllers\Admin;
 
 use App\Contracts\ConnectionManager;
 use App\Server\Configuration;
-use App\Server\Connections\ControlConnection;
 use Illuminate\Http\Request;
 use Ratchet\ConnectionInterface;
 
@@ -24,16 +23,12 @@ class GetSitesController extends AdminController
     {
         $httpConnection->send(
             respond_json([
-                'sites' => collect($this->connectionManager->getConnections())
-                    ->filter(function ($connection) {
-                        return get_class($connection) === ControlConnection::class;
-                    })
-                    ->map(function ($site, $siteId) {
-                        $site = $site->toArray();
-                        $site['id'] = $siteId;
+                'sites' => collect($this->connectionManager->getConnections())->map(function ($site, $siteId) {
+                    $site = $site->toArray();
+                    $site['id'] = $siteId;
 
-                        return $site;
-                    })->values(),
+                    return $site;
+                })->values(),
             ])
         );
     }

app/Server/Http/Controllers/Admin/GetTcpConnectionsController.php

@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Server\Http\Controllers\Admin;
-
-use App\Contracts\ConnectionManager;
-use App\Server\Configuration;
-use App\Server\Connections\TcpControlConnection;
-use Illuminate\Http\Request;
-use Ratchet\ConnectionInterface;
-
-class GetTcpConnectionsController extends AdminController
-{
-    /** @var ConnectionManager */
-    protected $connectionManager;
-    /** @var Configuration */
-    protected $configuration;
-
-    public function __construct(ConnectionManager $connectionManager, Configuration $configuration)
-    {
-        $this->connectionManager = $connectionManager;
-    }
-
-    public function handle(Request $request, ConnectionInterface $httpConnection)
-    {
-        $httpConnection->send(
-            respond_json([
-                'tcp_connections' => collect($this->connectionManager->getConnections())
-                    ->filter(function ($connection) {
-                        return get_class($connection) === TcpControlConnection::class;
-                    })
-                    ->map(function ($site, $siteId) {
-                        $site = $site->toArray();
-                        $site['id'] = $siteId;
-
-                        return $site;
-                    })
-                    ->values(),
-            ])
-        );
-    }
-}

app/Server/Http/Controllers/Admin/GetUserDetailsController.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Server\Http\Controllers\Admin;
-
-use App\Contracts\SubdomainRepository;
-use App\Contracts\UserRepository;
-use Illuminate\Http\Request;
-use Ratchet\ConnectionInterface;
-
-class GetUserDetailsController extends AdminController
-{
-    protected $keepConnectionOpen = true;
-
-    /** @var UserRepository */
-    protected $userRepository;
-
-    /** @var SubdomainRepository */
-    protected $subdomainRepository;
-
-    public function __construct(UserRepository $userRepository, SubdomainRepository $subdomainRepository)
-    {
-        $this->userRepository = $userRepository;
-        $this->subdomainRepository = $subdomainRepository;
-    }
-
-    public function handle(Request $request, ConnectionInterface $httpConnection)
-    {
-        $this->userRepository
-            ->getUserById($request->get('id'))
-            ->then(function ($user) use ($httpConnection, $request) {
-                $this->subdomainRepository->getSubdomainsByUserId($request->get('id'))
-                    ->then(function ($subdomains) use ($httpConnection, $user) {
-                        $httpConnection->send(
-                            respond_json([
-                                'user' => $user,
-                                'subdomains' => $subdomains,
-                            ])
-                        );
-
-                        $httpConnection->close();
-                    });
-            });
-    }
-}

app/Server/Http/Controllers/Admin/ListSitesController.php

@@ -4,7 +4,6 @@ namespace App\Server\Http\Controllers\Admin;
 
 use App\Contracts\ConnectionManager;
 use App\Server\Configuration;
-use App\Server\Connections\ControlConnection;
 use Illuminate\Http\Request;
 use Ratchet\ConnectionInterface;
 
@@ -26,17 +25,12 @@ class ListSitesController extends AdminController
         $sites = $this->getView($httpConnection, 'server.sites.index', [
             'scheme' => $this->configuration->port() === 443 ? 'https' : 'http',
             'configuration' => $this->configuration,
-            'sites' => collect($this->connectionManager->getConnections())
-                ->filter(function ($connection) {
-                    return get_class($connection) === ControlConnection::class;
-                })
-                ->map(function ($site, $siteId) {
-                    $site = $site->toArray();
-                    $site['id'] = $siteId;
+            'sites' => collect($this->connectionManager->getConnections())->map(function ($site, $siteId) {
+                $site = $site->toArray();
+                $site['id'] = $siteId;
 
-                    return $site;
-                })
-                ->values(),
+                return $site;
+            })->values(),
         ]);
 
         $httpConnection->send(

app/Server/Http/Controllers/Admin/ListTcpConnectionsController.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Server\Http\Controllers\Admin;
-
-use App\Contracts\ConnectionManager;
-use App\Server\Configuration;
-use App\Server\Connections\TcpControlConnection;
-use Illuminate\Http\Request;
-use Ratchet\ConnectionInterface;
-
-class ListTcpConnectionsController extends AdminController
-{
-    /** @var ConnectionManager */
-    protected $connectionManager;
-    /** @var Configuration */
-    protected $configuration;
-
-    public function __construct(ConnectionManager $connectionManager, Configuration $configuration)
-    {
-        $this->connectionManager = $connectionManager;
-        $this->configuration = $configuration;
-    }
-
-    public function handle(Request $request, ConnectionInterface $httpConnection)
-    {
-        $sites = $this->getView($httpConnection, 'server.tcp.index', [
-            'scheme' => $this->configuration->port() === 443 ? 'https' : 'http',
-            'configuration' => $this->configuration,
-            'connections' => collect($this->connectionManager->getConnections())
-                ->filter(function ($connection) {
-                    return get_class($connection) === TcpControlConnection::class;
-                })
-                ->map(function ($connection, $connectionId) {
-                    $connection = $connection->toArray();
-                    $connection['id'] = $connectionId;
-
-                    return $connection;
-                })
-                ->values(),
-        ]);
-
-        $httpConnection->send(
-            respond_html($sites)
-        );
-    }
-}

app/Server/Http/Controllers/Admin/StoreSubdomainController.php

@@ -1,77 +0,0 @@
-<?php
-
-namespace App\Server\Http\Controllers\Admin;
-
-use App\Contracts\SubdomainRepository;
-use App\Contracts\UserRepository;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Validator;
-use Ratchet\ConnectionInterface;
-
-class StoreSubdomainController extends AdminController
-{
-    protected $keepConnectionOpen = true;
-
-    /** @var SubdomainRepository */
-    protected $subdomainRepository;
-
-    /** @var UserRepository */
-    protected $userRepository;
-
-    public function __construct(UserRepository $userRepository, SubdomainRepository $subdomainRepository)
-    {
-        $this->userRepository = $userRepository;
-        $this->subdomainRepository = $subdomainRepository;
-    }
-
-    public function handle(Request $request, ConnectionInterface $httpConnection)
-    {
-        $validator = Validator::make($request->all(), [
-            'subdomain' => 'required',
-        ], [
-            'required' => 'The :attribute field is required.',
-        ]);
-
-        if ($validator->fails()) {
-            $httpConnection->send(respond_json(['errors' => $validator->getMessageBag()], 401));
-            $httpConnection->close();
-
-            return;
-        }
-
-        $this->userRepository->getUserByToken($request->get('auth_token', ''))
-            ->then(function ($user) use ($httpConnection, $request) {
-                if (is_null($user)) {
-                    $httpConnection->send(respond_json(['error' => 'The user does not exist'], 404));
-                    $httpConnection->close();
-
-                    return;
-                }
-
-                if ($user['can_specify_subdomains'] === 0) {
-                    $httpConnection->send(respond_json(['error' => 'The user is not allowed to reserve subdomains.'], 401));
-                    $httpConnection->close();
-
-                    return;
-                }
-
-                $insertData = [
-                    'user_id' => $user['id'],
-                    'subdomain' => $request->get('subdomain'),
-                ];
-
-                $this->subdomainRepository
-                    ->storeSubdomain($insertData)
-                    ->then(function ($subdomain) use ($httpConnection) {
-                        if (is_null($subdomain)) {
-                            $httpConnection->send(respond_json(['error' => 'The subdomain is already taken.'], 422));
-                            $httpConnection->close();
-
-                            return;
-                        }
-                        $httpConnection->send(respond_json(['subdomain' => $subdomain], 200));
-                        $httpConnection->close();
-                    });
-            });
-    }
-}

app/Server/Http/Controllers/Admin/StoreUsersController.php

@@ -39,8 +39,6 @@ class StoreUsersController extends AdminController
         $insertData = [
             'name' => $request->get('name'),
             'auth_token' => (string) Str::uuid(),
-            'can_specify_subdomains' => (int) $request->get('can_specify_subdomains'),
-            'can_share_tcp_ports' => (int) $request->get('can_share_tcp_ports'),
         ];
 
         $this->userRepository

app/Server/Http/Controllers/ControlMessageController.php

@@ -3,13 +3,12 @@
 namespace App\Server\Http\Controllers;
 
 use App\Contracts\ConnectionManager;
-use App\Contracts\SubdomainRepository;
 use App\Contracts\UserRepository;
 use App\Http\QueryParameters;
-use App\Server\Exceptions\NoFreePortAvailable;
 use Ratchet\ConnectionInterface;
 use Ratchet\WebSocket\MessageComponentInterface;
 use React\Promise\Deferred;
+use React\Promise\FulfilledPromise;
 use React\Promise\PromiseInterface;
 use stdClass;
 
@@ -21,14 +20,10 @@ class ControlMessageController implements MessageComponentInterface
     /** @var UserRepository */
     protected $userRepository;
 
-    /** @var SubdomainRepository */
-    protected $subdomainRepository;
-
-    public function __construct(ConnectionManager $connectionManager, UserRepository $userRepository, SubdomainRepository $subdomainRepository)
+    public function __construct(ConnectionManager $connectionManager, UserRepository $userRepository)
     {
         $this->connectionManager = $connectionManager;
         $this->userRepository = $userRepository;
-        $this->subdomainRepository = $subdomainRepository;
     }
 
     /**
@@ -59,10 +54,6 @@ class ControlMessageController implements MessageComponentInterface
         if (isset($connection->request_id)) {
             return $this->sendResponseToHttpConnection($connection->request_id, $msg);
         }
-        if (isset($connection->tcp_request_id)) {
-            $connectionInfo = $this->connectionManager->findControlConnectionForClientId($connection->tcp_client_id);
-            $connectionInfo->proxyConnection->write($msg);
-        }
 
         try {
             $payload = json_decode($msg);
@@ -86,12 +77,23 @@ class ControlMessageController implements MessageComponentInterface
     protected function authenticate(ConnectionInterface $connection, $data)
     {
         $this->verifyAuthToken($connection)
-            ->then(function ($user) use ($connection, $data) {
-                if ($data->type === 'http') {
-                    $this->handleHttpConnection($connection, $data, $user);
-                } elseif ($data->type === 'tcp') {
-                    $this->handleTcpConnection($connection, $data, $user);
+            ->then(function () use ($connection, $data) {
+                if (! $this->hasValidSubdomain($connection, $data->subdomain)) {
+                    return;
                 }
+
+                $connectionInfo = $this->connectionManager->storeConnection($data->host, $data->subdomain, $connection);
+
+                $this->connectionManager->limitConnectionLength($connectionInfo, config('expose.admin.maximum_connection_length'));
+
+                $connection->send(json_encode([
+                    'event' => 'authenticated',
+                    'data' => [
+                        'message' => config('expose.admin.messages.message_of_the_day'),
+                        'subdomain' => $connectionInfo->subdomain,
+                        'client_id' => $connectionInfo->client_id,
+                    ],
+                ]));
             }, function () use ($connection) {
                 $connection->send(json_encode([
                     'event' => 'authenticationFailed',
@@ -103,61 +105,6 @@ class ControlMessageController implements MessageComponentInterface
             });
     }
 
-    protected function handleHttpConnection(ConnectionInterface $connection, $data, $user = null)
-    {
-        $this->hasValidSubdomain($connection, $data->subdomain, $user)->then(function ($subdomain) use ($data, $connection) {
-            if ($subdomain === false) {
-                return;
-            }
-
-            $data->subdomain = $subdomain;
-
-            $connectionInfo = $this->connectionManager->storeConnection($data->host, $data->subdomain, $connection);
-
-            $this->connectionManager->limitConnectionLength($connectionInfo, config('expose.admin.maximum_connection_length'));
-
-            $connection->send(json_encode([
-                'event' => 'authenticated',
-                'data' => [
-                    'message' => config('expose.admin.messages.message_of_the_day'),
-                    'subdomain' => $connectionInfo->subdomain,
-                    'client_id' => $connectionInfo->client_id,
-                ],
-            ]));
-        });
-    }
-
-    protected function handleTcpConnection(ConnectionInterface $connection, $data, $user = null)
-    {
-        if (! $this->canShareTcpPorts($connection, $data, $user)) {
-            return;
-        }
-
-        try {
-            $connectionInfo = $this->connectionManager->storeTcpConnection($data->port, $connection);
-        } catch (NoFreePortAvailable $exception) {
-            $connection->send(json_encode([
-                'event' => 'authenticationFailed',
-                'data' => [
-                    'message' => config('expose.admin.messages.no_free_tcp_port_available'),
-                ],
-            ]));
-            $connection->close();
-
-            return;
-        }
-
-        $connection->send(json_encode([
-            'event' => 'authenticated',
-            'data' => [
-                'message' => config('expose.admin.messages.message_of_the_day'),
-                'port' => $connectionInfo->port,
-                'shared_port' => $connectionInfo->shared_port,
-                'client_id' => $connectionInfo->client_id,
-            ],
-        ]));
-    }
-
     protected function registerProxy(ConnectionInterface $connection, $data)
     {
         $connection->request_id = $data->request_id;
@@ -169,18 +116,6 @@ class ControlMessageController implements MessageComponentInterface
         ]);
     }
 
-    protected function registerTcpProxy(ConnectionInterface $connection, $data)
-    {
-        $connection->tcp_client_id = $data->client_id;
-        $connection->tcp_request_id = $data->tcp_request_id;
-
-        $connectionInfo = $this->connectionManager->findControlConnectionForClientId($data->client_id);
-
-        $connectionInfo->emit('tcp_proxy_ready_'.$data->tcp_request_id, [
-            $connection,
-        ]);
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -192,7 +127,7 @@ class ControlMessageController implements MessageComponentInterface
     protected function verifyAuthToken(ConnectionInterface $connection): PromiseInterface
     {
         if (config('expose.admin.validate_auth_tokens') !== true) {
-            return \React\Promise\resolve(null);
+            return new FulfilledPromise();
         }
 
         $deferred = new Deferred();
@@ -212,79 +147,24 @@ class ControlMessageController implements MessageComponentInterface
         return $deferred->promise();
     }
 
-    protected function hasValidSubdomain(ConnectionInterface $connection, ?string $subdomain, ?array $user): PromiseInterface
+    protected function hasValidSubdomain(ConnectionInterface $connection, ?string $subdomain): bool
     {
-        /**
-         * Check if the user can specify a custom subdomain in the first place.
-         */
-        if (! is_null($user) && $user['can_specify_subdomains'] === 0 && ! is_null($subdomain)) {
-            $connection->send(json_encode([
-                'event' => 'info',
-                'data' => [
-                    'message' => config('expose.admin.messages.custom_subdomain_unauthorized').PHP_EOL,
-                ],
-            ]));
-
-            return \React\Promise\resolve(null);
-        }
-
-        /**
-         * Check if the given subdomain is reserved for a different user.
-         */
         if (! is_null($subdomain)) {
-            return $this->subdomainRepository->getSubdomainByName($subdomain)
-                ->then(function ($foundSubdomain) use ($connection, $subdomain, $user) {
-                    if (! is_null($foundSubdomain) && ! is_null($user) && $foundSubdomain['user_id'] !== $user['id']) {
-                        $message = config('expose.admin.messages.subdomain_reserved');
-                        $message = str_replace(':subdomain', $subdomain, $message);
+            $controlConnection = $this->connectionManager->findControlConnectionForSubdomain($subdomain);
+            if (! is_null($controlConnection) || $subdomain === config('expose.admin.subdomain')) {
+                $message = config('expose.admin.messages.subdomain_taken');
+                $message = str_replace(':subdomain', $subdomain, $message);
 
-                        $connection->send(json_encode([
-                            'event' => 'subdomainTaken',
-                            'data' => [
-                                'message' => $message,
-                            ],
-                        ]));
-                        $connection->close();
+                $connection->send(json_encode([
+                    'event' => 'subdomainTaken',
+                    'data' => [
+                        'message' => $message,
+                    ],
+                ]));
+                $connection->close();
 
-                        return \React\Promise\resolve(false);
-                    }
-
-                    $controlConnection = $this->connectionManager->findControlConnectionForSubdomain($subdomain);
-
-                    if (! is_null($controlConnection) || $subdomain === config('expose.admin.subdomain')) {
-                        $message = config('expose.admin.messages.subdomain_taken');
-                        $message = str_replace(':subdomain', $subdomain, $message);
-
-                        $connection->send(json_encode([
-                            'event' => 'subdomainTaken',
-                            'data' => [
-                                'message' => $message,
-                            ],
-                        ]));
-                        $connection->close();
-
-                        return \React\Promise\resolve(false);
-                    }
-
-                    return \React\Promise\resolve($subdomain);
-                });
-        }
-
-        return \React\Promise\resolve($subdomain);
-    }
-
-    protected function canShareTcpPorts(ConnectionInterface $connection, $data, $user)
-    {
-        if (! is_null($user) && $user['can_share_tcp_ports'] === 0) {
-            $connection->send(json_encode([
-                'event' => 'authenticationFailed',
-                'data' => [
-                    'message' => config('expose.admin.messages.custom_subdomain_unauthorized'),
-                ],
-            ]));
-            $connection->close();
-
-            return false;
+                return false;
+            }
         }
 
         return true;

app/Server/SubdomainRepository/DatabaseSubdomainRepository.php

@@ -1,132 +0,0 @@
-<?php
-
-namespace App\Server\SubdomainRepository;
-
-use App\Contracts\SubdomainRepository;
-use Clue\React\SQLite\DatabaseInterface;
-use Clue\React\SQLite\Result;
-use React\Promise\Deferred;
-use React\Promise\PromiseInterface;
-
-class DatabaseSubdomainRepository implements SubdomainRepository
-{
-    /** @var DatabaseInterface */
-    protected $database;
-
-    public function __construct(DatabaseInterface $database)
-    {
-        $this->database = $database;
-    }
-
-    public function getSubdomains(): PromiseInterface
-    {
-        $deferred = new Deferred();
-
-        $this->database
-            ->query('SELECT * FROM subdomains ORDER by created_at DESC')
-            ->then(function (Result $result) use ($deferred) {
-                $deferred->resolve($result->rows);
-            });
-
-        return $deferred->promise();
-    }
-
-    public function getSubdomainById($id): PromiseInterface
-    {
-        $deferred = new Deferred();
-
-        $this->database
-            ->query('SELECT * FROM subdomains WHERE id = :id', ['id' => $id])
-            ->then(function (Result $result) use ($deferred) {
-                $deferred->resolve($result->rows[0] ?? null);
-            });
-
-        return $deferred->promise();
-    }
-
-    public function getSubdomainByName(string $name): PromiseInterface
-    {
-        $deferred = new Deferred();
-
-        $this->database
-            ->query('SELECT * FROM subdomains WHERE subdomain = :name', ['name' => $name])
-            ->then(function (Result $result) use ($deferred) {
-                $deferred->resolve($result->rows[0] ?? null);
-            });
-
-        return $deferred->promise();
-    }
-
-    public function getSubdomainsByUserId($id): PromiseInterface
-    {
-        $deferred = new Deferred();
-
-        $this->database
-            ->query('SELECT * FROM subdomains WHERE user_id = :user_id ORDER by created_at DESC', [
-                'user_id' => $id,
-            ])
-            ->then(function (Result $result) use ($deferred) {
-                $deferred->resolve($result->rows);
-            });
-
-        return $deferred->promise();
-    }
-
-    public function storeSubdomain(array $data): PromiseInterface
-    {
-        $deferred = new Deferred();
-
-        $this->getSubdomainByName($data['subdomain'])
-            ->then(function ($registeredSubdomain) use ($data, $deferred) {
-                if (! is_null($registeredSubdomain)) {
-                    $deferred->resolve(null);
-
-                    return;
-                }
-
-                $this->database->query("
-                    INSERT INTO subdomains (user_id, subdomain, created_at)
-                    VALUES (:user_id, :subdomain, DATETIME('now'))
-                ", $data)
-                    ->then(function (Result $result) use ($deferred) {
-                        $this->database->query('SELECT * FROM subdomains WHERE id = :id', ['id' => $result->insertId])
-                            ->then(function (Result $result) use ($deferred) {
-                                $deferred->resolve($result->rows[0]);
-                            });
-                    });
-            });
-
-        return $deferred->promise();
-    }
-
-    public function getSubdomainsByUserIdAndName($id, $name): PromiseInterface
-    {
-        $deferred = new Deferred();
-
-        $this->database
-            ->query('SELECT * FROM subdomains WHERE user_id = :user_id AND subdomain = :name ORDER by created_at DESC', [
-                'user_id' => $id,
-                'name' => $name,
-            ])
-            ->then(function (Result $result) use ($deferred) {
-                $deferred->resolve($result->rows);
-            });
-
-        return $deferred->promise();
-    }
-
-    public function deleteSubdomainForUserId($userId, $subdomainId): PromiseInterface
-    {
-        $deferred = new Deferred();
-
-        $this->database->query('DELETE FROM subdomains WHERE id = :id AND user_id = :user_id', [
-            'id' => $subdomainId,
-            'user_id' => $userId,
-        ])
-            ->then(function (Result $result) use ($deferred) {
-                $deferred->resolve($result);
-            });
-
-        return $deferred->promise();
-    }
-}

app/Server/UserRepository/DatabaseUserRepository.php

@@ -2,7 +2,6 @@
 
 namespace App\Server\UserRepository;
 
-use App\Contracts\ConnectionManager;
 use App\Contracts\UserRepository;
 use Clue\React\SQLite\DatabaseInterface;
 use Clue\React\SQLite\Result;
@@ -14,13 +13,9 @@ class DatabaseUserRepository implements UserRepository
     /** @var DatabaseInterface */
     protected $database;
 
-    /** @var ConnectionManager */
-    protected $connectionManager;
-
-    public function __construct(DatabaseInterface $database, ConnectionManager $connectionManager)
+    public function __construct(DatabaseInterface $database)
     {
         $this->database = $database;
-        $this->connectionManager = $connectionManager;
     }
 
     public function getUsers(): PromiseInterface
@@ -51,12 +46,8 @@ class DatabaseUserRepository implements UserRepository
                     $nextPage = $currentPage + 1;
                 }
 
-                $users = collect($result->rows)->map(function ($user) {
-                    return $this->getUserDetails($user);
-                })->toArray();
-
                 $paginated = [
-                    'users' => $users,
+                    'users' => $result->rows,
                     'current_page' => $currentPage,
                     'per_page' => $perPage,
                     'next_page' => $nextPage ?? null,
@@ -69,14 +60,6 @@ class DatabaseUserRepository implements UserRepository
         return $deferred->promise();
     }
 
-    protected function getUserDetails(array $user)
-    {
-        $user['sites'] = $user['auth_token'] !== '' ? $this->connectionManager->getConnectionsForAuthToken($user['auth_token']) : [];
-        $user['tcp_connections'] = $user['auth_token'] !== '' ? $this->connectionManager->getTcpConnectionsForAuthToken($user['auth_token']) : [];
-
-        return $user;
-    }
-
     public function getUserById($id): PromiseInterface
     {
         $deferred = new Deferred();
@@ -84,13 +67,7 @@ class DatabaseUserRepository implements UserRepository
         $this->database
             ->query('SELECT * FROM users WHERE id = :id', ['id' => $id])
             ->then(function (Result $result) use ($deferred) {
-                $user = $result->rows[0] ?? null;
-
-                if (! is_null($user)) {
-                    $user = $this->getUserDetails($user);
-                }
-
-                $deferred->resolve($user);
+                $deferred->resolve($result->rows[0] ?? null);
             });
 
         return $deferred->promise();
@@ -114,8 +91,8 @@ class DatabaseUserRepository implements UserRepository
         $deferred = new Deferred();
 
         $this->database->query("
-            INSERT INTO users (name, auth_token, can_specify_subdomains, can_share_tcp_ports, created_at)
-            VALUES (:name, :auth_token, :can_specify_subdomains, :can_share_tcp_ports, DATETIME('now'))
+            INSERT INTO users (name, auth_token, created_at)
+            VALUES (:name, :auth_token, DATETIME('now'))
         ", $data)
             ->then(function (Result $result) use ($deferred) {
                 $this->database->query('SELECT * FROM users WHERE id = :id', ['id' => $result->insertId])

composer.json

@@ -17,7 +17,8 @@
     ],
     "require": {
         "php": "^7.3.0",
-        "ext-json": "*"
+        "ext-json": "*",
+        "padraic/phar-updater": "^1.0.6"
     },
     "require-dev": {
         "cboden/ratchet": "^0.4.2",
@@ -38,7 +39,7 @@
         "phpunit/phpunit": "^8.5",
         "ratchet/pawl": "^0.3.4",
         "react/http": "^0.8.6",
-        "react/socket": "^1.6",
+        "react/socket": "dev-master as 1.1",
         "react/stream": "^1.1.1",
         "riverline/multipart-parser": "^2.0",
         "symfony/expression-language": "^5.0",

config/expose.php

@@ -151,24 +151,6 @@ return [
         */
         'validate_auth_tokens' => false,
 
-        /*
-        |--------------------------------------------------------------------------
-        | TCP Port Range
-        |--------------------------------------------------------------------------
-        |
-        | Expose allows you to also share TCP ports, for example when sharing your
-        | local SSH server with the public. This setting allows you to define the
-        | port range that Expose will use to assign new ports to the users.
-        |
-        | Note: Do not use port ranges below 1024, as it might require root
-        | privileges to assign these ports.
-        |
-        */
-        'tcp_port_range' => [
-            'from' => 50000,
-            'to' => 60000,
-        ],
-
         /*
         |--------------------------------------------------------------------------
         | Maximum connection length
@@ -232,8 +214,6 @@ return [
         */
         'user_repository' => \App\Server\UserRepository\DatabaseUserRepository::class,
 
-        'subdomain_repository' => \App\Server\SubdomainRepository\DatabaseSubdomainRepository::class,
-
         /*
         |--------------------------------------------------------------------------
         | Messages
@@ -250,10 +230,6 @@ return [
             'invalid_auth_token' => 'Authentication failed. Please check your authentication token and try again.',
 
             'subdomain_taken' => 'The chosen subdomain :subdomain is already taken. Please choose a different subdomain.',
-
-            'custom_subdomain_unauthorized' => 'You are not allowed to specify custom subdomains. Please upgrade to Expose Pro. Assigning a random subdomain instead.',
-
-            'no_free_tcp_port_available' => 'There are no free TCP ports available on this server. Please try again later.',
         ],
     ],
 ];

database/migrations/02_add_feature_flags_to_users_table.sql

@@ -1 +0,0 @@
-ALTER TABLE users ADD can_specify_subdomains BOOLEAN DEFAULT 1;

database/migrations/03_add_tcp_sharing_flag_to_users_table.sql

@@ -1 +0,0 @@
-ALTER TABLE users ADD can_share_tcp_ports BOOLEAN DEFAULT 1;

database/migrations/04_create_subdomains_table.sql

@@ -1,7 +0,0 @@
-CREATE TABLE IF NOT EXISTS subdomains (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    user_id INTEGER NOT NULL,
-    subdomain STRING NOT NULL,
-    created_at DATETIME,
-    updated_at DATETIME
-)

docs/server/ssl.md

@@ -7,9 +7,7 @@ order: 2
 
 Once your Expose server is running, you can only access it over the port that you configure when the server gets started.
 
-If you want to enable SSL support, you will need to use a proxy service - like Nginx, HAProxy, Apache2 or Caddy - to handle the SSL configurations and proxy all non-SSL requests to your expose server.
-
-## Nginx configuration
+If you want to enable SSL support, you will need to use a proxy service - like Nginx, HAProxy or Caddy - to handle the SSL configurations and proxy all non-SSL requests to your expose server.
 
 A basic Nginx configuration would look like this, but you might want to tweak the SSL parameters to your liking.
 
@@ -42,47 +40,3 @@ server {
   }
 }
 ```
-
-## Apache2 configuration
-
-A basic Apache configuration would look like this, but you might want to tweak the SSL parameters to your liking.
-
-```
-Listen 80
-Listen 443
-
-<IfModule mod_ssl.c>
-<VirtualHost *:443>
-	ServerName expose.domain.tld
-	ServerAlias *.expose.domain.tld
-	LoadModule        proxy_module            modules/mod_proxy.so
-	LoadModule        proxy_http_module       modules/mod_proxy_http.so
-
-	ServerAdmin admin@domain.tld
-
-	ProxyPass "/" "http://localhost:8080/"
-	ProxyPassReverse "/" "http://localhost:8080/"
-	ProxyPreserveHost On
-	
-
-	# Needed for websocket support
-	RewriteCond %{HTTP:UPGRADE} ^WebSocket$ [NC,OR]
-	RewriteCond %{HTTP:CONNECTION} ^Upgrade$ [NC]
-	RewriteRule .* ws://127.0.0.1:8080%{REQUEST_URI} [P,QSA,L]
-
-	<Proxy http://localhost:8080>
-
-		Require all granted
-
-		Options none
-	</Proxy>
-
-	ErrorLog ${APACHE_LOG_DIR}/expose.domain.tld-error.log
-	CustomLog ${APACHE_LOG_DIR}/expose.domain.tld-access.log combined
-
-	SSLCertificateFile /etc/letsencrypt/live/expose.domain.tld-0001/fullchain.pem
-	SSLCertificateKeyFile /etc/letsencrypt/live/expose.domain.tld-0001/privkey.pem
-	Include /etc/letsencrypt/options-ssl-apache.conf
-</VirtualHost>
-</IfModule>
-```

resources/views/client/fileserver.twig

@@ -1,93 +0,0 @@
-<html lang="en">
-<head>
-    <title>Expose Fileserver</title>
-    <script src="https://cdn.jsdelivr.net/npm/vue@2.5.17/dist/vue.min.js"></script>
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@tailwindcss/ui@latest/dist/tailwind-ui.min.css">
-    <script src="https://cdn.jsdelivr.net/npm/clipboard@2/dist/clipboard.min.js"></script>
-    <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.1.0/build/styles/github.min.css">
-    <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.1.0/build/highlight.min.js" async></script>
-</head>
-<body>
-<div id="app" class="">
-    <div class="relative bg-indigo-600" style="marign-left: -1px">
-        <div class="max-w-screen-xl mx-auto py-3 px-3 sm:px-6 lg:px-8">
-            <div class="pr-16 sm:text-center sm:px-16">
-                <p class="font-medium text-white flex justify-center">
-                    <span class="inline-block font-mono">{{ directory }}</span>
-                </p>
-            </div>
-        </div>
-    </div>
-    {% macro bytesToSize(bytes) %}
-            {% set kilobyte = 1024 %}
-            {% set megabyte = kilobyte * 1024 %}
-            {% set gigabyte = megabyte * 1024 %}
-            {% set terabyte = gigabyte * 1024 %}
-
-            {% if bytes < kilobyte %}
-                {{ bytes ~ ' B' }}
-            {% elseif bytes < megabyte %}
-                {{ (bytes / kilobyte)|number_format(2, '.') ~ ' KiB' }}
-            {% elseif bytes < gigabyte %}
-                {{ (bytes / megabyte)|number_format(2, '.') ~ ' MiB' }}
-            {% elseif bytes < terabyte %}
-                {{ (bytes / gigabyte)|number_format(2, '.') ~ ' GiB' }}
-            {% else %}
-                {{ (bytes / terabyte)|number_format(2, '.') ~ ' TiB' }}
-            {% endif %}
-    {% endmacro %}
-    <div class="flex flex-col px-6 py-4">
-        <div class="-my-2 overflow-x-auto sm:-mx-6 lg:-mx-8">
-            <div class="py-2 align-middle inline-block min-w-full sm:px-6 lg:px-8">
-                <div class="shadow overflow-hidden border-b border-gray-200 sm:rounded-lg">
-                    <table class="min-w-full divide-y divide-gray-200">
-                        <thead>
-                        <tr>
-                            <th class="px-6 py-3 bg-gray-50 text-left text-xs leading-4 font-medium text-gray-500 uppercase tracking-wider">
-                                Name
-                            </th>
-                            <th class="px-6 py-3 bg-gray-50 text-left text-xs leading-4 font-medium text-gray-500 uppercase tracking-wider">
-                                Date Modified
-                            </th>
-                            <th class="px-6 py-3 bg-gray-50 text-left text-xs leading-4 font-medium text-gray-500 uppercase tracking-wider">
-                                Size
-                            </th>
-                        </tr>
-                        </thead>
-                        <tbody class="bg-white">
-                        {% if currentPath != '/' %}
-                            <tr class="border-b">
-                                <td colspan="3" class="px-6 py-4 whitespace-no-wrap text-sm leading-5 font-mono text-gray-900">
-                                    <a href="/{{ parentPath }}" class="text-indigo-600 font-bold hover:text-indigo-900">Back</a>
-                                </td>
-                            </tr>
-                        {% endif %}
-                        {% for item in directoryContent %}
-                        <tr class="{% if loop.index % 2 == 0 %} bg-gray-50 {% endif %}">
-                            <td class="px-6 py-4 whitespace-no-wrap text-sm leading-5 font-mono text-gray-900">
-                                {% if currentPath != '/' %}
-                                    <a href="/{{ currentPath }}/{{ item.getFilename() }}" class="text-indigo-600 hover:text-indigo-900">{{ item.filename }}</a>
-                                {% else %}
-                                    <a href="/{{ item.getFilename() }}" class="text-indigo-600 hover:text-indigo-900">{{ item.filename }}</a>
-                                {% endif %}
-                            </td>
-                            <td class="px-6 py-4 whitespace-no-wrap text-sm leading-5 text-gray-500">
-                                {{ item.getMTime() | date("m/d/Y H:i:s") }}
-                            </td>
-                            <td class="px-6 py-4 whitespace-no-wrap text-sm leading-5 text-gray-500">
-                                {% if item.isDir() %}
-                                    -
-                                {% else %}
-                                    {{ _self.bytesToSize(item.getSize()) }}
-                                {% endif %}
-                            </td>
-                        </tr>
-                        {% endfor %}
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
-    </div>
-</body>
-</html>

resources/views/server/layouts/app.twig

@@ -27,12 +27,6 @@
                            ml-8 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium leading-5 focus:outline-none transition duration-150 ease-in-out">
                             Shared sites
                         </a>
-                        <a href="/tcp"
-                           class="
-                           {% if request.is('tcp') %} border-indigo-500 focus:border-indigo-700 text-gray-900 {% else %} border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300 focus:text-gray-700 focus:border-gray-300{% endif %}
-                           ml-8 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium leading-5 focus:outline-none transition duration-150 ease-in-out">
-                            TCP connections
-                        </a>
                         <a href="/settings"
                            class="
                            {% if request.is('settings') %} border-indigo-500 focus:border-indigo-700 text-gray-900 {% else %} border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300 focus:text-gray-700 focus:border-gray-300{% endif %}

resources/views/server/tcp/index.twig

@@ -1,73 +0,0 @@
-{% extends "app" %}
-{% block title %}TCP Connections{% endblock %}
-{% block content %}
-    <div class="flex flex-col py-8">
-        <div class="-my-2 py-2 overflow-x-auto sm:-mx-6 sm:px-6 lg:-mx-8 lg:px-8">
-            <div
-                class="align-middle inline-block min-w-full shadow overflow-hidden sm:rounded-lg border-b border-gray-200">
-                <table class="min-w-full" v-if="connections.length > 0">
-                    <thead>
-                    <tr>
-                        <th class="px-6 py-3 border-b border-gray-200 bg-gray-50 text-left text-xs leading-4 font-medium text-gray-500 uppercase tracking-wider">
-                            Local Port
-                        </th>
-                        <th class="px-6 py-3 border-b border-gray-200 bg-gray-50 text-left text-xs leading-4 font-medium text-gray-500 uppercase tracking-wider">
-                            Expose Port
-                        </th>
-                        <th class="px-6 py-3 border-b border-gray-200 bg-gray-50 text-left text-xs leading-4 font-medium text-gray-500 uppercase tracking-wider">
-                            Shared At
-                        </th>
-                        <th class="px-6 py-3 border-b border-gray-200 bg-gray-50"></th>
-                    </tr>
-                    </thead>
-                    <tbody class="bg-white">
-                        <tr v-for="connection in connections">
-                            <td class="px-6 py-4 whitespace-no-wrap border-b border-gray-200 text-sm leading-5 font-medium text-gray-900">
-                                @{ connection.port }
-                            </td>
-                            <td class="px-6 py-4 whitespace-no-wrap border-b border-gray-200 text-sm leading-5 text-gray-500">
-                                @{ connection.shared_port }
-                            </td>
-                            <td class="px-6 py-4 whitespace-no-wrap border-b border-gray-200 text-sm leading-5 text-gray-500">
-                                @{ connection.shared_at }
-                            </td>
-                            <td class="px-6 py-4 whitespace-no-wrap text-right border-b border-gray-200 text-sm leading-5 font-medium">
-                                <a href="#"
-                                   @click.prevent="disconnectConnection(connection.client_id)"
-                                   class="pl-2 text-red-600 hover:text-red-900">Disconnect</a>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-                <div class="flex items-center justify-center text-gray-900 p-4" v-else>
-                    <span class="text-xl">There are no TCP connections shared with this server yet.</span>
-                </div>
-            </div>
-        </div>
-    </div>
-{% endblock %}
-{% block scripts %}
-    <script>
-        new Vue({
-            el: '#app',
-
-            delimiters: ['@{', '}'],
-
-            data: {
-                connections: {{ connections|json_encode|raw }}
-            },
-
-            methods: {
-                disconnectConnection(id) {
-                    fetch('/api/tcp/' + id, {
-                        method: 'DELETE',
-                    }).then((response) => {
-                        return response.json();
-                    }).then((data) => {
-                        this.connections = data.connections;
-                    });
-                }
-            }
-        })
-    </script>
-{% endblock %}

resources/views/server/users/index.twig

@@ -24,44 +24,6 @@
                             </div>
                         </div>
                     </div>
-                    <div class="sm:grid sm:grid-cols-3 sm:gap-4 sm:items-start sm:pt-5">
-                        <label for="can_specify_subdomains"
-                               class="block text-sm font-medium leading-5 text-gray-700 sm:mt-px sm:pt-2">
-                            Can specify custom subdomains
-                        </label>
-                        <div class="mt-1 sm:mt-0 sm:col-span-2">
-                            <div class="mt-2 flex items-center justify-between">
-                                <div class="flex items-center">
-                                    <input id="can_specify_subdomains"
-                                           v-model="userForm.can_specify_subdomains"
-                                           name="can_specify_subdomains"
-                                           value="1" type="checkbox" class="form-checkbox h-4 w-4 text-indigo-600 transition duration-150 ease-in-out" />
-                                    <label for="can_specify_subdomains" class="ml-2 block text-sm leading-5 text-gray-900">
-                                        Yes
-                                    </label>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="sm:grid sm:grid-cols-3 sm:gap-4 sm:items-start sm:pt-5">
-                        <label for="can_share_tcp_ports"
-                               class="block text-sm font-medium leading-5 text-gray-700 sm:mt-px sm:pt-2">
-                            Can share TCP ports
-                        </label>
-                        <div class="mt-1 sm:mt-0 sm:col-span-2">
-                            <div class="mt-2 flex items-center justify-between">
-                                <div class="flex items-center">
-                                    <input id="can_share_tcp_ports"
-                                           v-model="userForm.can_share_tcp_ports"
-                                           name="can_share_tcp_ports"
-                                           value="1" type="checkbox" class="form-checkbox h-4 w-4 text-indigo-600 transition duration-150 ease-in-out" />
-                                    <label for="can_share_tcp_ports" class="ml-2 block text-sm leading-5 text-gray-900">
-                                        Yes
-                                    </label>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
                 </div>
                 <div class="mt-8 border-t border-gray-200 pt-5">
                     <div class="flex justify-end">
@@ -89,12 +51,6 @@
                     <th class="px-6 py-3 border-b border-gray-200 bg-gray-50 text-left text-xs leading-4 font-medium text-gray-500 uppercase tracking-wider">
                         Auth-Token
                     </th>
-                    <th class="px-6 py-3 border-b border-gray-200 bg-gray-50 text-left text-xs leading-4 font-medium text-gray-500 uppercase tracking-wider">
-                        Custom Subdomains
-                    </th>
-                    <th class="px-6 py-3 border-b border-gray-200 bg-gray-50 text-left text-xs leading-4 font-medium text-gray-500 uppercase tracking-wider">
-                        TCP ports
-                    </th>
                     <th class="px-6 py-3 border-b border-gray-200 bg-gray-50 text-left text-xs leading-4 font-medium text-gray-500 uppercase tracking-wider">
                         Created At
                     </th>
@@ -109,22 +65,6 @@
                     <td class="px-6 py-4 whitespace-no-wrap border-b border-gray-200 text-sm leading-5 text-gray-500">
                         @{ user.auth_token }
                     </td>
-                    <td class="px-6 py-4 whitespace-no-wrap border-b border-gray-200 text-sm leading-5 text-gray-500">
-                        <span v-if="user.can_specify_subdomains === 0">
-                            No
-                        </span>
-                        <span v-else>
-                            Yes
-                        </span>
-                    </td>
-                    <td class="px-6 py-4 whitespace-no-wrap border-b border-gray-200 text-sm leading-5 text-gray-500">
-                        <span v-if="user.can_share_tcp_ports === 0">
-                            No
-                        </span>
-                        <span v-else>
-                            Yes
-                        </span>
-                    </td>
                     <td class="px-6 py-4 whitespace-no-wrap border-b border-gray-200 text-sm leading-5 text-gray-500">
                         @{ user.created_at }
                     </td>
@@ -173,8 +113,6 @@
                 data: {
                     userForm: {
                         name: '',
-                        can_specify_subdomains: true,
-                        can_share_tcp_ports: true,
                         errors: {},
                     },
                     paginated: {{ paginated|json_encode|raw }}
@@ -202,7 +140,7 @@
                         }).then((response) => {
                             return response.json();
                         }).then((data) => {
-                            this.getUsers(1)
+                            this.users = this.users.filter(u => u.id !== user.id);
                         });
                     },
                     saveUser() {
@@ -217,8 +155,6 @@
                         }).then((data) => {
                             if (data.user) {
                                 this.userForm.name = '';
-                                this.userForm.can_specify_subdomains = true;
-                                this.userForm.can_share_tcp_ports = true;
                                 this.userForm.errors = {};
                                 this.users.unshift(data.user);
                             }

tests/Feature/Client/DashboardTest.php

@@ -2,7 +2,6 @@
 
 namespace Tests\Feature\Client;
 
-use App\Client\Configuration;
 use App\Client\Factory;
 use App\Client\Http\HttpClient;
 use App\Logger\LoggedRequest;
@@ -130,10 +129,6 @@ class DashboardTest extends TestCase
 
     protected function startDashboard()
     {
-        app()->singleton(Configuration::class, function ($app) {
-            return new Configuration('localhost', '8080', false);
-        });
-
         $this->dashboardFactory = (new Factory())
             ->setLoop($this->loop)
             ->createHttpServer();

tests/Feature/Client/FileserverTest.php

@@ -1,111 +0,0 @@
-<?php
-
-namespace Tests\Feature\Client;
-
-use App\Client\Configuration;
-use App\Client\Factory;
-use Clue\React\Buzz\Browser;
-use Clue\React\Buzz\Message\ResponseException;
-use Psr\Http\Message\ResponseInterface;
-use Tests\Feature\TestCase;
-
-class FileserverTest extends TestCase
-{
-    /** @var Browser */
-    protected $browser;
-
-    /** @var Factory */
-    protected $clientFactory;
-
-    /** @var string */
-    protected $fileserverUrl;
-
-    public function setUp(): void
-    {
-        parent::setUp();
-
-        $this->browser = new Browser($this->loop);
-    }
-
-    public function tearDown(): void
-    {
-        parent::tearDown();
-
-        $this->clientFactory->getFileserver()->getSocket()->close();
-    }
-
-    /** @test */
-    public function accessing_the_fileserver_works()
-    {
-        $this->shareFolder(__DIR__);
-
-        /** @var ResponseInterface $response */
-        $response = $this->await($this->browser->get('http://'.$this->fileserverUrl));
-
-        $this->assertSame(200, $response->getStatusCode());
-    }
-
-    /** @test */
-    public function accessing_invalid_files_returns_404()
-    {
-        $this->shareFolder(__DIR__);
-
-        $this->expectException(ResponseException::class);
-        $this->expectExceptionMessage(404);
-
-        /** @var ResponseInterface $response */
-        $response = $this->await($this->browser->get('http://'.$this->fileserverUrl.'/invalid-file'));
-
-        $this->assertSame(404, $response->getStatusCode());
-    }
-
-    /** @test */
-    public function it_can_return_filtered_responses()
-    {
-        $this->shareFolder(__DIR__.'/../../fixtures', '*.md');
-
-        $this->expectException(ResponseException::class);
-        $this->expectExceptionMessage(404);
-
-        /** @var ResponseInterface $response */
-        $response = $this->await($this->browser->get('http://'.$this->fileserverUrl.'/test.txt'));
-
-        $this->assertSame(200, $response->getStatusCode());
-        $this->assertSame('test-file'.PHP_EOL, $response->getBody()->getContents());
-    }
-
-    /** @test */
-    public function it_can_return_file_responses()
-    {
-        $this->shareFolder(__DIR__.'/../../fixtures');
-
-        /** @var ResponseInterface $response */
-        $response = $this->await($this->browser->get('http://'.$this->fileserverUrl.'/test.txt'));
-
-        $this->assertSame(200, $response->getStatusCode());
-        $this->assertSame('test-file'.PHP_EOL, $response->getBody()->getContents());
-    }
-
-    /** @test */
-    public function it_can_return_file_responses_for_valid_filtered_files()
-    {
-        $this->shareFolder(__DIR__.'/../../fixtures', '*.txt');
-
-        /** @var ResponseInterface $response */
-        $response = $this->await($this->browser->get('http://'.$this->fileserverUrl.'/test.txt'));
-
-        $this->assertSame(200, $response->getStatusCode());
-        $this->assertSame('test-file'.PHP_EOL, $response->getBody()->getContents());
-    }
-
-    protected function shareFolder(string $folder, string $name = '')
-    {
-        app()->singleton(Configuration::class, function ($app) {
-            return new Configuration('localhost', '8080', false);
-        });
-
-        $factory = (new Factory())->setLoop($this->loop);
-        $this->fileserverUrl = $factory->createFileServer($folder, $name);
-        $this->clientFactory = $factory;
-    }
-}

tests/Feature/Server/AdminTest.php

@@ -8,7 +8,6 @@ use Clue\React\Buzz\Browser;
 use Clue\React\Buzz\Message\ResponseException;
 use GuzzleHttp\Psr7\Response;
 use Illuminate\Support\Str;
-use Nyholm\Psr7\Request;
 use Psr\Http\Message\ResponseInterface;
 use Ratchet\Server\IoConnection;
 use Tests\Feature\TestCase;
@@ -150,8 +149,6 @@ class AdminTest extends TestCase
         $connectionManager = app(ConnectionManager::class);
 
         $connection = \Mockery::mock(IoConnection::class);
-        $connection->httpRequest = new Request('GET', '/?authToken=some-token');
-
         $connectionManager->storeConnection('some-host.text', 'fixed-subdomain', $connection);
 
         /** @var Response $response */

tests/Feature/Server/ApiTest.php

@@ -1,381 +0,0 @@
-<?php
-
-namespace Tests\Feature\Server;
-
-use App\Contracts\ConnectionManager;
-use App\Server\Factory;
-use Clue\React\Buzz\Browser;
-use Clue\React\Buzz\Message\ResponseException;
-use GuzzleHttp\Psr7\Response;
-use Nyholm\Psr7\Request;
-use Ratchet\Server\IoConnection;
-use Tests\Feature\TestCase;
-
-class ApiTest extends TestCase
-{
-    /** @var Browser */
-    protected $browser;
-
-    /** @var Factory */
-    protected $serverFactory;
-
-    public function setUp(): void
-    {
-        parent::setUp();
-
-        $this->browser = new Browser($this->loop);
-        $this->browser = $this->browser->withOptions([
-            'followRedirects' => false,
-        ]);
-
-        $this->startServer();
-    }
-
-    public function tearDown(): void
-    {
-        $this->serverFactory->getSocket()->close();
-
-        parent::tearDown();
-    }
-
-    /** @test */
-    public function it_can_list_all_registered_users()
-    {
-        /** @var Response $response */
-        $this->await($this->browser->post('http://127.0.0.1:8080/api/users', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'name' => 'Marcel',
-        ])));
-
-        /** @var Response $response */
-        $response = $this->await($this->browser->get('http://127.0.0.1:8080/api/users', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ]));
-
-        $body = json_decode($response->getBody()->getContents());
-        $users = $body->paginated->users;
-
-        $this->assertCount(1, $users);
-        $this->assertSame('Marcel', $users[0]->name);
-        $this->assertSame([], $users[0]->sites);
-    }
-
-    /** @test */
-    public function it_does_not_allow_subdomain_reservation_for_users_without_the_right_flag()
-    {
-        /** @var Response $response */
-        $response = $this->await($this->browser->post('http://127.0.0.1:8080/api/users', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'name' => 'Marcel',
-        ])));
-
-        $user = json_decode($response->getBody()->getContents())->user;
-
-        $this->expectException(ResponseException::class);
-        $this->expectExceptionMessage('HTTP status code 401');
-
-        $this->await($this->browser->post('http://127.0.0.1:8080/api/subdomains', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'auth_token' => $user->auth_token,
-            'subdomain' => 'reserved',
-        ])));
-    }
-
-    /** @test */
-    public function it_allows_subdomain_reservation_for_users_with_the_right_flag()
-    {
-        /** @var Response $response */
-        $response = $this->await($this->browser->post('http://127.0.0.1:8080/api/users', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'name' => 'Marcel',
-            'can_specify_subdomains' => 1,
-        ])));
-
-        $user = json_decode($response->getBody()->getContents())->user;
-
-        $response = $this->await($this->browser->post('http://127.0.0.1:8080/api/subdomains', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'auth_token' => $user->auth_token,
-            'subdomain' => 'reserved',
-        ])));
-
-        $this->assertSame(200, $response->getStatusCode());
-    }
-
-    /** @test */
-    public function it_can_get_user_details()
-    {
-        /** @var Response $response */
-        $response = $this->await($this->browser->post('http://127.0.0.1:8080/api/users', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'name' => 'Marcel',
-            'can_specify_subdomains' => 1,
-        ])));
-
-        $user = json_decode($response->getBody()->getContents())->user;
-
-        $this->await($this->browser->post('http://127.0.0.1:8080/api/subdomains', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'auth_token' => $user->auth_token,
-            'subdomain' => 'reserved',
-        ])));
-
-        /** @var Response $response */
-        $response = $this->await($this->browser->get('http://127.0.0.1:8080/api/users/1', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ]));
-
-        $body = json_decode($response->getBody()->getContents());
-        $user = $body->user;
-        $subdomains = $body->subdomains;
-
-        $this->assertSame('Marcel', $user->name);
-        $this->assertSame([], $user->sites);
-        $this->assertSame([], $user->tcp_connections);
-
-        $this->assertCount(1, $subdomains);
-    }
-
-    /** @test */
-    public function it_can_delete_subdomains()
-    {
-        /** @var Response $response */
-        $response = $this->await($this->browser->post('http://127.0.0.1:8080/api/users', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'name' => 'Marcel',
-            'can_specify_subdomains' => 1,
-        ])));
-
-        $user = json_decode($response->getBody()->getContents())->user;
-
-        $response = $this->await($this->browser->post('http://127.0.0.1:8080/api/subdomains', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'subdomain' => 'reserved',
-            'auth_token' => $user->auth_token,
-        ])));
-
-        $this->await($this->browser->delete('http://127.0.0.1:8080/api/subdomains/1', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'auth_token' => $user->auth_token,
-        ])));
-
-        /** @var Response $response */
-        $response = $this->await($this->browser->get('http://127.0.0.1:8080/api/users/1', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ]));
-
-        $body = json_decode($response->getBody()->getContents());
-        $subdomains = $body->subdomains;
-
-        $this->assertCount(0, $subdomains);
-    }
-
-    /** @test */
-    public function it_can_not_reserve_an_already_reserved_subdomain()
-    {
-        /** @var Response $response */
-        $response = $this->await($this->browser->post('http://127.0.0.1:8080/api/users', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'name' => 'Marcel',
-            'can_specify_subdomains' => 1,
-        ])));
-
-        $user = json_decode($response->getBody()->getContents())->user;
-
-        $this->await($this->browser->post('http://127.0.0.1:8080/api/subdomains', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'subdomain' => 'reserved',
-            'auth_token' => $user->auth_token,
-        ])));
-
-        $response = $this->await($this->browser->post('http://127.0.0.1:8080/api/users', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'name' => 'Sebastian',
-            'can_specify_subdomains' => 1,
-        ])));
-
-        $user = json_decode($response->getBody()->getContents())->user;
-
-        $this->expectException(ResponseException::class);
-        $this->expectExceptionMessage('HTTP status code 422');
-
-        $this->await($this->browser->post('http://127.0.0.1:8080/api/subdomains', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'subdomain' => 'reserved',
-            'auth_token' => $user->auth_token,
-        ])));
-
-        $response = $this->await($this->browser->get('http://127.0.0.1:8080/api/users/2', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ]));
-
-        $body = json_decode($response->getBody()->getContents());
-        $subdomains = $body->subdomains;
-
-        $this->assertCount(0, $subdomains);
-    }
-
-    /** @test */
-    public function it_can_list_all_currently_connected_sites_from_all_users()
-    {
-        /** @var Response $response */
-        $response = $this->await($this->browser->post('http://127.0.0.1:8080/api/users', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'name' => 'Marcel',
-        ])));
-
-        $createdUser = json_decode($response->getBody()->getContents())->user;
-
-        /** @var ConnectionManager $connectionManager */
-        $connectionManager = app(ConnectionManager::class);
-
-        $connection = \Mockery::mock(IoConnection::class);
-        $connection->httpRequest = new Request('GET', '/?authToken='.$createdUser->auth_token);
-        $connectionManager->storeConnection('some-host.test', 'fixed-subdomain', $connection);
-
-        $connection = \Mockery::mock(IoConnection::class);
-        $connection->httpRequest = new Request('GET', '/?authToken=some-other-token');
-        $connectionManager->storeConnection('some-different-host.test', 'different-subdomain', $connection);
-
-        $connection = \Mockery::mock(IoConnection::class);
-        $connection->httpRequest = new Request('GET', '/?authToken='.$createdUser->auth_token);
-        $connectionManager->storeTcpConnection(2525, $connection);
-
-        /** @var Response $response */
-        $response = $this->await($this->browser->get('http://127.0.0.1:8080/api/users', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ]));
-
-        $body = json_decode($response->getBody()->getContents());
-        $users = $body->paginated->users;
-
-        $this->assertCount(1, $users[0]->sites);
-        $this->assertCount(1, $users[0]->tcp_connections);
-        $this->assertSame('some-host.test', $users[0]->sites[0]->host);
-        $this->assertSame('fixed-subdomain', $users[0]->sites[0]->subdomain);
-    }
-
-    /** @test */
-    public function it_can_list_all_currently_connected_sites()
-    {
-        /** @var ConnectionManager $connectionManager */
-        $connectionManager = app(ConnectionManager::class);
-
-        $connection = \Mockery::mock(IoConnection::class);
-        $connection->httpRequest = new Request('GET', '/?authToken=some-token');
-
-        $connectionManager->storeConnection('some-host.test', 'fixed-subdomain', $connection);
-
-        /** @var Response $response */
-        $response = $this->await($this->browser->get('http://127.0.0.1:8080/api/sites', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ]));
-
-        $body = json_decode($response->getBody()->getContents());
-        $sites = $body->sites;
-
-        $this->assertCount(1, $sites);
-        $this->assertSame('some-host.test', $sites[0]->host);
-        $this->assertSame('some-token', $sites[0]->auth_token);
-        $this->assertSame('fixed-subdomain', $sites[0]->subdomain);
-    }
-
-    /** @test */
-    public function it_can_list_all_currently_connected_sites_without_auth_tokens()
-    {
-        /** @var ConnectionManager $connectionManager */
-        $connectionManager = app(ConnectionManager::class);
-
-        $connection = \Mockery::mock(IoConnection::class);
-        $connection->httpRequest = new Request('GET', '/');
-
-        $connectionManager->storeConnection('some-host.test', 'fixed-subdomain', $connection);
-
-        /** @var Response $response */
-        $response = $this->await($this->browser->get('http://127.0.0.1:8080/api/sites', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ]));
-
-        $body = json_decode($response->getBody()->getContents());
-        $sites = $body->sites;
-
-        $this->assertCount(1, $sites);
-        $this->assertSame('some-host.test', $sites[0]->host);
-        $this->assertSame('', $sites[0]->auth_token);
-        $this->assertSame('fixed-subdomain', $sites[0]->subdomain);
-    }
-
-    protected function startServer()
-    {
-        $this->app['config']['expose.admin.subdomain'] = 'expose';
-        $this->app['config']['expose.admin.database'] = ':memory:';
-
-        $this->app['config']['expose.admin.users'] = [
-            'username' => 'secret',
-        ];
-
-        $this->serverFactory = new Factory();
-
-        $this->serverFactory->setLoop($this->loop)
-            ->createServer();
-    }
-}

tests/Feature/Server/TunnelTest.php

@@ -9,7 +9,6 @@ use Clue\React\Buzz\Message\ResponseException;
 use GuzzleHttp\Psr7\Response;
 use Psr\Http\Message\ServerRequestInterface;
 use React\Http\Server;
-use React\Socket\Connection;
 use Tests\Feature\TestCase;
 
 class TunnelTest extends TestCase
@@ -23,17 +22,11 @@ class TunnelTest extends TestCase
     /** @var \React\Socket\Server */
     protected $testHttpServer;
 
-    /** @var \React\Socket\Server */
-    protected $testTcpServer;
-
     public function setUp(): void
     {
         parent::setUp();
 
         $this->browser = new Browser($this->loop);
-        $this->browser = $this->browser->withOptions([
-            'followRedirects' => false,
-        ]);
 
         $this->startServer();
     }
@@ -46,10 +39,6 @@ class TunnelTest extends TestCase
             $this->testHttpServer->close();
         }
 
-        if (isset($this->testTcpServer)) {
-            $this->testTcpServer->close();
-        }
-
         parent::tearDown();
     }
 
@@ -69,8 +58,6 @@ class TunnelTest extends TestCase
     {
         $this->createTestHttpServer();
 
-        $this->app['config']['expose.admin.validate_auth_tokens'] = false;
-
         /**
          * We create an expose client that connects to our server and shares
          * the created test HTTP server.
@@ -89,93 +76,6 @@ class TunnelTest extends TestCase
         $this->assertSame('Hello World!', $response->getBody()->getContents());
     }
 
-    /** @test */
-    public function it_sends_incoming_requests_to_the_connected_client_via_tcp()
-    {
-        $this->createTestTcpServer();
-
-        $this->app['config']['expose.admin.validate_auth_tokens'] = false;
-
-        /**
-         * We create an expose client that connects to our server and shares
-         * the created test HTTP server.
-         */
-        $client = $this->createClient();
-        $response = $this->await($client->connectToServerAndShareTcp(8085));
-
-        /**
-         * Once the client is connected, we connect to the
-         * created tunnel.
-         */
-        $connector = new \React\Socket\Connector($this->loop);
-        $connection = $this->await($connector->connect('127.0.0.1:'.$response->shared_port));
-
-        $this->assertInstanceOf(Connection::class, $connection);
-    }
-
-    /** @test */
-    public function it_rejects_tcp_sharing_if_forbidden()
-    {
-        $this->createTestTcpServer();
-
-        $this->app['config']['expose.admin.validate_auth_tokens'] = true;
-
-        $response = $this->await($this->browser->post('http://127.0.0.1:8080/api/users', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'name' => 'Marcel',
-            'can_share_tcp_ports' => 0,
-        ])));
-
-        $user = json_decode($response->getBody()->getContents())->user;
-
-        $this->expectException(\UnexpectedValueException::class);
-
-        /**
-         * We create an expose client that connects to our server and shares
-         * the created test HTTP server.
-         */
-        $client = $this->createClient();
-        $this->await($client->connectToServerAndShareTcp(8085, $user->auth_token));
-    }
-
-    /** @test */
-    public function it_allows_tcp_sharing_if_enabled_for_user()
-    {
-        $this->createTestTcpServer();
-
-        $this->app['config']['expose.admin.validate_auth_tokens'] = true;
-
-        $response = $this->await($this->browser->post('http://127.0.0.1:8080/api/users', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'name' => 'Marcel',
-            'can_share_tcp_ports' => 1,
-        ])));
-
-        $user = json_decode($response->getBody()->getContents())->user;
-
-        /**
-         * We create an expose client that connects to our server and shares
-         * the created test HTTP server.
-         */
-        $client = $this->createClient();
-        $response = $this->await($client->connectToServerAndShareTcp(8085, $user->auth_token));
-
-        /**
-         * Once the client is connected, we connect to the
-         * created tunnel.
-         */
-        $connector = new \React\Socket\Connector($this->loop);
-        $connection = $this->await($connector->connect('127.0.0.1:'.$response->shared_port));
-
-        $this->assertInstanceOf(Connection::class, $connection);
-    }
-
     /** @test */
     public function it_rejects_clients_with_invalid_auth_tokens()
     {
@@ -198,179 +98,22 @@ class TunnelTest extends TestCase
     {
         $this->app['config']['expose.admin.validate_auth_tokens'] = true;
 
-        $response = $this->await($this->browser->post('http://127.0.0.1:8080/api/users', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'name' => 'Marcel',
-            'can_specify_subdomains' => 1,
-        ])));
-
-        $user = json_decode($response->getBody()->getContents())->user;
-
-        $this->createTestHttpServer();
-
-        /**
-         * We create an expose client that connects to our server and shares
-         * the created test HTTP server.
-         */
-        $client = $this->createClient();
-        $response = $this->await($client->connectToServer('127.0.0.1:8085', 'tunnel', $user->auth_token));
-
-        $this->assertSame('tunnel', $response->subdomain);
-    }
-
-    /** @test */
-    public function it_rejects_clients_to_specify_custom_subdomains()
-    {
-        $this->app['config']['expose.admin.validate_auth_tokens'] = true;
-
-        $response = $this->await($this->browser->post('http://127.0.0.1:8080/api/users', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'name' => 'Marcel',
-            'can_specify_subdomains' => 0,
-        ])));
-
-        $user = json_decode($response->getBody()->getContents())->user;
-
-        $this->createTestHttpServer();
-
-        /**
-         * We create an expose client that connects to our server and shares
-         * the created test HTTP server.
-         */
-        $client = $this->createClient();
-        $response = $this->await($client->connectToServer('127.0.0.1:8085', 'tunnel', $user->auth_token));
-
-        $this->assertNotSame('tunnel', $response->subdomain);
-    }
-
-    /** @test */
-    public function it_rejects_users_that_want_to_use_a_reserved_subdomain()
-    {
-        $this->app['config']['expose.admin.validate_auth_tokens'] = true;
-
-        $response = $this->await($this->browser->post('http://127.0.0.1:8080/api/users', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'name' => 'Marcel',
-            'can_specify_subdomains' => 1,
-        ])));
-
-        $user = json_decode($response->getBody()->getContents())->user;
-
-        $response = $this->await($this->browser->post('http://127.0.0.1:8080/api/subdomains', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'subdomain' => 'reserved',
-            'auth_token' => $user->auth_token,
-        ])));
-
-        $response = $this->await($this->browser->post('http://127.0.0.1:8080/api/users', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'name' => 'Test-User',
-            'can_specify_subdomains' => 1,
-        ])));
-
-        $user = json_decode($response->getBody()->getContents())->user;
-
         $this->createTestHttpServer();
 
         $this->expectException(\UnexpectedValueException::class);
-        /**
-         * We create an expose client that connects to our server and shares
-         * the created test HTTP server.
-         */
-        $client = $this->createClient();
-        $response = $this->await($client->connectToServer('127.0.0.1:8085', 'reserved', $user->auth_token));
-
-        $this->assertSame('reserved', $response->subdomain);
-    }
-
-    /** @test */
-    public function it_allows_users_to_use_their_own_reserved_subdomains()
-    {
-        $this->app['config']['expose.admin.validate_auth_tokens'] = true;
-
-        $response = $this->await($this->browser->post('http://127.0.0.1:8080/api/users', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'name' => 'Marcel',
-            'can_specify_subdomains' => 1,
-        ])));
-
-        $user = json_decode($response->getBody()->getContents())->user;
-
-        $response = $this->await($this->browser->post('http://127.0.0.1:8080/api/subdomains', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'subdomain' => 'reserved',
-            'auth_token' => $user->auth_token,
-        ])));
-
-        $this->createTestHttpServer();
-        /**
-         * We create an expose client that connects to our server and shares
-         * the created test HTTP server.
-         */
-        $client = $this->createClient();
-        $response = $this->await($client->connectToServer('127.0.0.1:8085', 'reserved', $user->auth_token));
-
-        $this->assertSame('reserved', $response->subdomain);
-    }
-
-    /** @test */
-    public function it_allows_clients_to_use_random_subdomains_if_custom_subdomains_are_forbidden()
-    {
-        $this->app['config']['expose.admin.validate_auth_tokens'] = true;
-
-        $response = $this->await($this->browser->post('http://127.0.0.1:8080/api/users', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'name' => 'Marcel',
-            'can_specify_subdomains' => 0,
-        ])));
-
-        $user = json_decode($response->getBody()->getContents())->user;
-
-        $this->createTestHttpServer();
 
         /**
          * We create an expose client that connects to our server and shares
          * the created test HTTP server.
          */
         $client = $this->createClient();
-        $response = $this->await($client->connectToServer('127.0.0.1:8085', '', $user->auth_token));
-
-        $this->assertInstanceOf(\stdClass::class, $response);
+        $this->await($client->connectToServer('127.0.0.1:8085', 'tunnel'));
     }
 
     protected function startServer()
     {
-        $this->app['config']['expose.admin.subdomain'] = 'expose';
         $this->app['config']['expose.admin.database'] = ':memory:';
 
-        $this->app['config']['expose.admin.users'] = [
-            'username' => 'secret',
-        ];
-
         $this->serverFactory = new Factory();
 
         $this->serverFactory->setLoop($this->loop)
@@ -399,15 +142,4 @@ class TunnelTest extends TestCase
         $this->testHttpServer = new \React\Socket\Server(8085, $this->loop);
         $server->listen($this->testHttpServer);
     }
-
-    protected function createTestTcpServer()
-    {
-        $this->testTcpServer = new \React\Socket\Server(8085, $this->loop);
-
-        $this->testTcpServer->on('connection', function (\React\Socket\ConnectionInterface $connection) {
-            $connection->write('Hello '.$connection->getRemoteAddress()."!\n");
-
-            $connection->pipe($connection);
-        });
-    }
 }

tests/fixtures/test.md

@@ -1 +0,0 @@
-# Markdown

tests/fixtures/test.txt

@@ -1 +0,0 @@
-test-file