bitinflow/expose
1
0
Fork 0
mirror of https://github.com/bitinflow/expose.git synced 2026-03-13 21:45:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Marcel Pociot
2020-05-03 00:21:16 +02:00
parent c717683634
commit 72d33b1b70
19 changed files with 408 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/Server/Http/Controllers/Admin/DeleteUsersController.php
View File

@@ -2,9 +2,8 @@
namespace App\Server\Http\Controllers\Admin;
use App\Contracts\UserRepository;
use App\Http\Controllers\Controller;
use Clue\React\SQLite\DatabaseInterface;
use Clue\React\SQLite\Result;
use GuzzleHttp\Psr7\Response;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Validator;
@@ -19,20 +18,20 @@ class DeleteUsersController extends AdminController
{
protected $keepConnectionOpen = true;
/** @var DatabaseInterface */
protected $database;
/** @var UserRepository */
protected $userRepository;
public function __construct(DatabaseInterface $database)
public function __construct(UserRepository $userRepository)
{
$this->database = $database;
$this->userRepository = $userRepository;
}
public function handle(Request $request, ConnectionInterface $httpConnection)
{
$this->database->query("DELETE FROM users WHERE id = :id", ['id' => $request->id])
->then(function (Result $result) use ($httpConnection) {
$httpConnection->send(respond_json(['deleted' => true], 200));
$httpConnection->close();
});
$this->userRepository->deleteUser($request->get('id'))
->then(function() use ($httpConnection) {
$httpConnection->send(respond_json(['deleted' => true], 200));
$httpConnection->close();
});
}
}

3
app/Server/Http/Controllers/Admin/ListSitesController.php
View File

@@ -5,9 +5,6 @@ namespace App\Server\Http\Controllers\Admin;
use App\Contracts\ConnectionManager;
use App\Http\Controllers\Controller;
use App\Server\Configuration;
use Clue\React\SQLite\DatabaseInterface;
use Clue\React\SQLite\Result;
use GuzzleHttp\Psr7\Response;
use Illuminate\Http\Request;
use Ratchet\ConnectionInterface;
use Twig\Environment;

28
app/Server/Http/Controllers/Admin/ListUsersController.php
View File

@@ -2,8 +2,8 @@
namespace App\Server\Http\Controllers\Admin;
use App\Contracts\UserRepository;
use App\Http\Controllers\Controller;
use Clue\React\SQLite\DatabaseInterface;
use Clue\React\SQLite\Result;
use GuzzleHttp\Psr7\Response;
use Illuminate\Http\Request;
@@ -17,26 +17,24 @@ class ListUsersController extends AdminController
{
protected $keepConnectionOpen = true;
/** @var DatabaseInterface */
protected $database;
/** @var UserRepository */
protected $userRepository;
public function __construct(DatabaseInterface $database)
public function __construct(UserRepository $userRepository)
{
$this->database = $database;
$this->userRepository = $userRepository;
}
public function handle(Request $request, ConnectionInterface $httpConnection)
{
$this->database->query('SELECT * FROM users ORDER by created_at DESC')->then(function (Result $result) use ($httpConnection) {
$httpConnection->send(
respond_html($this->getView($httpConnection, 'server.users.index', ['users' => $result->rows]))
);
$this->userRepository
->getUsers()
->then(function ($users) use ($httpConnection) {
$httpConnection->send(
respond_html($this->getView($httpConnection, 'server.users.index', ['users' => $users]))
);
$httpConnection->close();
}, function (\Exception $exception) use ($httpConnection) {
$httpConnection->send(respond_html('Something went wrong: '.$exception->getMessage(), 500));
$httpConnection->close();
});
$httpConnection->close();
});
}
}

1
app/Server/Http/Controllers/Admin/SaveSettingsController.php
View File

@@ -5,7 +5,6 @@ namespace App\Server\Http\Controllers\Admin;
use App\Contracts\ConnectionManager;
use App\Http\Controllers\Controller;
use App\Server\Configuration;
use Clue\React\SQLite\DatabaseInterface;
use Clue\React\SQLite\Result;
use GuzzleHttp\Psr7\Response;
use Illuminate\Http\Request;

4
app/Server/Http/Controllers/Admin/ShowSettingsController.php
View File

@@ -3,11 +3,7 @@
namespace App\Server\Http\Controllers\Admin;
use App\Contracts\ConnectionManager;
use App\Http\Controllers\Controller;
use App\Server\Configuration;
use Clue\React\SQLite\DatabaseInterface;
use Clue\React\SQLite\Result;
use GuzzleHttp\Psr7\Response;
use Illuminate\Http\Request;
use Ratchet\ConnectionInterface;
use Twig\Environment;

27
app/Server/Http/Controllers/Admin/StoreUsersController.php
View File

@@ -2,8 +2,8 @@
namespace App\Server\Http\Controllers\Admin;
use App\Contracts\UserRepository;
use App\Http\Controllers\Controller;
use Clue\React\SQLite\DatabaseInterface;
use Clue\React\SQLite\Result;
use GuzzleHttp\Psr7\Response;
use Illuminate\Http\Request;
@@ -19,12 +19,12 @@ class StoreUsersController extends AdminController
{
protected $keepConnectionOpen = true;
/** @var DatabaseInterface */
protected $database;
/** @var UserRepository */
protected $userRepository;
public function __construct(DatabaseInterface $database)
public function __construct(UserRepository $userRepository)
{
$this->database = $database;
$this->userRepository = $userRepository;
}
public function handle(Request $request, ConnectionInterface $httpConnection)
@@ -47,16 +47,11 @@ class StoreUsersController extends AdminController
'auth_token' => (string)Str::uuid()
];
$this->database->query("
INSERT INTO users (name, auth_token, created_at)
VALUES (:name, :auth_token, DATETIME('now'))
", $insertData)
->then(function (Result $result) use ($httpConnection) {
$this->database->query("SELECT * FROM users WHERE id = :id", ['id' => $result->insertId])
->then(function (Result $result) use ($httpConnection) {
$httpConnection->send(respond_json(['user' => $result->rows[0]], 200));
$httpConnection->close();
});
});
$this->userRepository
->storeUser($insertData)
->then(function ($user) use ($httpConnection) {
$httpConnection->send(respond_json(['user' => $user], 200));
$httpConnection->close();
});
}
}

77
app/Server/Http/Controllers/ControlMessageController.php
View File

@@ -3,10 +3,12 @@
namespace App\Server\Http\Controllers;
use App\Contracts\ConnectionManager;
use App\Contracts\UserRepository;
use App\Http\QueryParameters;
use Clue\React\SQLite\DatabaseInterface;
use Clue\React\SQLite\Result;
use Ratchet\WebSocket\MessageComponentInterface;
use React\Promise\Deferred;
use React\Promise\FulfilledPromise;
use React\Promise\PromiseInterface;
use stdClass;
use Ratchet\ConnectionInterface;
@@ -16,13 +18,13 @@ class ControlMessageController implements MessageComponentInterface
/** @var ConnectionManager */
protected $connectionManager;
/** @var DatabaseInterface */
protected $database;
/** @var UserRepository */
protected $userRepository;
public function __construct(ConnectionManager $connectionManager, DatabaseInterface $database)
public function __construct(ConnectionManager $connectionManager, UserRepository $userRepository)
{
$this->connectionManager = $connectionManager;
$this->database = $database;
$this->userRepository = $userRepository;
}
/**
@@ -75,21 +77,28 @@ class ControlMessageController implements MessageComponentInterface
protected function authenticate(ConnectionInterface $connection, $data)
{
if (config('expose.admin.validate_auth_tokens') === true) {
$this->verifyAuthToken($connection);
}
$this->verifyAuthToken($connection)
->then(function () use ($connection, $data) {
if (! $this->hasValidSubdomain($connection, $data->subdomain)) {
return;
}
if (! $this->hasValidSubdomain($connection, $data->subdomain)) {
return;
}
$connectionInfo = $this->connectionManager->storeConnection($data->host, $data->subdomain, $connection);
$connectionInfo = $this->connectionManager->storeConnection($data->host, $data->subdomain, $connection);
$this->connectionManager->limitConnectionLength($connectionInfo, config('expose.admin.maximum_session_length'));
$connection->send(json_encode([
'event' => 'authenticated',
'subdomain' => $connectionInfo->subdomain,
'client_id' => $connectionInfo->client_id
]));
$connection->send(json_encode([
'event' => 'authenticated',
'subdomain' => $connectionInfo->subdomain,
'client_id' => $connectionInfo->client_id
]));
}, function () use ($connection) {
$connection->send(json_encode([
'event' => 'authenticationFailed',
'data' => []
]));
$connection->close();
});
}
protected function registerProxy(ConnectionInterface $connection, $data)
@@ -111,28 +120,34 @@ class ControlMessageController implements MessageComponentInterface
//
}
protected function verifyAuthToken(ConnectionInterface $connection)
protected function verifyAuthToken(ConnectionInterface $connection): PromiseInterface
{
if (config('expose.admin.validate_auth_tokens') !== true) {
return new FulfilledPromise();
}
$deferred = new Deferred();
$authToken = QueryParameters::create($connection->httpRequest)->get('authToken');
$this->database
->query("SELECT * FROM users WHERE auth_token = :token", ['token' => $authToken])
->then(function (Result $result) use ($connection) {
if (count($result->rows) === 0) {
$connection->send(json_encode([
'event' => 'authenticationFailed',
'data' => []
]));
$connection->close();
$this->userRepository
->getUserByToken($authToken)
->then(function ($user) use ($connection, $deferred) {
if (is_null($user)) {
$deferred->reject();
} else {
$deferred->resolve($user);
}
});
});
return $deferred->promise();
}
protected function hasValidSubdomain(ConnectionInterface $connection, ?string $subdomain): bool
{
if (! is_null($subdomain)) {
if (!is_null($subdomain)) {
$controlConnection = $this->connectionManager->findControlConnectionForSubdomain($subdomain);
if (! is_null($controlConnection) || $subdomain === config('expose.admin.subdomain')) {
if (!is_null($controlConnection) || $subdomain === config('expose.admin.subdomain')) {
$connection->send(json_encode([
'event' => 'subdomainTaken',
'data' => [