mirror of
https://github.com/bitinflow/expose.git
synced 2026-03-13 13:35:54 +00:00
wip
This commit is contained in:
@@ -26,4 +26,15 @@ class Configuration
|
||||
{
|
||||
return $this->port;
|
||||
}
|
||||
|
||||
public function __isset($key)
|
||||
{
|
||||
return property_exists($this, $key) || ! is_null(config('expose.admin.'.$key));
|
||||
}
|
||||
|
||||
public function __get($key)
|
||||
{
|
||||
dump(config('expose.admin'));
|
||||
return $this->$key ?? config('expose.admin.'.$key);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,6 +11,8 @@ 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\SaveSettingsController;
|
||||
use App\Server\Http\Controllers\Admin\ShowSettingsController;
|
||||
use App\Server\Http\Controllers\Admin\StoreUsersController;
|
||||
use App\Server\Http\Controllers\Admin\VerifyLoginController;
|
||||
use App\Server\Http\Controllers\ControlMessageController;
|
||||
@@ -114,6 +116,8 @@ class Factory
|
||||
|
||||
$this->router->get('/', RedirectToUsersController::class, $adminCondition);
|
||||
$this->router->get('/users', ListUsersController::class, $adminCondition);
|
||||
$this->router->get('/settings', ShowSettingsController::class, $adminCondition);
|
||||
$this->router->post('/settings', SaveSettingsController::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);
|
||||
@@ -183,7 +187,7 @@ class Factory
|
||||
{
|
||||
app()->singleton(DatabaseInterface::class, function() {
|
||||
$factory = new \Clue\React\SQLite\Factory($this->loop);
|
||||
return $factory->openLazy(base_path('database/expose.db'));
|
||||
return $factory->openLazy(config('expose.admin.database', ':memory:'));
|
||||
});
|
||||
|
||||
return $this;
|
||||
@@ -210,7 +214,7 @@ class Factory
|
||||
|
||||
public function validateAuthTokens(bool $validate)
|
||||
{
|
||||
config()->set('expose.validate_auth_tokens', $validate);
|
||||
config()->set('expose.admin.validate_auth_tokens', $validate);
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
@@ -31,7 +31,7 @@ class ListSitesController extends AdminController
|
||||
public function handle(Request $request, ConnectionInterface $httpConnection)
|
||||
{
|
||||
try {
|
||||
$sites = $this->getView('server.sites.index', [
|
||||
$sites = $this->getView($httpConnection, 'server.sites.index', [
|
||||
'scheme' => $this->configuration->port() === 443 ? 'https' : 'http',
|
||||
'configuration' => $this->configuration,
|
||||
'sites' => $this->connectionManager->getConnections()
|
||||
|
||||
@@ -29,7 +29,7 @@ class ListUsersController extends AdminController
|
||||
{
|
||||
$this->database->query('SELECT * FROM users ORDER by created_at DESC')->then(function (Result $result) use ($httpConnection) {
|
||||
$httpConnection->send(
|
||||
respond_html($this->getView('server.users.index', ['users' => $result->rows]))
|
||||
respond_html($this->getView($httpConnection, 'server.users.index', ['users' => $result->rows]))
|
||||
);
|
||||
|
||||
$httpConnection->close();
|
||||
|
||||
40
app/Server/Http/Controllers/Admin/SaveSettingsController.php
Normal file
40
app/Server/Http/Controllers/Admin/SaveSettingsController.php
Normal file
@@ -0,0 +1,40 @@
|
||||
<?php
|
||||
|
||||
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;
|
||||
use Twig\Loader\ArrayLoader;
|
||||
use function GuzzleHttp\Psr7\str;
|
||||
use function GuzzleHttp\Psr7\stream_for;
|
||||
|
||||
class SaveSettingsController extends AdminController
|
||||
{
|
||||
/** @var ConnectionManager */
|
||||
protected $connectionManager;
|
||||
|
||||
/** @var Configuration */
|
||||
protected $configuration;
|
||||
|
||||
public function __construct(ConnectionManager $connectionManager, Configuration $configuration)
|
||||
{
|
||||
$this->connectionManager = $connectionManager;
|
||||
$this->configuration = $configuration;
|
||||
}
|
||||
|
||||
public function handle(Request $request, ConnectionInterface $httpConnection)
|
||||
{
|
||||
config()->set('expose.admin.validate_auth_tokens', $request->has('validate_auth_tokens'));
|
||||
|
||||
$httpConnection->send(str(new Response(301, [
|
||||
'Location' => '/settings'
|
||||
])));
|
||||
}
|
||||
}
|
||||
40
app/Server/Http/Controllers/Admin/ShowSettingsController.php
Normal file
40
app/Server/Http/Controllers/Admin/ShowSettingsController.php
Normal file
@@ -0,0 +1,40 @@
|
||||
<?php
|
||||
|
||||
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;
|
||||
use Twig\Loader\ArrayLoader;
|
||||
use function GuzzleHttp\Psr7\str;
|
||||
use function GuzzleHttp\Psr7\stream_for;
|
||||
|
||||
class ShowSettingsController extends AdminController
|
||||
{
|
||||
/** @var ConnectionManager */
|
||||
protected $connectionManager;
|
||||
|
||||
/** @var Configuration */
|
||||
protected $configuration;
|
||||
|
||||
public function __construct(ConnectionManager $connectionManager, Configuration $configuration)
|
||||
{
|
||||
$this->connectionManager = $connectionManager;
|
||||
$this->configuration = $configuration;
|
||||
}
|
||||
|
||||
public function handle(Request $request, ConnectionInterface $httpConnection)
|
||||
{
|
||||
$httpConnection->send(
|
||||
respond_html($this->getView($httpConnection, 'server.settings.index', [
|
||||
'configuration' => $this->configuration,
|
||||
]))
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -74,7 +74,7 @@ class ControlMessageController implements MessageComponentInterface
|
||||
|
||||
protected function authenticate(ConnectionInterface $connection, $data)
|
||||
{
|
||||
if (config('expose.validate_auth_tokens') === true) {
|
||||
if (config('expose.admin.validate_auth_tokens') === true) {
|
||||
$this->verifyAuthToken($connection);
|
||||
}
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ class TunnelMessageController extends Controller
|
||||
|
||||
if (is_null($controlConnection)) {
|
||||
$httpConnection->send(
|
||||
respond_html($this->getView('server.errors.404', ['subdomain' => $subdomain]))
|
||||
respond_html($this->getView($httpConnection, 'server.errors.404', ['subdomain' => $subdomain]), 404)
|
||||
);
|
||||
$httpConnection->close();
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user