Merge pull request #128 from beyondcode/analysis-1b2KYL

Apply fixes from StyleCI

app/Client/Client.php

@@ -197,14 +197,6 @@ class Client
 
     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);
 

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/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;
 
@@ -120,15 +116,6 @@ class Factory
         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 +134,18 @@ class Factory
         }
     }
 
-    protected function detectNextAvailablePort($startPort = 4040): int
+    protected function detectNextFreeDashboardPort($port = 4040): int
     {
-        while (is_resource(@fsockopen('127.0.0.1', $startPort))) {
+        while (is_resource(@fsockopen('127.0.0.1', $port))) {
-            $startPort++;
+            $port++;
         }
 
-        return $startPort;
+        return $port;
     }
 
     public function createHttpServer()
     {
-        $dashboardPort = $this->detectNextAvailablePort();
+        $dashboardPort = $this->detectNextFreeDashboardPort();
 
         config()->set('expose.dashboard_port', $dashboardPort);
 
@@ -169,25 +156,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);
@@ -93,8 +85,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 +126,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

@@ -32,7 +32,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([
@@ -76,8 +76,8 @@ class ProxyManager
             });
     }
 
-    protected function performRequest(WebSocket $proxyConnection, string $requestData, $connectionData)
+    protected function performRequest(WebSocket $proxyConnection, $requestId, string $requestData)
     {
-        app(HttpClient::class)->performRequest((string) $requestData, $proxyConnection, $connectionData);
+        app(HttpClient::class)->performRequest((string) $requestData, $proxyConnection, $requestId);
     }
 }

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/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));
+        return stream_for($twig->render('template', $data));
-        } catch (\Throwable $e) {
-            var_dump($e->getMessage());
-        }
     }
 }

app/Logger/LoggedRequest.php

@@ -19,8 +19,11 @@ class LoggedRequest implements \JsonSerializable
     /** @var Request */
     protected $parsedRequest;
 
-    /** @var LoggedResponse */
+    /** @var string */
-    protected $response;
+    protected $rawResponse;
+
+    /** @var Response */
+    protected $parsedResponse;
 
     /** @var string */
     protected $id;
@@ -68,8 +71,22 @@ class LoggedRequest implements \JsonSerializable
             ],
         ];
 
-        if ($this->response) {
+        if ($this->parsedResponse) {
-            $data['response'] = $this->response->toArray();
+            $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()

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/ControlConnection.php

@@ -43,8 +43,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,
             ],

app/Server/Factory.php

@@ -4,12 +4,10 @@ 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;
@@ -24,7 +22,6 @@ 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;
@@ -133,8 +130,6 @@ class Factory
         $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);
@@ -176,7 +171,6 @@ class Factory
         $this->bindConfiguration()
             ->bindSubdomainGenerator()
             ->bindUserRepository()
-            ->bindSubdomainRepository()
             ->bindDatabase()
             ->ensureDatabaseIsInitialized()
             ->bindConnectionManager()
@@ -213,15 +207,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/GetUserDetailsController.php

@@ -2,7 +2,6 @@
 
 namespace App\Server\Http\Controllers\Admin;
 
-use App\Contracts\SubdomainRepository;
 use App\Contracts\UserRepository;
 use Illuminate\Http\Request;
 use Ratchet\ConnectionInterface;
@@ -14,31 +13,21 @@ class GetUserDetailsController extends AdminController
     /** @var UserRepository */
     protected $userRepository;
 
-    /** @var SubdomainRepository */
+    public function __construct(UserRepository $userRepository)
-    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) {
+            ->then(function ($user) use ($httpConnection) {
-                $this->subdomainRepository->getSubdomainsByUserId($request->get('id'))
+                $httpConnection->send(
-                    ->then(function ($subdomains) use ($httpConnection, $user) {
+                    respond_json(['user' => $user])
-                        $httpConnection->send(
+                );
-                            respond_json([
-                                'user' => $user,
-                                'subdomains' => $subdomains,
-                            ])
-                        );
 
-                        $httpConnection->close();
+                $httpConnection->close();
-                    });
             });
     }
 }

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/ControlMessageController.php

@@ -3,7 +3,6 @@
 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;
@@ -21,14 +20,10 @@ class ControlMessageController implements MessageComponentInterface
     /** @var UserRepository */
     protected $userRepository;
 
-    /** @var SubdomainRepository */
+    public function __construct(ConnectionManager $connectionManager, UserRepository $userRepository)
-    protected $subdomainRepository;
-
-    public function __construct(ConnectionManager $connectionManager, UserRepository $userRepository, SubdomainRepository $subdomainRepository)
     {
         $this->connectionManager = $connectionManager;
         $this->userRepository = $userRepository;
-        $this->subdomainRepository = $subdomainRepository;
     }
 
     /**
@@ -105,26 +100,22 @@ 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 (! $this->hasValidSubdomain($connection, $data->subdomain, $user)) {
-            if ($subdomain === false) {
+            return;
-                return;
+        }
-            }
 
-            $data->subdomain = $subdomain;
+        $connectionInfo = $this->connectionManager->storeConnection($data->host, $data->subdomain, $connection);
 
-            $connectionInfo = $this->connectionManager->storeConnection($data->host, $data->subdomain, $connection);
+        $this->connectionManager->limitConnectionLength($connectionInfo, config('expose.admin.maximum_connection_length'));
 
-            $this->connectionManager->limitConnectionLength($connectionInfo, config('expose.admin.maximum_connection_length'));
+        $connection->send(json_encode([
-
+            'event' => 'authenticated',
-            $connection->send(json_encode([
+            'data' => [
-                'event' => 'authenticated',
+                'message' => config('expose.admin.messages.message_of_the_day'),
-                'data' => [
+                'subdomain' => $connectionInfo->subdomain,
-                    'message' => config('expose.admin.messages.message_of_the_day'),
+                'client_id' => $connectionInfo->client_id,
-                    'subdomain' => $connectionInfo->subdomain,
+            ],
-                    'client_id' => $connectionInfo->client_id,
+        ]));
-                ],
-            ]));
-        });
     }
 
     protected function handleTcpConnection(ConnectionInterface $connection, $data, $user = null)
@@ -212,65 +203,39 @@ class ControlMessageController implements MessageComponentInterface
         return $deferred->promise();
     }
 
-    protected function hasValidSubdomain(ConnectionInterface $connection, ?string $subdomain, ?array $user): PromiseInterface
+    protected function hasValidSubdomain(ConnectionInterface $connection, ?string $subdomain, ?array $user): 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',
+                'event' => 'subdomainTaken',
                 'data' => [
-                    'message' => config('expose.admin.messages.custom_subdomain_unauthorized').PHP_EOL,
+                    'message' => config('expose.admin.messages.custom_subdomain_unauthorized'),
                 ],
             ]));
+            $connection->close();
 
-            return \React\Promise\resolve(null);
+            return false;
         }
 
-        /**
-         * Check if the given subdomain is reserved for a different user.
-         */
         if (! is_null($subdomain)) {
-            return $this->subdomainRepository->getSubdomainByName($subdomain)
+            $controlConnection = $this->connectionManager->findControlConnectionForSubdomain($subdomain);
-                ->then(function ($foundSubdomain) use ($connection, $subdomain, $user) {
+            if (! is_null($controlConnection) || $subdomain === config('expose.admin.subdomain')) {
-                    if (! is_null($foundSubdomain) && ! is_null($user) && $foundSubdomain['user_id'] !== $user['id']) {
+                $message = config('expose.admin.messages.subdomain_taken');
-                        $message = config('expose.admin.messages.subdomain_reserved');
+                $message = str_replace(':subdomain', $subdomain, $message);
-                        $message = str_replace(':subdomain', $subdomain, $message);
 
-                        $connection->send(json_encode([
+                $connection->send(json_encode([
-                            'event' => 'subdomainTaken',
+                    'event' => 'subdomainTaken',
-                            'data' => [
+                    'data' => [
-                                'message' => $message,
+                        'message' => $message,
-                            ],
+                    ],
-                        ]));
+                ]));
-                        $connection->close();
+                $connection->close();
 
-                        return \React\Promise\resolve(false);
+                return 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);
+        return true;
     }
 
     protected function canShareTcpPorts(ConnectionInterface $connection, $data, $user)

app/Server/Http/Controllers/TunnelMessageController.php

@@ -75,7 +75,7 @@ class TunnelMessageController extends Controller
 
         $httpConnection = $this->connectionManager->storeHttpConnection($httpConnection, $requestId);
 
-        transform($this->passRequestThroughModifiers($request, $httpConnection), function (Request $request) use ($controlConnection, $requestId) {
+        transform($this->passRequestThroughModifiers($request, $httpConnection), function (Request $request) use ($controlConnection , $requestId) {
             $controlConnection->once('proxy_ready_'.$requestId, function (ConnectionInterface $proxy) use ($request) {
                 // Convert the Laravel request into a PSR7 request
                 $psr17Factory = new Psr17Factory();

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();
-    }
-}

config/expose.php

@@ -232,8 +232,6 @@ return [
         */
         'user_repository' => \App\Server\UserRepository\DatabaseUserRepository::class,
 
-        'subdomain_repository' => \App\Server\SubdomainRepository\DatabaseSubdomainRepository::class,
-
         /*
         |--------------------------------------------------------------------------
         | Messages
@@ -251,7 +249,7 @@ return [
 
             '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.',
+            'custom_subdomain_unauthorized' => 'You are not allowed to specify custom subdomains. Please upgrade to Expose Pro.',
 
             'no_free_tcp_port_available' => 'There are no free TCP ports available on this server. Please try again later.',
         ],

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
-)

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>

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/ApiTest.php

@@ -5,7 +5,6 @@ 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;
@@ -65,82 +64,16 @@ class ApiTest extends TestCase
         $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', [
+        $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 */
@@ -152,117 +85,10 @@ class ApiTest extends TestCase
 
         $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 */

tests/Feature/Server/TunnelTest.php

@@ -235,6 +235,8 @@ class TunnelTest extends TestCase
             'can_specify_subdomains' => 0,
         ])));
 
+        $this->expectException(\UnexpectedValueException::class);
+
         $user = json_decode($response->getBody()->getContents())->user;
 
         $this->createTestHttpServer();
@@ -246,92 +248,7 @@ class TunnelTest extends TestCase
         $client = $this->createClient();
         $response = $this->await($client->connectToServer('127.0.0.1:8085', 'tunnel', $user->auth_token));
 
-        $this->assertNotSame('tunnel', $response->subdomain);
+        $this->assertSame('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 */

tests/fixtures/test.md

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

tests/fixtures/test.txt

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