This commit is contained in:
Marcel Pociot
2020-04-27 10:05:42 +02:00
parent 28c4009dff
commit 054e5b6a86
20 changed files with 737 additions and 461 deletions

View File

@@ -9,12 +9,15 @@ use App\Server\Connections\ConnectionManager;
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\StoreUsersController;
use App\Server\Http\Controllers\Admin\VerifyLoginController;
use App\Server\Http\Controllers\ControlMessageController;
use App\Server\Http\Controllers\TunnelMessageController;
use App\Server\Http\RouteGenerator;
use App\Server\Http\Router;
use App\Server\SubdomainGenerator\RandomSubdomainGenerator;
use Clue\React\SQLite\DatabaseInterface;
use Ratchet\Http\Router;
use Ratchet\Server\IoServer;
use Ratchet\WebSocket\WsServer;
use React\Socket\Server;
@@ -22,6 +25,7 @@ use React\EventLoop\LoopInterface;
use React\EventLoop\Factory as LoopFactory;
use Symfony\Component\Finder\Finder;
use Symfony\Component\Finder\SplFileInfo;
use Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeFileSessionHandler;
use Symfony\Component\Routing\Matcher\UrlMatcher;
use Symfony\Component\Routing\RequestContext;
use Symfony\Component\Routing\Route;
@@ -41,13 +45,13 @@ class Factory
/** @var \React\EventLoop\LoopInterface */
protected $loop;
/** @var RouteCollection */
protected $routes;
/** @var RouteGenerator */
protected $router;
public function __construct()
{
$this->loop = LoopFactory::create();
$this->routes = new RouteCollection();
$this->router = new RouteGenerator();
}
public function setHost(string $host)
@@ -80,17 +84,9 @@ class Factory
protected function addExposeRoutes()
{
$wsServer = new WsServer(app(ControlMessageController::class));
$wsServer->enableKeepAlive($this->loop);
$this->router->get('/__expose_control__', ControlMessageController::class);
$this->routes->add('control',
new Route('/__expose_control__', [
'_controller' => $wsServer
], [], [], null, [], []
)
);
$this->routes->add('tunnel',
$this->router->addSymfonyRoute('tunnel',
new Route('/{__catchall__}', [
'_controller' => app(TunnelMessageController::class),
], [
@@ -100,29 +96,14 @@ class Factory
protected function addAdminRoutes()
{
$this->routes->add('admin.users.index',
new Route('/expose/users', [
'_controller' => app(ListUsersController::class),
], [], [], null, [], ['GET'])
);
$adminCondition = 'request.headers.get("Host") matches "/'.config('expose.dashboard_subdomain').'./i"';
$this->routes->add('admin.users.store',
new Route('/expose/users', [
'_controller' => app(StoreUsersController::class),
], [], [], null, [], ['POST'])
);
$this->routes->add('admin.users.delete',
new Route('/expose/users/delete/{id}', [
'_controller' => app(DeleteUsersController::class),
], [], [], null, [], ['DELETE'])
);
$this->routes->add('admin.sites.index',
new Route('/expose/sites', [
'_controller' => app(ListSitesController::class),
], [], [], null, [], ['GET'])
);
$this->router->get('/', LoginController::class, $adminCondition);
$this->router->post('/', VerifyLoginController::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);
$this->router->get('/sites', ListSitesController::class, $adminCondition);
}
protected function bindConfiguration()
@@ -164,7 +145,7 @@ class Factory
$this->addExposeRoutes();
$urlMatcher = new UrlMatcher($this->routes, new RequestContext);
$urlMatcher = new UrlMatcher($this->router->getRoutes(), new RequestContext);
$router = new Router($urlMatcher);

View File

@@ -26,8 +26,14 @@ class ListSitesController extends PostController
public function handle(Request $request, ConnectionInterface $httpConnection)
{
try {
$sites = $this->getView('server.sites.index', ['sites' => $this->connectionManager->getConnections()]);
} catch (\Exception $e) {
dump($e->getMessage());
}
$httpConnection->send(
respond_html($this->getView('server.sites.index', ['sites' => $this->connectionManager->getConnections()]))
respond_html($sites)
);
}
}

View File

@@ -0,0 +1,25 @@
<?php
namespace App\Server\Http\Controllers\Admin;
use App\Contracts\ConnectionManager;
use App\HttpServer\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'))
);
}
}

View File

@@ -0,0 +1,51 @@
<?php
namespace App\Server\Http\Controllers\Admin;
use App\Contracts\ConnectionManager;
use App\HttpServer\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();
});
}
}

View File

@@ -78,6 +78,10 @@ class ControlMessageController implements MessageComponentInterface
$this->verifyAuthToken($connection);
}
if (! $this->hasValidSubdomain($connection, $data->subdomain)) {
return;
}
$connectionInfo = $this->connectionManager->storeConnection($data->host, $data->subdomain, $connection);
$connection->send(json_encode([
@@ -122,4 +126,24 @@ class ControlMessageController implements MessageComponentInterface
}
});
}
protected function hasValidSubdomain(ConnectionInterface $connection, ?string $subdomain): bool
{
if (! is_null($subdomain)) {
$controlConnection = $this->connectionManager->findControlConnectionForSubdomain($subdomain);
if (! is_null($controlConnection) || $subdomain === config('expose.dashboard_subdomain')) {
$connection->send(json_encode([
'event' => 'subdomainTaken',
'data' => [
'subdomain' => $subdomain,
]
]));
$connection->close();
return false;
}
}
return true;
}
}

View File

@@ -82,6 +82,7 @@ class TunnelMessageController extends PostController
protected function prepareRequest(Request $request, ControlConnection $controlConnection): Request
{
$request->headers->set('Host', $controlConnection->host);
$request->headers->set('X-Forwarded-Proto', $request->isSecure() ? 'https' : 'http');
$request->headers->set('X-Expose-Request-ID', uniqid());
$request->headers->set('X-Exposed-By', config('app.name') . ' '. config('app.version'));
$request->headers->set('X-Original-Host', "{$controlConnection->subdomain}.{$this->configuration->hostname()}:{$this->configuration->port()}");

View File

@@ -0,0 +1,78 @@
<?php
namespace App\Server\Http;
use Ratchet\MessageComponentInterface;
use Ratchet\WebSocket\WsServer;
use React\EventLoop\LoopInterface;
use Symfony\Component\Routing\Route;
use Symfony\Component\Routing\RouteCollection;
class RouteGenerator
{
/** @var \Symfony\Component\Routing\RouteCollection */
protected $routes;
public function __construct()
{
$this->routes = new RouteCollection;
}
public function getRoutes(): RouteCollection
{
return $this->routes;
}
public function get(string $uri, $action, string $condition = '')
{
$this->addRoute('GET', $uri, $action, $condition);
}
public function post(string $uri, $action, string $condition = '')
{
$this->addRoute('POST', $uri, $action, $condition);
}
public function put(string $uri, $action, string $condition = '')
{
$this->addRoute('PUT', $uri, $action, $condition);
}
public function patch(string $uri, $action, string $condition = '')
{
$this->addRoute('PATCH', $uri, $action, $condition);
}
public function delete(string $uri, $action, string $condition = '')
{
$this->addRoute('DELETE', $uri, $action, $condition);
}
public function addRoute(string $method, string $uri, $action, string $condition = '')
{
$this->routes->add("{$method}-($uri}", $this->getRoute($method, $uri, $action, $condition));
}
public function addSymfonyRoute(string $name, Route $route)
{
$this->routes->add($name, $route);
}
protected function getRoute(string $method, string $uri, $action, string $condition = ''): Route
{
$action = is_subclass_of($action, MessageComponentInterface::class)
? $this->createWebSocketsServer($action)
: app($action);
return new Route($uri, ['_controller' => $action], [], [], null, [], [$method], $condition);
}
protected function createWebSocketsServer(string $action): WsServer
{
$wServer = new WsServer(app($action));
$wServer->enableKeepAlive(app(LoopInterface::class));
return $wServer;
}
}

126
app/Server/Http/Router.php Normal file
View File

@@ -0,0 +1,126 @@
<?php
namespace App\Server\Http;
use App\HttpServer\QueryParameters;
use GuzzleHttp\Psr7\ServerRequest;
use Psr\Http\Message\RequestInterface;
use Ratchet\ConnectionInterface;
use Ratchet\Http\CloseResponseTrait;
use Ratchet\Http\HttpServerInterface;
use Ratchet\Http\NoOpHttpServerController;
use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory;
use Symfony\Component\Routing\Exception\MethodNotAllowedException;
use Symfony\Component\Routing\Exception\ResourceNotFoundException;
use Symfony\Component\Routing\Matcher\UrlMatcher;
use function GuzzleHttp\Psr7\build_query;
use function GuzzleHttp\Psr7\parse_query;
class Router implements HttpServerInterface
{
use CloseResponseTrait;
/**
* @var UrlMatcher
*/
protected $_matcher;
private $_noopController;
public function __construct(UrlMatcher $matcher)
{
$this->_matcher = $matcher;
$this->_noopController = new NoOpHttpServerController;
}
/**
* {@inheritdoc}
* @throws \UnexpectedValueException If a controller is not \Ratchet\Http\HttpServerInterface
*/
public function onOpen(ConnectionInterface $conn, RequestInterface $request = null)
{
if (null === $request) {
throw new \UnexpectedValueException('$request can not be null');
}
$conn->controller = $this->_noopController;
$uri = $request->getUri();
$context = $this->_matcher->getContext();
$context->setMethod($request->getMethod());
$context->setHost($uri->getHost());
$symfonyRequest = $this->createSymfonyRequest($request);
try {
$route = $this->_matcher->matchRequest($symfonyRequest);
} catch (MethodNotAllowedException $nae) {
return $this->close($conn, 405, array('Allow' => $nae->getAllowedMethods()));
} catch (ResourceNotFoundException $nfe) {
return $this->close($conn, 404);
}
if (is_string($route['_controller']) && class_exists($route['_controller'])) {
$route['_controller'] = new $route['_controller'];
}
if (!($route['_controller'] instanceof HttpServerInterface)) {
throw new \UnexpectedValueException('All routes must implement Ratchet\Http\HttpServerInterface');
}
$parameters = [];
foreach ($route as $key => $value) {
if ((is_string($key)) && ('_' !== substr($key, 0, 1))) {
$parameters[$key] = $value;
}
}
$parameters = array_merge($parameters, parse_query($uri->getQuery() ?: ''));
$request = $request->withUri($uri->withQuery(build_query($parameters)));
$conn->controller = $route['_controller'];
$conn->controller->onOpen($conn, $request);
}
/**
* {@inheritdoc}
*/
public function onMessage(ConnectionInterface $from, $msg)
{
$from->controller->onMessage($from, $msg);
}
/**
* {@inheritdoc}
*/
public function onClose(ConnectionInterface $conn)
{
if (isset($conn->controller)) {
$conn->controller->onClose($conn);
}
}
/**
* {@inheritdoc}
*/
public function onError(ConnectionInterface $conn, \Exception $e)
{
if (isset($conn->controller)) {
$conn->controller->onError($conn, $e);
}
}
protected function createSymfonyRequest(RequestInterface $request)
{
$serverRequest = (new ServerRequest(
$request->getMethod(),
$request->getUri(),
$request->getHeaders(),
$request->getBody(),
$request->getProtocolVersion()
))->withQueryParams(QueryParameters::create($request)->all());
return (new HttpFoundationFactory())->createRequest($serverRequest);
}
}