wip

app/Client/Factory.php

@@ -104,7 +104,7 @@ class Factory
         $this->router->post('/logs', PushLogsToDashboardController::class);
         $this->router->get('/replay/{log}', ReplayLogController::class);
         $this->router->post('/logs/{request_id}/data', AttachDataToLogController::class);
-        $this->router->post('/logs/clear', ClearLogsController::class);
+        $this->router->get('/logs/clear', ClearLogsController::class);
 
         $this->app->route('/socket', new WsServer(new Socket()), ['*']);
 

app/Client/Http/Controllers/AttachDataToLogController.php

@@ -2,14 +2,14 @@
 
 namespace App\Client\Http\Controllers;
 
-use App\Http\Controllers\PostController;
+use App\Http\Controllers\Controller;
 use GuzzleHttp\Psr7\Response;
 use Illuminate\Http\Request;
 use App\Logger\RequestLogger;
 use Ratchet\ConnectionInterface;
 use function GuzzleHttp\Psr7\str;
 
-class AttachDataToLogController extends PostController
+class AttachDataToLogController extends Controller
 {
     /** @var RequestLogger */
     protected $requestLogger;

app/Client/Http/Controllers/ClearLogsController.php

@@ -2,14 +2,10 @@
 
 namespace App\Client\Http\Controllers;
 
-use App\Client\Http\HttpClient;
 use App\Http\Controllers\Controller;
-use App\Http\QueryParameters;
 use App\Logger\RequestLogger;
-use GuzzleHttp\Psr7\Response;
+use Illuminate\Http\Request;
 use Ratchet\ConnectionInterface;
-use function GuzzleHttp\Psr7\str;
-use Psr\Http\Message\RequestInterface;
 
 class ClearLogsController extends Controller
 {
@@ -21,18 +17,10 @@ class ClearLogsController extends Controller
         $this->requestLogger = $requestLogger;
     }
 
-    public function onOpen(ConnectionInterface $connection, RequestInterface $request = null)
+    public function handle(Request $request, ConnectionInterface $httpConnection)
     {
         $this->requestLogger->clear();
 
-        $connection->send(
-            str(new Response(
-                200,
-                ['Content-Type' => 'application/json'],
-                ''
-            ))
-        );
-
-        $connection->close();
+        $httpConnection->send(respond_json([], 200));
     }
 }

app/Client/Http/Controllers/DashboardController.php

@@ -5,24 +5,18 @@ namespace App\Client\Http\Controllers;
 use App\Client\Client;
 use App\Http\Controllers\Controller;
 use GuzzleHttp\Psr7\Response;
+use Illuminate\Http\Request;
 use function GuzzleHttp\Psr7\str;
 use Psr\Http\Message\RequestInterface;
 use Ratchet\ConnectionInterface;
 
 class DashboardController extends Controller
 {
-    public function onOpen(ConnectionInterface $connection, RequestInterface $request = null)
-    {
-        $connection->send(
-            str(new Response(
-                200,
-                ['Content-Type' => 'text/html'],
-                $this->getView('client.dashboard', [
-                    'subdomains' => Client::$subdomains,
-                ])
-            ))
-        );
 
-        $connection->close();
+    public function handle(Request $request, ConnectionInterface $httpConnection)
+    {
+        $httpConnection->send(respond_html($this->getView('client.dashboard', [
+            'subdomains' => Client::$subdomains,
+        ])));
     }
 }

app/Client/Http/Controllers/LogController.php

@@ -5,6 +5,7 @@ namespace App\Client\Http\Controllers;
 use App\Http\Controllers\Controller;
 use App\Logger\RequestLogger;
 use GuzzleHttp\Psr7\Response;
+use Illuminate\Http\Request;
 use Ratchet\ConnectionInterface;
 use function GuzzleHttp\Psr7\str;
 use Psr\Http\Message\RequestInterface;
@@ -19,16 +20,8 @@ class LogController extends Controller
         $this->requestLogger = $requestLogger;
     }
 
-    public function onOpen(ConnectionInterface $connection, RequestInterface $request = null)
+    public function handle(Request $request, ConnectionInterface $httpConnection)
     {
-        $connection->send(
-            str(new Response(
-                200,
-                ['Content-Type' => 'application/json'],
-                json_encode($this->requestLogger->getData(), JSON_INVALID_UTF8_IGNORE)
-            ))
-        );
-
-        $connection->close();
+        $httpConnection->send(respond_json($this->requestLogger->getData()));
     }
 }

app/Client/Http/Controllers/PushLogsToDashboardController.php

@@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
 use Exception;
 use App\WebSockets\Socket;
 use GuzzleHttp\Psr7\Response;
+use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
 use Ratchet\ConnectionInterface;
 use function GuzzleHttp\Psr7\str;
@@ -14,50 +15,20 @@ use Psr\Http\Message\RequestInterface;
 class PushLogsToDashboardController extends Controller
 {
 
-    public function onOpen(ConnectionInterface $connection, RequestInterface $request = null)
+    public function handle(Request $request, ConnectionInterface $httpConnection)
     {
-        $connection->contentLength = $this->findContentLength($request->getHeaders());
-
-        $connection->requestBuffer = (string) $request->getBody();
-
-        $this->checkContentLength($connection);
-    }
-
-    public function onMessage(ConnectionInterface $from, $msg)
-    {
-        $from->requestBuffer .= $msg;
-
-        $this->checkContentLength($from);
-    }
-
-    protected function findContentLength(array $headers): int
-    {
-        return Collection::make($headers)->first(function ($values, $header) {
-                return strtolower($header) === 'content-length';
-            })[0] ?? 0;
-    }
-
-    protected function checkContentLength(ConnectionInterface $connection)
-    {
-        if (strlen($connection->requestBuffer) === $connection->contentLength) {
-            try {
-                /*
-                 * This is the post payload from our PHPUnit tests.
-                 * Send it to the connected connections.
-                 */
-                foreach (Socket::$connections as $webSocketConnection) {
-                    $webSocketConnection->send($connection->requestBuffer);
-                }
-
-                $connection->send(str(new Response(200)));
-            } catch (Exception $e) {
-                $connection->send(str(new Response(500, [], $e->getMessage())));
+        try {
+            /*
+             * This is the post payload from our PHPUnit tests.
+             * Send it to the connected connections.
+             */
+            foreach (Socket::$connections as $webSocketConnection) {
+                $webSocketConnection->send($request->getContent());
             }
 
-            $connection->close();
-
-            unset($connection->requestBuffer);
-            unset($connection->contentLength);
+            $httpConnection->send(str(new Response(200)));
+        } catch (Exception $e) {
+            $httpConnection->send(str(new Response(500, [], $e->getMessage())));
         }
     }
 }

app/Client/Http/Controllers/ReplayLogController.php

@@ -7,6 +7,7 @@ use App\Http\Controllers\Controller;
 use App\Http\QueryParameters;
 use App\Logger\RequestLogger;
 use GuzzleHttp\Psr7\Response;
+use Illuminate\Http\Request;
 use Ratchet\ConnectionInterface;
 use function GuzzleHttp\Psr7\str;
 use Psr\Http\Message\RequestInterface;
@@ -25,35 +26,17 @@ class ReplayLogController extends Controller
         $this->httpClient = $httpClient;
     }
 
-    public function onOpen(ConnectionInterface $connection, RequestInterface $request = null)
+    public function handle(Request $request, ConnectionInterface $httpConnection)
     {
-        $loggedRequest = $this->requestLogger->findLoggedRequest(QueryParameters::create($request)->get('log'));
+        $loggedRequest = $this->requestLogger->findLoggedRequest($request->get('log'));
 
         if (is_null($loggedRequest)) {
-            $connection->send(
-                str(new Response(
-                    404,
-                    ['Content-Type' => 'application/json'],
-                ))
-            );
-
-            $connection->close();
+            $httpConnection->send(str(new Response(404)));
             return;
         }
 
-        $requestData = $loggedRequest->getRequestData();
+        $this->httpClient->performRequest($loggedRequest->getRequestData());
 
-        /** @var HttpClient $tunnel */
-        $this->httpClient->performRequest($requestData);
-
-        $connection->send(
-            str(new Response(
-                200,
-                ['Content-Type' => 'application/json'],
-                ''
-            ))
-        );
-
-        $connection->close();
+        $httpConnection->send(str(new Response(200)));
     }
 }

app/Client/Http/Modifiers/CheckBasicAuthentication.php

@@ -3,6 +3,7 @@
 namespace App\Client\Http\Modifiers;
 
 use App\Client\Configuration;
+use GuzzleHttp\Psr7\Response;
 use Illuminate\Support\Arr;
 use Psr\Http\Message\RequestInterface;
 use Ratchet\Client\WebSocket;
@@ -28,7 +29,7 @@ class CheckBasicAuthentication
 
         if (is_null($username)) {
             $proxyConnection->send(
-                str(new \GuzzleHttp\Psr7\Response(401, [
+                str(new Response(401, [
                     'WWW-Authenticate' => 'Basic realm=Expose'
                 ], 'Unauthorized'))
             );

app/Http/Controllers/Concerns/LoadsViews.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Controllers\Concerns;
+
+use Twig\Environment;
+use Twig\Loader\ArrayLoader;
+use function GuzzleHttp\Psr7\stream_for;
+
+trait LoadsViews
+{
+    protected function getView(string $view, array $data = [])
+    {
+        $templatePath = implode(DIRECTORY_SEPARATOR, explode('.', $view));
+
+        $twig = new Environment(
+            new ArrayLoader([
+                'app' => file_get_contents(base_path('resources/views/server/layouts/app.twig')),
+                'template' => file_get_contents(base_path('resources/views/'.$templatePath.'.twig')),
+            ])
+        );
+
+        return stream_for($twig->render('template', $data));
+    }
+}

app/Http/Controllers/Concerns/ParsesIncomingRequest.php

@@ -1,45 +1,16 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Concerns;
 
 use App\Http\QueryParameters;
 use GuzzleHttp\Psr7\ServerRequest;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
-use Psr\Http\Message\RequestInterface;
 use Ratchet\ConnectionInterface;
 use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory;
-use function GuzzleHttp\Psr7\parse_request;
 
-abstract class PostController extends Controller
+trait ParsesIncomingRequest
 {
-    protected $keepConnectionOpen = false;
-
-    public function onOpen(ConnectionInterface $connection, RequestInterface $request = null)
-    {
-        $connection->contentLength = $this->findContentLength($request->getHeaders());
-
-        $connection->requestBuffer = (string) $request->getBody();
-
-        $connection->request = $request;
-
-        $this->checkContentLength($connection);
-    }
-
-    public function onMessage(ConnectionInterface $from, $msg)
-    {
-        if (! isset($from->requestBuffer)) {
-            $request = parse_request($msg);
-            $from->contentLength = $this->findContentLength($request->getHeaders());
-            $from->request = $request;
-            $from->requestBuffer = (string) $request->getBody();
-        } else {
-            $from->requestBuffer .= $msg;
-        }
-
-        $this->checkContentLength($from);
-    }
-
     protected function findContentLength(array $headers): int
     {
         return Collection::make($headers)->first(function ($values, $header) {
@@ -47,14 +18,21 @@ abstract class PostController extends Controller
             })[0] ?? 0;
     }
 
+    protected function shouldHandleRequest(Request $request, ConnectionInterface $httpConnection): bool
+    {
+        return true;
+    }
+
     protected function checkContentLength(ConnectionInterface $connection)
     {
         if (strlen($connection->requestBuffer) === $connection->contentLength) {
             $laravelRequest = $this->createLaravelRequest($connection);
 
-            $this->handle($laravelRequest, $connection);
+            if ($this->shouldHandleRequest($laravelRequest, $connection)) {
+                $this->handle($laravelRequest, $connection);
+            }
 
-            if (! $this->keepConnectionOpen) {
+            if (!$this->keepConnectionOpen) {
                 $connection->close();
             }
 
@@ -64,8 +42,6 @@ abstract class PostController extends Controller
         }
     }
 
-    abstract public function handle(Request $request, ConnectionInterface $httpConnection);
-
     protected function createLaravelRequest(ConnectionInterface $connection): Request
     {
         try {

app/Http/Controllers/Controller.php

@@ -2,15 +2,30 @@
 
 namespace App\Http\Controllers;
 
-use Exception;
+use App\Http\Controllers\Concerns\LoadsViews;
+use App\Http\Controllers\Concerns\ParsesIncomingRequest;
+use Illuminate\Http\Request;
+use Psr\Http\Message\RequestInterface;
 use Ratchet\ConnectionInterface;
 use Ratchet\Http\HttpServerInterface;
-use Twig\Environment;
-use Twig\Loader\ArrayLoader;
-use function GuzzleHttp\Psr7\stream_for;
 
 abstract class Controller implements HttpServerInterface
 {
+    use LoadsViews, ParsesIncomingRequest;
+
+    protected $keepConnectionOpen = false;
+
+    public function onOpen(ConnectionInterface $connection, RequestInterface $request = null)
+    {
+        $connection->contentLength = $this->findContentLength($request->getHeaders());
+
+        $connection->requestBuffer = (string) $request->getBody();
+
+        $connection->request = $request;
+
+        $this->checkContentLength($connection);
+    }
+
     public function onClose(ConnectionInterface $connection)
     {
         unset($connection->requestBuffer);
@@ -18,25 +33,24 @@ abstract class Controller implements HttpServerInterface
         unset($connection->request);
     }
 
-    public function onError(ConnectionInterface $connection, Exception $e)
-    {
-    }
-
     public function onMessage(ConnectionInterface $from, $msg)
     {
+        if (! isset($from->requestBuffer)) {
+            $request = parse_request($msg);
+            $from->contentLength = $this->findContentLength($request->getHeaders());
+            $from->request = $request;
+            $from->requestBuffer = (string) $request->getBody();
+        } else {
+            $from->requestBuffer .= $msg;
+        }
+
+        $this->checkContentLength($from);
     }
 
-    protected function getView(string $view, array $data = [])
+    function onError(ConnectionInterface $conn, \Exception $e)
     {
-        $templatePath = implode(DIRECTORY_SEPARATOR, explode('.', $view));
-
-        $twig = new Environment(
-            new ArrayLoader([
-                'app' => file_get_contents(base_path('resources/views/server/layouts/app.twig')),
-                'template' => file_get_contents(base_path('resources/views/'.$templatePath.'.twig')),
-            ])
-        );
-
-        return stream_for($twig->render('template', $data));
+        //
     }
+
+    abstract public function handle(Request $request, ConnectionInterface $httpConnection);
 }

app/Server/Factory.php

@@ -10,6 +10,7 @@ use App\Server\Http\Controllers\Admin\DeleteUsersController;
 use App\Server\Http\Controllers\Admin\ListSitesController;
 use App\Server\Http\Controllers\Admin\ListUsersController;
 use App\Server\Http\Controllers\Admin\LoginController;
+use App\Server\Http\Controllers\Admin\RedirectToUsersController;
 use App\Server\Http\Controllers\Admin\StoreUsersController;
 use App\Server\Http\Controllers\Admin\VerifyLoginController;
 use App\Server\Http\Controllers\ControlMessageController;
@@ -106,10 +107,9 @@ class Factory
 
     protected function addAdminRoutes()
     {
-        $adminCondition = 'request.headers.get("Host") matches "/'.config('expose.dashboard_subdomain').'\./i"';
+        $adminCondition = 'request.headers.get("Host") matches "/'.config('expose.admin.subdomain').'\./i"';
 
-        $this->router->get('/', LoginController::class, $adminCondition);
-        $this->router->post('/', VerifyLoginController::class, $adminCondition);
+        $this->router->get('/', RedirectToUsersController::class, $adminCondition);
         $this->router->get('/users', ListUsersController::class, $adminCondition);
         $this->router->post('/users', StoreUsersController::class, $adminCondition);
         $this->router->delete('/users/delete/{id}', DeleteUsersController::class, $adminCondition);

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

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Server\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use GuzzleHttp\Psr7\Response;
+use Illuminate\Http\Request;
+use Illuminate\Support\Str;
+use Ratchet\ConnectionInterface;
+use function GuzzleHttp\Psr7\str;
+
+abstract class AdminController extends Controller
+{
+    protected function shouldHandleRequest(Request $request, ConnectionInterface $httpConnection): bool
+    {
+        try {
+            $authorization = Str::after($request->header('Authorization'), 'Basic ');
+            $authParts = explode(':', base64_decode($authorization), 2);
+            list($user, $password) = $authParts;
+
+            if (! $this->credentialsAreAllowed($user, $password)) {
+                throw new \InvalidArgumentException('Invalid Login');
+            }
+            return true;
+        } catch (\Throwable $e) {
+            $httpConnection->send(str(new Response(401, [
+                'WWW-Authenticate' => 'Basic realm="Expose"'
+            ], 'foo')));
+        }
+        return false;
+    }
+
+    protected function credentialsAreAllowed(string $user, string $password)
+    {
+        return config('expose.admin.users.'.$user) === $password;
+    }
+}

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

@@ -2,7 +2,7 @@
 
 namespace App\Server\Http\Controllers\Admin;
 
-use App\Http\Controllers\PostController;
+use App\Http\Controllers\Controller;
 use Clue\React\SQLite\DatabaseInterface;
 use Clue\React\SQLite\Result;
 use GuzzleHttp\Psr7\Response;
@@ -15,7 +15,7 @@ use Twig\Loader\ArrayLoader;
 use function GuzzleHttp\Psr7\str;
 use function GuzzleHttp\Psr7\stream_for;
 
-class DeleteUsersController extends PostController
+class DeleteUsersController extends AdminController
 {
     protected $keepConnectionOpen = true;
 

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

@@ -3,7 +3,7 @@
 namespace App\Server\Http\Controllers\Admin;
 
 use App\Contracts\ConnectionManager;
-use App\Http\Controllers\PostController;
+use App\Http\Controllers\Controller;
 use App\Server\Configuration;
 use Clue\React\SQLite\DatabaseInterface;
 use Clue\React\SQLite\Result;
@@ -15,7 +15,7 @@ use Twig\Loader\ArrayLoader;
 use function GuzzleHttp\Psr7\str;
 use function GuzzleHttp\Psr7\stream_for;
 
-class ListSitesController extends PostController
+class ListSitesController extends AdminController
 {
     /** @var ConnectionManager */
     protected $connectionManager;

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

@@ -2,7 +2,7 @@
 
 namespace App\Server\Http\Controllers\Admin;
 
-use App\Http\Controllers\PostController;
+use App\Http\Controllers\Controller;
 use Clue\React\SQLite\DatabaseInterface;
 use Clue\React\SQLite\Result;
 use GuzzleHttp\Psr7\Response;
@@ -13,7 +13,7 @@ use Twig\Loader\ArrayLoader;
 use function GuzzleHttp\Psr7\str;
 use function GuzzleHttp\Psr7\stream_for;
 
-class ListUsersController extends PostController
+class ListUsersController extends AdminController
 {
     protected $keepConnectionOpen = true;
 

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

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Server\Http\Controllers\Admin;
-
-use App\Contracts\ConnectionManager;
-use App\Http\Controllers\PostController;
-use Clue\React\SQLite\DatabaseInterface;
-use Clue\React\SQLite\Result;
-use GuzzleHttp\Psr7\Response;
-use Illuminate\Http\Request;
-use Ratchet\ConnectionInterface;
-use Twig\Environment;
-use Twig\Loader\ArrayLoader;
-use function GuzzleHttp\Psr7\str;
-use function GuzzleHttp\Psr7\stream_for;
-
-class LoginController extends PostController
-{
-    public function handle(Request $request, ConnectionInterface $httpConnection)
-    {
-        $httpConnection->send(
-            respond_html($this->getView('server.login'))
-        );
-    }
-}

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

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Server\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use GuzzleHttp\Psr7\Response;
+use Illuminate\Http\Request;
+use Illuminate\Support\Str;
+use Ratchet\ConnectionInterface;
+use function GuzzleHttp\Psr7\str;
+
+class RedirectToUsersController extends AdminController
+{
+    public function handle(Request $request, ConnectionInterface $httpConnection)
+    {
+        $httpConnection->send(str(new Response(301, [
+            'Location' => '/sites'
+        ])));
+    }
+}

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

@@ -2,7 +2,7 @@
 
 namespace App\Server\Http\Controllers\Admin;
 
-use App\Http\Controllers\PostController;
+use App\Http\Controllers\Controller;
 use Clue\React\SQLite\DatabaseInterface;
 use Clue\React\SQLite\Result;
 use GuzzleHttp\Psr7\Response;
@@ -15,7 +15,7 @@ use Twig\Loader\ArrayLoader;
 use function GuzzleHttp\Psr7\str;
 use function GuzzleHttp\Psr7\stream_for;
 
-class StoreUsersController extends PostController
+class StoreUsersController extends AdminController
 {
     protected $keepConnectionOpen = true;
 

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

@@ -1,51 +0,0 @@
-<?php
-
-namespace App\Server\Http\Controllers\Admin;
-
-use App\Contracts\ConnectionManager;
-use App\Http\Controllers\PostController;
-use Clue\React\SQLite\DatabaseInterface;
-use Clue\React\SQLite\Result;
-use GuzzleHttp\Psr7\Response;
-use Illuminate\Http\Request;
-use Ratchet\ConnectionInterface;
-use Twig\Environment;
-use Twig\Loader\ArrayLoader;
-use function GuzzleHttp\Psr7\str;
-use function GuzzleHttp\Psr7\stream_for;
-
-class VerifyLoginController extends PostController
-{
-    protected $keepConnectionOpen = true;
-
-    /** @var DatabaseInterface */
-    protected $database;
-
-    public function __construct(DatabaseInterface $database)
-    {
-        $this->database = $database;
-    }
-
-    public function handle(Request $request, ConnectionInterface $httpConnection)
-    {
-        $this->database->query("SELECT * FROM users WHERE email = :email", ['email' => $request->email])
-            ->then(function (Result $result) use ($httpConnection) {
-                if (!is_null($result->rows)) {
-                    $httpConnection->send(
-                        str(new Response(
-                            301,
-                            ['Location' => '/users']
-                        ))
-                    );
-                } else {
-                    $httpConnection->send(
-                        str(new Response(
-                            301,
-                            ['Location' => '/users']
-                        ))
-                    );
-                }
-                $httpConnection->close();
-            });
-    }
-}

app/Server/Http/Controllers/ControlMessageController.php

@@ -131,7 +131,7 @@ class ControlMessageController implements MessageComponentInterface
     {
         if (! is_null($subdomain)) {
             $controlConnection = $this->connectionManager->findControlConnectionForSubdomain($subdomain);
-            if (! is_null($controlConnection) || $subdomain === config('expose.dashboard_subdomain')) {
+            if (! is_null($controlConnection) || $subdomain === config('expose.admin.subdomain')) {
                 $connection->send(json_encode([
                     'event' => 'subdomainTaken',
                     'data' => [

app/Server/Http/Controllers/TunnelMessageController.php

@@ -3,7 +3,7 @@
 namespace App\Server\Http\Controllers;
 
 use App\Contracts\ConnectionManager;
-use App\Http\Controllers\PostController;
+use App\Http\Controllers\Controller;
 use App\Server\Configuration;
 use App\Server\Connections\ControlConnection;
 use GuzzleHttp\Psr7\Response;
@@ -16,7 +16,7 @@ use Ratchet\RFC6455\Messaging\Frame;
 use Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory;
 use function GuzzleHttp\Psr7\str;
 
-class TunnelMessageController extends PostController
+class TunnelMessageController extends Controller
 {
     /** @var ConnectionManager */
     protected $connectionManager;

app/helpers.php

@@ -8,7 +8,7 @@ function respond_json($responseData, int $statusCode = 200)
     return str(new Response(
         $statusCode,
         ['Content-Type' => 'application/json'],
-        json_encode($responseData)
+        json_encode($responseData, JSON_INVALID_UTF8_IGNORE)
     ));
 }
 

config/expose.php

@@ -4,5 +4,33 @@ return [
     'host' => 'expose.dev',
     'port' => 8080,
     'auth_token' => '',
-    'dashboard_subdomain' => 'expose',
+
+    'admin' => [
+
+        /*
+        |--------------------------------------------------------------------------
+        | Subdomain
+        |--------------------------------------------------------------------------
+        |
+        | This is the subdomain that your expose admin dashboard will be available at.
+        | The given subdomain will be reserved, so no other tunnel connection can
+        | request this subdomain for their own connection.
+        |
+        */
+        'subdomain' => 'expose',
+
+        /*
+        |--------------------------------------------------------------------------
+        | Users
+        |--------------------------------------------------------------------------
+        |
+        | The admin dashboard of expose is protected via HTTP basic authentication
+        | Here you may add the user/password combinations that you want to
+        | accept as valid logins for the dashboard.
+        |
+        */
+        'users' => [
+            'username' => 'password'
+        ]
+    ]
 ];

tests/Feature/Client/DashboardTest.php

@@ -15,6 +15,7 @@ use Psr\Http\Message\ResponseInterface;
 use React\EventLoop\LoopInterface;
 use Symfony\Component\Console\Output\ConsoleOutput;
 use Symfony\Component\Console\Output\ConsoleOutputInterface;
+use Tests\Feature\TestCase;
 use function GuzzleHttp\Psr7\str;
 
 class DashboardTest extends TestCase

tests/Feature/Server/AdminTest.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Tests\Feature\Server;
+
+class AdminTest
+{
+
+}

tests/Feature/TestCase.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Client;
+namespace Tests\Feature;
 
 use React\EventLoop\Factory;
 use React\EventLoop\LoopInterface;
@@ -12,7 +12,7 @@ use function Clue\React\Block\await;
 
 abstract class TestCase extends \Tests\TestCase
 {
-    const AWAIT_TIMEOUT = 1.0;
+    const AWAIT_TIMEOUT = 5.0;
 
     /** @var LoopInterface */
     protected $loop;