Remove rewrite header

Improve request ids

app/Client/Client.php

@@ -40,18 +40,18 @@ class Client
         $this->logger = $logger;
     }
 
-    public function share(string $sharedUrl, array $subdomains = [], string $hostname = '')
+    public function share(string $sharedUrl, array $subdomains = [])
     {
         $sharedUrl = $this->prepareSharedUrl($sharedUrl);
 
         foreach ($subdomains as $subdomain) {
-            $this->connectToServer($sharedUrl, $subdomain, $hostname, config('expose.auth_token'));
+            $this->connectToServer($sharedUrl, $subdomain, $this->configuration->auth());
         }
     }
 
     public function sharePort(int $port)
     {
-        $this->connectToServerAndShareTcp($port, config('expose.auth_token'));
+        $this->connectToServerAndShareTcp($port, $this->configuration->auth());
     }
 
     protected function prepareSharedUrl(string $sharedUrl): string
@@ -60,19 +60,14 @@ class Client
             return $sharedUrl;
         }
 
-        $url = Arr::get($parsedUrl, 'host', Arr::get($parsedUrl, 'path'));
+        $host = Arr::get($parsedUrl, 'host', Arr::get($parsedUrl, 'path', 'localhost'));
+        $scheme = Arr::get($parsedUrl, 'scheme', 'http');
+        $port = Arr::get($parsedUrl, 'port', $scheme === 'https' ? 443 : 80);
 
-        if (Arr::get($parsedUrl, 'scheme') === 'https') {
-            $url .= ':443';
-        }
-        if (! is_null($port = Arr::get($parsedUrl, 'port'))) {
-            $url .= ":{$port}";
+        return sprintf('%s://%s:%s', $scheme, $host, $port);
     }
 
-        return $url;
-    }
-
-    public function connectToServer(string $sharedUrl, $subdomain, $hostname = '', $authToken = ''): PromiseInterface
+    public function connectToServer(string $sharedUrl, $subdomain, $authToken = ''): PromiseInterface
     {
         $deferred = new Deferred();
         $promise = $deferred->promise();
@@ -82,18 +77,18 @@ class Client
         connect($wsProtocol."://{$this->configuration->host()}:{$this->configuration->port()}/expose/control?authToken={$authToken}", [], [
             'X-Expose-Control' => 'enabled',
         ], $this->loop)
-            ->then(function (WebSocket $clientConnection) use ($sharedUrl, $subdomain, $hostname, $deferred, $authToken) {
+            ->then(function (WebSocket $clientConnection) use ($sharedUrl, $subdomain, $deferred, $authToken) {
                 $this->connectionRetries = 0;
 
                 $connection = ControlConnection::create($clientConnection);
 
-                $connection->authenticate($sharedUrl, $subdomain, $hostname);
+                $connection->authenticate($sharedUrl, $subdomain);
 
-                $clientConnection->on('close', function () use ($sharedUrl, $subdomain, $hostname, $authToken) {
+                $clientConnection->on('close', function () use ($sharedUrl, $subdomain, $authToken) {
                     $this->logger->error('Connection to server closed.');
 
-                    $this->retryConnectionOrExit(function () use ($sharedUrl, $subdomain, $hostname, $authToken) {
-                        $this->connectToServer($sharedUrl, $subdomain, $hostname, $authToken);
+                    $this->retryConnectionOrExit(function () use ($sharedUrl, $subdomain, $authToken) {
+                        $this->connectToServer($sharedUrl, $subdomain, $authToken);
                     });
                 });
 
@@ -113,16 +108,10 @@ class Client
                         $host .= ":{$this->configuration->port()}";
                     }
 
-                    if ($data->hostname !== '' && ! is_null($data->hostname)) {
-                        $exposeUrl = "{$httpProtocol}://{$data->hostname}";
-                    } else {
-                        $exposeUrl = "{$httpProtocol}://{$data->subdomain}.{$host}";
-                    }
-
                     $this->logger->info($data->message);
                     $this->logger->info("Local-URL:\t\t{$sharedUrl}");
                     $this->logger->info("Dashboard-URL:\t\thttp://127.0.0.1:".config()->get('expose.dashboard_port'));
-                    $this->logger->info("Expose-URL:\t\t{$exposeUrl}");
+                    $this->logger->info("Expose-URL:\t\t{$httpProtocol}://{$data->subdomain}.{$host}");
                     $this->logger->line('');
 
                     static::$subdomains[] = "{$httpProtocol}://{$data->subdomain}.{$host}";

app/Client/Connections/ControlConnection.php

@@ -57,7 +57,7 @@ class ControlConnection
         $this->proxyManager->createTcpProxy($this->clientId, $data);
     }
 
-    public function authenticate(string $sharedHost, ?string $subdomain, ?string $hostname)
+    public function authenticate(string $sharedHost, string $subdomain)
     {
         $this->socket->send(json_encode([
             'event' => 'authenticate',
@@ -65,7 +65,6 @@ class ControlConnection
                 'type' => 'http',
                 'host' => $sharedHost,
                 'subdomain' => empty($subdomain) ? null : $subdomain,
-                'hostname' => empty($hostname) ? null : $hostname,
             ],
         ]));
     }

app/Client/Factory.php

@@ -102,9 +102,9 @@ class Factory
         return $this;
     }
 
-    public function share($sharedUrl, $subdomain = null, $hostname = null)
+    public function share($sharedUrl, $subdomain = null)
     {
-        app('expose.client')->share($sharedUrl, $subdomain, $hostname);
+        app('expose.client')->share($sharedUrl, $subdomain);
 
         return $this;
     }

app/Client/Http/HttpClient.php

@@ -11,10 +11,12 @@ use function GuzzleHttp\Psr7\str;
 use Laminas\Http\Request;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\UriInterface;
 use Ratchet\Client\WebSocket;
 use Ratchet\RFC6455\Messaging\Frame;
 use React\EventLoop\LoopInterface;
 use React\Socket\Connector;
+use React\Stream\ReadableStreamInterface;
 
 class HttpClient
 {
@@ -74,7 +76,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,
@@ -85,22 +86,17 @@ class HttpClient
     protected function sendRequestToApplication(RequestInterface $request, $proxyConnection = null)
     {
         (new Browser($this->loop, $this->createConnector()))
-            ->withOptions([
-                'followRedirects' => false,
-                'obeySuccessCode' => false,
-                'streaming' => true,
-            ])
-            ->send($request)
+            ->withFollowRedirects(false)
+            ->withRejectErrorResponse(false)
+            ->requestStreaming($request->getMethod(), $this->getExposeUri($request), $request->getHeaders(), $request->getBody())
             ->then(function (ResponseInterface $response) use ($proxyConnection) {
                 if (! isset($response->buffer)) {
-                    $response = $this->rewriteResponseHeaders($response);
-
                     $response->buffer = str($response);
                 }
 
                 $this->sendChunkToServer($response->buffer, $proxyConnection);
 
-                /* @var $body \React\Stream\ReadableStreamInterface */
+                /* @var $body ReadableStreamInterface */
                 $body = $response->getBody();
 
                 $this->logResponse(str($response));
@@ -137,24 +133,14 @@ class HttpClient
         return Request::fromString($data);
     }
 
-    protected function rewriteResponseHeaders(ResponseInterface $response)
+    private function getExposeUri(RequestInterface $request): UriInterface
     {
-        if (! $response->hasHeader('Location')) {
-            return $response;
-        }
+        $exposeProto = $request->getHeader('x-expose-proto')[0];
+        $exposeHost = explode(':', $request->getHeader('x-expose-host')[0]);
 
-        $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);
+        return $request->getUri()
+            ->withScheme($exposeProto)
+            ->withHost($exposeHost[0])
+            ->withPort($exposeHost[1]);
     }
 }

app/Commands/ShareCommand.php

@@ -10,7 +10,7 @@ use Symfony\Component\Console\Output\ConsoleOutput;
 
 class ShareCommand extends Command
 {
-    protected $signature = 'share {host} {--hostname=} {--subdomain=} {--auth=}';
+    protected $signature = 'share {host} {--subdomain=} {--auth=} {--server-host=} {--server-port=}';
 
     protected $description = 'Share a local url with a remote expose server';
 
@@ -25,25 +25,19 @@ class ShareCommand extends Command
 
     public function handle()
     {
-        if (! empty($this->option('hostname')) && ! empty($this->option('subdomain'))) {
-            $this->error('You can only specify one. Either a custom hostname or a subdomain.');
-
-            return;
-        }
-
         $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')),
-                $this->option('hostname')
-            )
+            ->share($this->argument('host'), explode(',', $this->option('subdomain')))
             ->createHttpServer()
             ->run();
     }

app/Commands/ShareCurrentWorkingDirectoryCommand.php

@@ -4,7 +4,7 @@ namespace App\Commands;
 
 class ShareCurrentWorkingDirectoryCommand extends ShareCommand
 {
-    protected $signature = 'share-cwd {host?} {--hostname=} {--subdomain=} {--auth=}';
+    protected $signature = 'share-cwd {host?} {--subdomain=} {--auth=} {--server-host=} {--server-port=}';
 
     public function handle()
     {
@@ -13,7 +13,7 @@ class ShareCurrentWorkingDirectoryCommand extends ShareCommand
 
         $this->input->setArgument('host', $host);
 
-        if (! $this->option('subdomain') && ! $this->option('hostname')) {
+        if (! $this->option('subdomain')) {
             $this->input->setOption('subdomain', $subdomain);
         }
 

app/Contracts/ConnectionManager.php

@@ -8,7 +8,7 @@ use Ratchet\ConnectionInterface;
 
 interface ConnectionManager
 {
-    public function storeConnection(string $host, ?string $subdomain, ?string $hostname, ConnectionInterface $connection): ControlConnection;
+    public function storeConnection(string $host, ?string $subdomain, ConnectionInterface $connection): ControlConnection;
 
     public function storeTcpConnection(int $port, ConnectionInterface $connection): ControlConnection;
 
@@ -22,8 +22,6 @@ interface ConnectionManager
 
     public function findControlConnectionForSubdomain($subdomain): ?ControlConnection;
 
-    public function findControlConnectionForHostname(string $hostname): ?ControlConnection;
-
     public function findControlConnectionForClientId(string $clientId): ?ControlConnection;
 
     public function getConnections(): array;

app/Contracts/HostnameRepository.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Contracts;
-
-use React\Promise\PromiseInterface;
-
-interface HostnameRepository
-{
-    public function getHostnames(): PromiseInterface;
-
-    public function getHostnameById($id): PromiseInterface;
-
-    public function getHostnameByName(string $name): PromiseInterface;
-
-    public function getHostnamesByUserId($id): PromiseInterface;
-
-    public function getHostnamesByUserIdAndName($id, $name): PromiseInterface;
-
-    public function deleteHostnameForUserId($userId, $hostnameId): PromiseInterface;
-
-    public function storeHostname(array $data): PromiseInterface;
-}

app/Providers/AppServiceProvider.php

@@ -37,6 +37,14 @@ class AppServiceProvider extends ServiceProvider
     {
         $builtInConfig = config('expose');
 
+        $keyServerVariable = 'EXPOSE_CONFIG_FILE';
+        if (array_key_exists($keyServerVariable, $_SERVER) && is_string($_SERVER[$keyServerVariable]) && file_exists($_SERVER[$keyServerVariable])) {
+            $localConfig = require $_SERVER[$keyServerVariable];
+            config()->set('expose', array_merge($builtInConfig, $localConfig));
+
+            return;
+        }
+
         $localConfigFile = getcwd().DIRECTORY_SEPARATOR.'.expose.php';
 
         if (file_exists($localConfigFile)) {

app/Server/Connections/ConnectionConfiguration.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Server\Connections;
-
-class ConnectionConfiguration
-{
-    protected $hostname;
-    protected $subdomain;
-
-    private function __construct($subdomain, $hostname)
-    {
-        $this->subdomain = $subdomain;
-        $this->hostname = $hostname;
-    }
-
-    public static function withSubdomain($subdomain)
-    {
-        return new static($subdomain, null);
-    }
-
-    public static function withHostname($hostname)
-    {
-        return new static(null, $hostname);
-    }
-
-    public function getSubdomain()
-    {
-        return $this->subdomain;
-    }
-
-    public function getHostname()
-    {
-        return $this->hostname;
-    }
-}

app/Server/Connections/ConnectionManager.php

@@ -43,24 +43,15 @@ class ConnectionManager implements ConnectionManagerContract
         });
     }
 
-    public function storeConnection(string $host, ?string $subdomain, ?string $hostname, ConnectionInterface $connection): ControlConnection
+    public function storeConnection(string $host, ?string $subdomain, ConnectionInterface $connection): ControlConnection
     {
-        $clientId = (string) uniqid();
-
-        $connection->client_id = $clientId;
-
-        if (! is_null($hostname) && $hostname !== '') {
-            $subdomain = '';
-        } else {
-            $subdomain = $subdomain ?? $this->subdomainGenerator->generateSubdomain();
-        }
+        $connection->client_id = sha1(uniqid('', true));
 
         $storedConnection = new ControlConnection(
             $connection,
             $host,
-            $subdomain,
-            $hostname,
-            $clientId,
+            $subdomain ?? $this->subdomainGenerator->generateSubdomain(),
+            $connection->client_id,
             $this->getAuthTokenFromConnection($connection)
         );
 
@@ -157,13 +148,6 @@ class ConnectionManager implements ConnectionManagerContract
         });
     }
 
-    public function findControlConnectionForHostname($hostname): ?ControlConnection
-    {
-        return collect($this->connections)->last(function ($connection) use ($hostname) {
-            return $connection->hostname == $hostname;
-        });
-    }
-
     public function findControlConnectionForClientId(string $clientId): ?ControlConnection
     {
         return collect($this->connections)->last(function ($connection) use ($clientId) {

app/Server/Connections/ControlConnection.php

@@ -14,17 +14,15 @@ class ControlConnection
     public $host;
     public $authToken;
     public $subdomain;
-    public $hostname;
     public $client_id;
     public $proxies = [];
     protected $shared_at;
 
-    public function __construct(ConnectionInterface $socket, string $host, string $subdomain, ?string $hostname, string $clientId, string $authToken = '')
+    public function __construct(ConnectionInterface $socket, string $host, string $subdomain, string $clientId, string $authToken = '')
     {
         $this->socket = $socket;
         $this->host = $host;
         $this->subdomain = $subdomain;
-        $this->hostname = $hostname;
         $this->client_id = $clientId;
         $this->authToken = $authToken;
         $this->shared_at = now()->toDateTimeString();
@@ -66,7 +64,6 @@ class ControlConnection
             'client_id' => $this->client_id,
             'auth_token' => $this->authToken,
             'subdomain' => $this->subdomain,
-            'hostname' => $this->hostname,
             'shared_at' => $this->shared_at,
         ];
     }

app/Server/Factory.php

@@ -3,14 +3,12 @@
 namespace App\Server;
 
 use App\Contracts\ConnectionManager as ConnectionManagerContract;
-use App\Contracts\HostnameRepository;
 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\DeleteHostnameController;
 use App\Server\Http\Controllers\Admin\DeleteSubdomainController;
 use App\Server\Http\Controllers\Admin\DeleteUsersController;
 use App\Server\Http\Controllers\Admin\DisconnectSiteController;
@@ -25,7 +23,6 @@ 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\StoreHostnameController;
 use App\Server\Http\Controllers\Admin\StoreSettingsController;
 use App\Server\Http\Controllers\Admin\StoreSubdomainController;
 use App\Server\Http\Controllers\Admin\StoreUsersController;
@@ -138,8 +135,6 @@ class Factory
         $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->post('/api/hostnames', StoreHostnameController::class, $adminCondition);
-        $this->router->delete('/api/hostnames/{hostname}', DeleteHostnameController::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);
@@ -182,7 +177,6 @@ class Factory
             ->bindSubdomainGenerator()
             ->bindUserRepository()
             ->bindSubdomainRepository()
-            ->bindHostnameRepository()
             ->bindDatabase()
             ->ensureDatabaseIsInitialized()
             ->bindConnectionManager()
@@ -228,15 +222,6 @@ class Factory
         return $this;
     }
 
-    protected function bindHostnameRepository()
-    {
-        app()->singleton(HostnameRepository::class, function () {
-            return app(config('expose.admin.hostname_repository'));
-        });
-
-        return $this;
-    }
-
     protected function bindDatabase()
     {
         app()->singleton(DatabaseInterface::class, function () {
@@ -263,7 +248,6 @@ class Factory
             ->files()
             ->ignoreDotFiles(true)
             ->in(database_path('migrations'))
-            ->sortByName()
             ->name('*.sql');
 
         /** @var SplFileInfo $migration */

app/Server/HostnameRepository/DatabaseHostnameRepository.php

@@ -1,132 +0,0 @@
-<?php
-
-namespace App\Server\HostnameRepository;
-
-use App\Contracts\HostnameRepository;
-use Clue\React\SQLite\DatabaseInterface;
-use Clue\React\SQLite\Result;
-use React\Promise\Deferred;
-use React\Promise\PromiseInterface;
-
-class DatabaseHostnameRepository implements HostnameRepository
-{
-    /** @var DatabaseInterface */
-    protected $database;
-
-    public function __construct(DatabaseInterface $database)
-    {
-        $this->database = $database;
-    }
-
-    public function getHostnames(): PromiseInterface
-    {
-        $deferred = new Deferred();
-
-        $this->database
-            ->query('SELECT * FROM hostnames ORDER by created_at DESC')
-            ->then(function (Result $result) use ($deferred) {
-                $deferred->resolve($result->rows);
-            });
-
-        return $deferred->promise();
-    }
-
-    public function getHostnameById($id): PromiseInterface
-    {
-        $deferred = new Deferred();
-
-        $this->database
-            ->query('SELECT * FROM hostnames WHERE id = :id', ['id' => $id])
-            ->then(function (Result $result) use ($deferred) {
-                $deferred->resolve($result->rows[0] ?? null);
-            });
-
-        return $deferred->promise();
-    }
-
-    public function getHostnameByName(string $name): PromiseInterface
-    {
-        $deferred = new Deferred();
-
-        $this->database
-            ->query('SELECT * FROM hostnames WHERE hostname = :name', ['name' => $name])
-            ->then(function (Result $result) use ($deferred) {
-                $deferred->resolve($result->rows[0] ?? null);
-            });
-
-        return $deferred->promise();
-    }
-
-    public function getHostnamesByUserId($id): PromiseInterface
-    {
-        $deferred = new Deferred();
-
-        $this->database
-            ->query('SELECT * FROM hostnames 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 storeHostname(array $data): PromiseInterface
-    {
-        $deferred = new Deferred();
-
-        $this->getHostnameByName($data['hostname'])
-            ->then(function ($registeredHostname) use ($data, $deferred) {
-                if (! is_null($registeredHostname)) {
-                    $deferred->resolve(null);
-
-                    return;
-                }
-
-                $this->database->query("
-                    INSERT INTO hostnames (user_id, hostname, created_at)
-                    VALUES (:user_id, :hostname, DATETIME('now'))
-                ", $data)
-                    ->then(function (Result $result) use ($deferred) {
-                        $this->database->query('SELECT * FROM hostnames WHERE id = :id', ['id' => $result->insertId])
-                            ->then(function (Result $result) use ($deferred) {
-                                $deferred->resolve($result->rows[0]);
-                            });
-                    });
-            });
-
-        return $deferred->promise();
-    }
-
-    public function getHostnamesByUserIdAndName($id, $name): PromiseInterface
-    {
-        $deferred = new Deferred();
-
-        $this->database
-            ->query('SELECT * FROM hostnames WHERE user_id = :user_id AND hostname = :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 deleteHostnameForUserId($userId, $hostnameId): PromiseInterface
-    {
-        $deferred = new Deferred();
-
-        $this->database->query('DELETE FROM hostnames WHERE id = :id AND user_id = :user_id', [
-            'id' => $hostnameId,
-            'user_id' => $userId,
-        ])
-            ->then(function (Result $result) use ($deferred) {
-                $deferred->resolve($result);
-            });
-
-        return $deferred->promise();
-    }
-}

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

@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Server\Http\Controllers\Admin;
-
-use App\Contracts\HostnameRepository;
-use App\Contracts\UserRepository;
-use Illuminate\Http\Request;
-use Ratchet\ConnectionInterface;
-
-class DeleteHostnameController extends AdminController
-{
-    protected $keepConnectionOpen = true;
-
-    /** @var HostnameRepository */
-    protected $hostnameRepository;
-
-    /** @var UserRepository */
-    protected $userRepository;
-
-    public function __construct(UserRepository $userRepository, HostnameRepository $hostnameRepository)
-    {
-        $this->userRepository = $userRepository;
-        $this->hostnameRepository = $hostnameRepository;
-    }
-
-    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->hostnameRepository->deleteHostnameForUserId($user['id'], $request->get('hostname'))
-                    ->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\HostnameRepository;
 use App\Contracts\SubdomainRepository;
 use App\Contracts\UserRepository;
 use Illuminate\Http\Request;
@@ -18,14 +17,10 @@ class GetUserDetailsController extends AdminController
     /** @var SubdomainRepository */
     protected $subdomainRepository;
 
-    /** @var HostnameRepository */
-    protected $hostnameRepository;
-
-    public function __construct(UserRepository $userRepository, SubdomainRepository $subdomainRepository, HostnameRepository $hostnameRepository)
+    public function __construct(UserRepository $userRepository, SubdomainRepository $subdomainRepository)
     {
         $this->userRepository = $userRepository;
         $this->subdomainRepository = $subdomainRepository;
-        $this->hostnameRepository = $hostnameRepository;
     }
 
     public function handle(Request $request, ConnectionInterface $httpConnection)
@@ -34,20 +29,16 @@ class GetUserDetailsController extends AdminController
             ->getUserById($request->get('id'))
             ->then(function ($user) use ($httpConnection, $request) {
                 $this->subdomainRepository->getSubdomainsByUserId($request->get('id'))
-                    ->then(function ($subdomains) use ($httpConnection, $user, $request) {
-                        $this->hostnameRepository->getHostnamesByUserId($request->get('id'))
-                            ->then(function ($hostnames) use ($httpConnection, $user, $subdomains) {
+                    ->then(function ($subdomains) use ($httpConnection, $user) {
                         $httpConnection->send(
                             respond_json([
                                 'user' => $user,
                                 'subdomains' => $subdomains,
-                                        'hostnames' => $hostnames,
                             ])
                         );
 
                         $httpConnection->close();
                     });
             });
-            });
     }
 }

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

@@ -1,77 +0,0 @@
-<?php
-
-namespace App\Server\Http\Controllers\Admin;
-
-use App\Contracts\HostnameRepository;
-use App\Contracts\UserRepository;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Validator;
-use Ratchet\ConnectionInterface;
-
-class StoreHostnameController extends AdminController
-{
-    protected $keepConnectionOpen = true;
-
-    /** @var HostnameRepository */
-    protected $hostnameRepository;
-
-    /** @var UserRepository */
-    protected $userRepository;
-
-    public function __construct(UserRepository $userRepository, HostnameRepository $hostnameRepository)
-    {
-        $this->userRepository = $userRepository;
-        $this->hostnameRepository = $hostnameRepository;
-    }
-
-    public function handle(Request $request, ConnectionInterface $httpConnection)
-    {
-        $validator = Validator::make($request->all(), [
-            'hostname' => '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_hostnames'] === 0) {
-                    $httpConnection->send(respond_json(['error' => 'The user is not allowed to reserve hostnames.'], 401));
-                    $httpConnection->close();
-
-                    return;
-                }
-
-                $insertData = [
-                    'user_id' => $user['id'],
-                    'hostname' => $request->get('hostname'),
-                ];
-
-                $this->hostnameRepository
-                    ->storeHostname($insertData)
-                    ->then(function ($hostname) use ($httpConnection) {
-                        if (is_null($hostname)) {
-                            $httpConnection->send(respond_json(['error' => 'The hostname is already taken.'], 422));
-                            $httpConnection->close();
-
-                            return;
-                        }
-                        $httpConnection->send(respond_json(['hostname' => $hostname], 200));
-                        $httpConnection->close();
-                    });
-            });
-    }
-}

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

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

app/Server/Http/Controllers/ControlMessageController.php

@@ -3,19 +3,14 @@
 namespace App\Server\Http\Controllers;
 
 use App\Contracts\ConnectionManager;
-use App\Contracts\HostnameRepository;
 use App\Contracts\SubdomainRepository;
 use App\Contracts\UserRepository;
 use App\Http\QueryParameters;
-use App\Server\Connections\ConnectionConfiguration;
 use App\Server\Exceptions\NoFreePortAvailable;
-use Illuminate\Support\Str;
 use Ratchet\ConnectionInterface;
 use Ratchet\WebSocket\MessageComponentInterface;
 use React\Promise\Deferred;
 use React\Promise\PromiseInterface;
-use function React\Promise\reject;
-use function React\Promise\resolve as resolvePromise;
 use stdClass;
 
 class ControlMessageController implements MessageComponentInterface
@@ -29,15 +24,11 @@ class ControlMessageController implements MessageComponentInterface
     /** @var SubdomainRepository */
     protected $subdomainRepository;
 
-    /** @var HostnameRepository */
-    protected $hostnameRepository;
-
-    public function __construct(ConnectionManager $connectionManager, UserRepository $userRepository, SubdomainRepository $subdomainRepository, HostnameRepository $hostnameRepository)
+    public function __construct(ConnectionManager $connectionManager, UserRepository $userRepository, SubdomainRepository $subdomainRepository)
     {
         $this->connectionManager = $connectionManager;
         $this->userRepository = $userRepository;
         $this->subdomainRepository = $subdomainRepository;
-        $this->hostnameRepository = $hostnameRepository;
     }
 
     /**
@@ -114,12 +105,14 @@ class ControlMessageController implements MessageComponentInterface
 
     protected function handleHttpConnection(ConnectionInterface $connection, $data, $user = null)
     {
-        $this->hasValidConfiguration($connection, $data, $user)
-            ->then(function (ConnectionConfiguration $configuration) use ($data, $connection) {
-                $data->subdomain = $configuration->getSubdomain();
-                $data->hostname = $configuration->getHostname();
+        $this->hasValidSubdomain($connection, $data->subdomain, $user)->then(function ($subdomain) use ($data, $connection) {
+            if ($subdomain === false) {
+                return;
+            }
 
-                $connectionInfo = $this->connectionManager->storeConnection($data->host, $data->subdomain, $data->hostname, $connection);
+            $data->subdomain = $subdomain;
+
+            $connectionInfo = $this->connectionManager->storeConnection($data->host, $data->subdomain, $connection);
 
             $this->connectionManager->limitConnectionLength($connectionInfo, config('expose.admin.maximum_connection_length'));
 
@@ -128,7 +121,6 @@ class ControlMessageController implements MessageComponentInterface
                 'data' => [
                     'message' => config('expose.admin.messages.message_of_the_day'),
                     'subdomain' => $connectionInfo->subdomain,
-                        'hostname' => $connectionInfo->hostname,
                     'client_id' => $connectionInfo->client_id,
                 ],
             ]));
@@ -200,7 +192,7 @@ class ControlMessageController implements MessageComponentInterface
     protected function verifyAuthToken(ConnectionInterface $connection): PromiseInterface
     {
         if (config('expose.admin.validate_auth_tokens') !== true) {
-            return resolvePromise(null);
+            return \React\Promise\resolve(null);
         }
 
         $deferred = new Deferred();
@@ -233,7 +225,7 @@ class ControlMessageController implements MessageComponentInterface
                 ],
             ]));
 
-            return resolvePromise(ConnectionConfiguration::withSubdomain(null));
+            return \React\Promise\resolve(null);
         }
 
         /**
@@ -254,7 +246,7 @@ class ControlMessageController implements MessageComponentInterface
                         ]));
                         $connection->close();
 
-                        return reject(false);
+                        return \React\Promise\resolve(false);
                     }
 
                     $controlConnection = $this->connectionManager->findControlConnectionForSubdomain($subdomain);
@@ -271,75 +263,14 @@ class ControlMessageController implements MessageComponentInterface
                         ]));
                         $connection->close();
 
-                        return reject(false);
+                        return \React\Promise\resolve(false);
                     }
 
-                    return resolvePromise(ConnectionConfiguration::withSubdomain($subdomain));
+                    return \React\Promise\resolve($subdomain);
                 });
         }
 
-        return resolvePromise(ConnectionConfiguration::withSubdomain($subdomain));
-    }
-
-    protected function hasValidHostname(ConnectionInterface $connection, string $hostname, ?array $user): PromiseInterface
-    {
-        /**
-         * Check if the user can specify a custom hostname in the first place.
-         */
-        if (! is_null($user) && $user['can_specify_hostnames'] === 0) {
-            $connection->send(json_encode([
-                'event' => 'info',
-                'data' => [
-                    'message' => config('expose.admin.messages.custom_hostname_unauthorized').PHP_EOL,
-                ],
-            ]));
-
-            return reject();
-        }
-
-        /**
-         * Check if the given hostname is reserved for a different user.
-         */
-        return $this->hostnameRepository->getHostnamesByUserId($user['id'])
-            ->then(function ($foundHostnames) use ($connection, $hostname) {
-                $foundHostname = collect($foundHostnames)->first(function ($foundHostname) use ($hostname) {
-                    return Str::is($foundHostname['hostname'], $hostname);
-                });
-
-                if (is_null($foundHostname)) {
-                    $message = config('expose.admin.messages.hostname_invalid');
-                    $message = str_replace(':hostname', $hostname, $message);
-
-                    $connection->send(json_encode([
-                        'event' => 'hostnameTaken',
-                        'data' => [
-                            'message' => $message,
-                        ],
-                    ]));
-                    $connection->close();
-
-                    return reject(false);
-                }
-
-                $controlConnection = $this->connectionManager->findControlConnectionForHostname($hostname);
-
-                if (! is_null($controlConnection)) {
-                    $message = config('expose.admin.messages.hostname_taken');
-                    $message = str_replace(':hostname', $hostname, $message);
-
-                    $connection->send(json_encode([
-                        'event' => 'hostnameTaken',
-                        'data' => [
-                            'message' => $message,
-                        ],
-                    ]));
-                    $connection->close();
-
-                    return reject(false);
-                }
-
-                return resolvePromise(ConnectionConfiguration::withHostname($hostname));
-            });
+        return \React\Promise\resolve($subdomain);
     }
 
     protected function canShareTcpPorts(ConnectionInterface $connection, $data, $user)
@@ -358,13 +289,4 @@ class ControlMessageController implements MessageComponentInterface
 
         return true;
     }
-
-    protected function hasValidConfiguration(ConnectionInterface $connection, $data, $user)
-    {
-        if (isset($data->hostname) && ! is_null($data->hostname)) {
-            return $this->hasValidHostname($connection, $data->hostname, $user);
-        }
-
-        return $this->hasValidSubdomain($connection, $data->subdomain, $user);
-    }
 }

app/Server/Http/Controllers/TunnelMessageController.php

@@ -36,9 +36,8 @@ class TunnelMessageController extends Controller
     public function handle(Request $request, ConnectionInterface $httpConnection)
     {
         $subdomain = $this->detectSubdomain($request);
-        $hostname = $request->getHost();
 
-        if (is_null($subdomain) && $hostname === $this->configuration->hostname()) {
+        if (is_null($subdomain)) {
             $httpConnection->send(
                 respond_html($this->getView($httpConnection, 'server.homepage'), 200)
             );
@@ -47,11 +46,7 @@ class TunnelMessageController extends Controller
             return;
         }
 
-        if (! is_null($subdomain)) {
         $controlConnection = $this->connectionManager->findControlConnectionForSubdomain($subdomain);
-        } else {
-            $controlConnection = $this->connectionManager->findControlConnectionForHostname($hostname);
-        }
 
         if (is_null($controlConnection)) {
             $httpConnection->send(
@@ -118,19 +113,17 @@ class TunnelMessageController extends Controller
             $host .= ":{$this->configuration->port()}";
         }
 
-        if (empty($controlConnection->subdomain)) {
-            $originalHost = $controlConnection->hostname;
-        } else {
-            $originalHost = "{$controlConnection->subdomain}.{$host}";
-        }
+        $exposeUrl = parse_url($controlConnection->host);
 
-        $request->headers->set('Host', $controlConnection->host);
+        $request->headers->set('Host', "{$controlConnection->subdomain}.{$host}");
         $request->headers->set('X-Forwarded-Proto', $request->isSecure() ? 'https' : 'http');
-        $request->headers->set('X-Expose-Request-ID', uniqid());
+        $request->headers->set('X-Expose-Request-ID', sha1(uniqid('', true)));
+        $request->headers->set('X-Expose-Host', sprintf('%s:%s', $exposeUrl['host'], $exposeUrl['port']));
+        $request->headers->set('X-Expose-Proto', $exposeUrl['scheme']);
         $request->headers->set('Upgrade-Insecure-Requests', 1);
         $request->headers->set('X-Exposed-By', config('app.name').' '.config('app.version'));
-        $request->headers->set('X-Original-Host', $originalHost);
-        $request->headers->set('X-Forwarded-Host', $originalHost);
+        $request->headers->set('X-Original-Host', "{$controlConnection->subdomain}.{$host}");
+        $request->headers->set('X-Forwarded-Host', "{$controlConnection->subdomain}.{$host}");
 
         return $request;
     }

app/Server/UserRepository/DatabaseUserRepository.php

@@ -114,8 +114,8 @@ class DatabaseUserRepository implements UserRepository
         $deferred = new Deferred();
 
         $this->database->query("
-            INSERT INTO users (name, auth_token, can_specify_subdomains, can_specify_hostnames, can_share_tcp_ports, created_at)
-            VALUES (:name, :auth_token, :can_specify_subdomains, :can_specify_hostnames, :can_share_tcp_ports, DATETIME('now'))
+            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'))
         ", $data)
             ->then(function (Result $result) use ($deferred) {
                 $this->database->query('SELECT * FROM users WHERE id = :id', ['id' => $result->insertId])

config/expose.php

@@ -234,8 +234,6 @@ return [
 
         'subdomain_repository' => \App\Server\SubdomainRepository\DatabaseSubdomainRepository::class,
 
-        'hostname_repository' => \App\Server\HostnameRepository\DatabaseHostnameRepository::class,
-
         /*
         |--------------------------------------------------------------------------
         | Messages

database/migrations/05_add_custom_hostnames_flag_to_users_table.sql

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

database/migrations/06_create_hostnames_table.sql

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

docs/client/configuration.md

@@ -17,6 +17,12 @@ The configuration file will be written to your home directory inside a `.expose`
 
 `~/.expose/config.php`
 
+You can also provide a custom location of the config file by providing the full path as a server variable.
+
+```bash
+EXPOSE_CONFIG_FILE="~/my-custom-config.php" expose share
+```
+
 And the default content of the configuration file is this:
 
 ```php

resources/views/server/sites/index.twig

@@ -9,10 +9,10 @@
                     <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 Host
+                            Host
                         </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 Host
+                            Subdomain
                         </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
@@ -26,13 +26,13 @@
                                 @{ site.host }
                             </td>
                             <td class="px-6 py-4 whitespace-no-wrap border-b border-gray-200 text-sm leading-5 text-gray-500">
-                                @{ getUrl(site) }
+                                @{ site.subdomain }.{{ configuration.hostname()}}:{{ configuration.port() }}
                             </td>
                             <td class="px-6 py-4 whitespace-no-wrap border-b border-gray-200 text-sm leading-5 text-gray-500">
                                 @{ site.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="'{{ scheme|raw }}://'+getUrl(site)" target="_blank"
+                                <a :href="'{{ scheme|raw }}://'+site.subdomain+'.{{ configuration.hostname()}}:{{ configuration.port() }}'" target="_blank"
                                    class="text-indigo-600 hover:text-indigo-900">Visit</a>
                                 <a href="#"
                                    @click.prevent="disconnectSite(site.client_id)"
@@ -60,12 +60,6 @@
             },
 
             methods: {
-                getUrl(site) {
-                    if (site.hostname !== '' && site.hostname !== null) {
-                        return site.hostname;
-                    }
-                    return `${site.subdomain}.{{ configuration.hostname()}}:{{ configuration.port() }}`;
-                },
                 disconnectSite(id) {
                     fetch('/api/sites/' + id, {
                         method: 'DELETE',

resources/views/server/users/index.twig

@@ -43,25 +43,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_hostnames"
-                               class="block text-sm font-medium leading-5 text-gray-700 sm:mt-px sm:pt-2">
-                            Can specify custom hostnames
-                        </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_hostnames"
-                                           v-model="userForm.can_specify_hostnames"
-                                           name="can_specify_hostnames"
-                                           value="1" type="checkbox" class="form-checkbox h-4 w-4 text-indigo-600 transition duration-150 ease-in-out" />
-                                    <label for="can_specify_hostnames" 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">
@@ -111,9 +92,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">
                         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">
-                        Custom Hostnames
-                    </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>
@@ -139,14 +117,6 @@
                             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_specify_hostnames === 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
@@ -204,7 +174,6 @@
                     userForm: {
                         name: '',
                         can_specify_subdomains: true,
-                        can_specify_hostnames: true,
                         can_share_tcp_ports: true,
                         errors: {},
                     },
@@ -249,7 +218,6 @@
                             if (data.user) {
                                 this.userForm.name = '';
                                 this.userForm.can_specify_subdomains = true;
-                                this.userForm.can_specify_hostnames = true;
                                 this.userForm.can_share_tcp_ports = true;
                                 this.userForm.errors = {};
                                 this.users.unshift(data.user);

tests/Feature/Server/AdminTest.php

@@ -152,7 +152,7 @@ class AdminTest extends TestCase
         $connection = \Mockery::mock(IoConnection::class);
         $connection->httpRequest = new Request('GET', '/?authToken=some-token');
 
-        $connectionManager->storeConnection('some-host.text', 'fixed-subdomain', '', $connection);
+        $connectionManager->storeConnection('some-host.text', 'fixed-subdomain', $connection);
 
         /** @var Response $response */
         $response = $this->await($this->browser->get('http://127.0.0.1:8080/sites', [

tests/Feature/Server/ApiTest.php

@@ -119,78 +119,6 @@ class ApiTest extends TestCase
         $this->assertSame(200, $response->getStatusCode());
     }
 
-    /** @test */
-    public function it_allows__hostname_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_hostnames' => 1,
-        ])));
-
-        $user = json_decode($response->getBody()->getContents())->user;
-
-        $response = $this->await($this->browser->post('http://127.0.0.1:8080/api/hostnames', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'auth_token' => $user->auth_token,
-            'hostname' => 'reserved.beyondco.de',
-        ])));
-
-        $this->assertSame(200, $response->getStatusCode());
-    }
-
-    /** @test */
-    public function it_can_delete_hostnames()
-    {
-        /** @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_hostnames' => 1,
-        ])));
-
-        $user = json_decode($response->getBody()->getContents())->user;
-
-        $response = $this->await($this->browser->post('http://127.0.0.1:8080/api/hostnames', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'hostname' => 'reserved.beyondco.de',
-            'auth_token' => $user->auth_token,
-        ])));
-
-        $this->await($this->browser->delete('http://127.0.0.1:8080/api/hostnames/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());
-        $hostnames = $body->hostnames;
-
-        $this->assertCount(0, $hostnames);
-    }
-
     /** @test */
     public function it_can_get_user_details()
     {
@@ -201,7 +129,6 @@ class ApiTest extends TestCase
             'Content-Type' => 'application/json',
         ], json_encode([
             'name' => 'Marcel',
-            'can_specify_hostnames' => 1,
             'can_specify_subdomains' => 1,
         ])));
 
@@ -216,15 +143,6 @@ class ApiTest extends TestCase
             'subdomain' => 'reserved',
         ])));
 
-        $this->await($this->browser->post('http://127.0.0.1:8080/api/hostnames', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'auth_token' => $user->auth_token,
-            'hostname' => 'reserved.beyondco.de',
-        ])));
-
         /** @var Response $response */
         $response = $this->await($this->browser->get('http://127.0.0.1:8080/api/users/1', [
             'Host' => 'expose.localhost',
@@ -235,14 +153,12 @@ class ApiTest extends TestCase
         $body = json_decode($response->getBody()->getContents());
         $user = $body->user;
         $subdomains = $body->subdomains;
-        $hostnames = $body->hostnames;
 
         $this->assertSame('Marcel', $user->name);
         $this->assertSame([], $user->sites);
         $this->assertSame([], $user->tcp_connections);
 
         $this->assertCount(1, $subdomains);
-        $this->assertCount(1, $hostnames);
     }
 
     /** @test */
@@ -368,11 +284,11 @@ class ApiTest extends TestCase
 
         $connection = \Mockery::mock(IoConnection::class);
         $connection->httpRequest = new Request('GET', '/?authToken='.$createdUser->auth_token);
-        $connectionManager->storeConnection('some-host.test', 'fixed-subdomain', '', $connection);
+        $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);
+        $connectionManager->storeConnection('some-different-host.test', 'different-subdomain', $connection);
 
         $connection = \Mockery::mock(IoConnection::class);
         $connection->httpRequest = new Request('GET', '/?authToken='.$createdUser->auth_token);
@@ -403,7 +319,7 @@ class ApiTest extends TestCase
         $connection = \Mockery::mock(IoConnection::class);
         $connection->httpRequest = new Request('GET', '/?authToken=some-token');
 
-        $connectionManager->storeConnection('some-host.test', 'fixed-subdomain', '', $connection);
+        $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', [
@@ -430,7 +346,7 @@ class ApiTest extends TestCase
         $connection = \Mockery::mock(IoConnection::class);
         $connection->httpRequest = new Request('GET', '/');
 
-        $connectionManager->storeConnection('some-host.test', 'fixed-subdomain', '', $connection);
+        $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', [

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\Promise\Timer\TimeoutException;
 use React\Socket\Connection;
 use Tests\Feature\TestCase;
 
@@ -90,76 +89,6 @@ class TunnelTest extends TestCase
         $this->assertSame('Hello World!', $response->getBody()->getContents());
     }
 
-    /** @test */
-    public function it_sends_incoming_requests_to_the_connected_client_with_random_subdomain()
-    {
-        $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.
-         */
-        $client = $this->createClient();
-        $data = $this->await($client->connectToServer('127.0.0.1:8085', null));
-
-        /**
-         * Once the client is connected, we perform a GET request on the
-         * created tunnel.
-         */
-        $response = $this->await($this->browser->get('http://127.0.0.1:8080/', [
-            'Host' => $data->subdomain.'.localhost',
-        ]));
-
-        $this->assertSame('Hello World!', $response->getBody()->getContents());
-    }
-
-    /** @test */
-    public function it_sends_incoming_requests_to_the_connected_client_with_specific_hostname()
-    {
-        $this->createTestHttpServer();
-
-        $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_hostnames' => 1,
-        ])));
-
-        $user = json_decode($response->getBody()->getContents())->user;
-
-        $this->await($this->browser->post('http://127.0.0.1:8080/api/hostnames', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'hostname' => 'reserved.beyondco.de',
-            'auth_token' => $user->auth_token,
-        ])));
-
-        /**
-         * We create an expose client that connects to our server and shares
-         * the created test HTTP server.
-         */
-        $client = $this->createClient();
-        $data = $this->await($client->connectToServer('127.0.0.1:8085', null, 'reserved.beyondco.de', $user->auth_token));
-
-        /**
-         * Once the client is connected, we perform a GET request on the
-         * created tunnel.
-         */
-        $response = $this->await($this->browser->get('http://127.0.0.1:8080/', [
-            'Host' => 'reserved.beyondco.de',
-        ]));
-
-        $this->assertSame('Hello World!', $response->getBody()->getContents());
-    }
-
     /** @test */
     public function it_sends_incoming_requests_to_the_connected_client_via_tcp()
     {
@@ -287,7 +216,7 @@ class TunnelTest extends TestCase
          * the created test HTTP server.
          */
         $client = $this->createClient();
-        $response = $this->await($client->connectToServer('127.0.0.1:8085', 'tunnel', null, $user->auth_token));
+        $response = $this->await($client->connectToServer('127.0.0.1:8085', 'tunnel', $user->auth_token));
 
         $this->assertSame('tunnel', $response->subdomain);
     }
@@ -315,7 +244,7 @@ class TunnelTest extends TestCase
          * the created test HTTP server.
          */
         $client = $this->createClient();
-        $response = $this->await($client->connectToServer('127.0.0.1:8085', 'tunnel', null, $user->auth_token));
+        $response = $this->await($client->connectToServer('127.0.0.1:8085', 'tunnel', $user->auth_token));
 
         $this->assertNotSame('tunnel', $response->subdomain);
     }
@@ -400,196 +329,11 @@ class TunnelTest extends TestCase
          * the created test HTTP server.
          */
         $client = $this->createClient();
-        $response = $this->await($client->connectToServer('127.0.0.1:8085', 'reserved', null, $user->auth_token));
+        $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_hostnames()
-    {
-        $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_hostnames' => 1,
-        ])));
-
-        $user = json_decode($response->getBody()->getContents())->user;
-
-        $response = $this->await($this->browser->post('http://127.0.0.1:8080/api/hostnames', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'hostname' => 'reserved.beyondco.de',
-            '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', null, 'reserved.beyondco.de', $user->auth_token));
-
-        $this->assertSame('reserved.beyondco.de', $response->hostname);
-    }
-
-    /** @test */
-    public function it_allows_users_to_use_their_own_reserved_hostnames_with_wildcards()
-    {
-        $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_hostnames' => 1,
-        ])));
-
-        $user = json_decode($response->getBody()->getContents())->user;
-
-        $response = $this->await($this->browser->post('http://127.0.0.1:8080/api/hostnames', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'hostname' => '*.share.beyondco.de',
-            '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', null, 'foo.share.beyondco.de', $user->auth_token));
-
-        $this->assertSame('foo.share.beyondco.de', $response->hostname);
-    }
-
-    /** @test */
-    public function it_rejects_users_trying_to_use_non_registered_hostnames()
-    {
-        $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_hostnames' => 1,
-        ])));
-
-        $user = json_decode($response->getBody()->getContents())->user;
-
-        $response = $this->await($this->browser->post('http://127.0.0.1:8080/api/hostnames', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'hostname' => 'share.beyondco.de',
-            'auth_token' => $user->auth_token,
-        ])));
-
-        $this->createTestHttpServer();
-
-        $this->expectException(TimeoutException::class);
-
-        /**
-         * We create an expose client that connects to our server and shares
-         * the created test HTTP server.
-         */
-        $client = $this->createClient();
-        $this->await($client->connectToServer('127.0.0.1:8085', null, 'foo.beyondco.de', $user->auth_token));
-    }
-
-    /** @test */
-    public function it_rejects_users_trying_to_use_other_peoples_registered_hostnames()
-    {
-        $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_hostnames' => 1,
-        ])));
-
-        $user = json_decode($response->getBody()->getContents())->user;
-
-        $response = $this->await($this->browser->post('http://127.0.0.1:8080/api/hostnames', [
-            'Host' => 'expose.localhost',
-            'Authorization' => base64_encode('username:secret'),
-            'Content-Type' => 'application/json',
-        ], json_encode([
-            'hostname' => '*.share.beyondco.de',
-            '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' => 'Marcel',
-            'can_specify_hostnames' => 1,
-        ])));
-
-        $user = json_decode($response->getBody()->getContents())->user;
-
-        $this->createTestHttpServer();
-
-        $this->expectException(TimeoutException::class);
-
-        /**
-         * We create an expose client that connects to our server and shares
-         * the created test HTTP server.
-         */
-        $client = $this->createClient();
-        $this->await($client->connectToServer('127.0.0.1:8085', null, 'foo.share.beyondco.de', $user->auth_token));
-    }
-
-    /** @test */
-    public function it_rejects_clients_to_specify_custom_hostnames()
-    {
-        $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_hostnames' => 0,
-        ])));
-
-        $user = json_decode($response->getBody()->getContents())->user;
-
-        $this->createTestHttpServer();
-
-        $this->expectException(TimeoutException::class);
-
-        /**
-         * We create an expose client that connects to our server and shares
-         * the created test HTTP server.
-         */
-        $client = $this->createClient();
-        $this->await($client->connectToServer('127.0.0.1:8085', null, 'reserved.beyondco.de', $user->auth_token));
-    }
-
     /** @test */
     public function it_allows_clients_to_use_random_subdomains_if_custom_subdomains_are_forbidden()
     {
@@ -613,7 +357,7 @@ class TunnelTest extends TestCase
          * the created test HTTP server.
          */
         $client = $this->createClient();
-        $response = $this->await($client->connectToServer('127.0.0.1:8085', '', null, $user->auth_token));
+        $response = $this->await($client->connectToServer('127.0.0.1:8085', '', $user->auth_token));
 
         $this->assertInstanceOf(\stdClass::class, $response);
     }

tests/Feature/TestCase.php

@@ -11,7 +11,7 @@ use Symfony\Component\Console\Output\ConsoleOutputInterface;
 
 abstract class TestCase extends \Tests\TestCase
 {
-    const AWAIT_TIMEOUT = 0.2;
+    const AWAIT_TIMEOUT = 5.0;
 
     /** @var LoopInterface */
     protected $loop;