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

Apply fixes from StyleCI

Browse Source
This commit is contained in:
Marcel Pociot
2020-06-17 10:35:07 +00:00
committed by StyleCI Bot
parent 0e33bc7d99
commit 83676deddb
56 changed files with 189 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Server/Http/Controllers/Admin/AdminController.php
View File

@@ -4,10 +4,10 @@ namespace App\Server\Http\Controllers\Admin;
use App\Http\Controllers\Controller;
use GuzzleHttp\Psr7\Response;
use function GuzzleHttp\Psr7\str;
use Illuminate\Http\Request;
use Illuminate\Support\Str;
use Ratchet\ConnectionInterface;
use function GuzzleHttp\Psr7\str;
abstract class AdminController extends Controller
{
@@ -16,17 +16,19 @@ abstract class AdminController extends Controller
try {
$authorization = Str::after($request->header('Authorization'), 'Basic ');
$authParts = explode(':', base64_decode($authorization), 2);
list($user, $password) = $authParts;
[$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"'
'WWW-Authenticate' => 'Basic realm="Expose"',
])));
}
return false;
}

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

@@ -3,16 +3,8 @@
namespace App\Server\Http\Controllers\Admin;
use App\Contracts\UserRepository;
use App\Http\Controllers\Controller;
use GuzzleHttp\Psr7\Response;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Str;
use Ratchet\ConnectionInterface;
use Twig\Environment;
use Twig\Loader\ArrayLoader;
use function GuzzleHttp\Psr7\str;
use function GuzzleHttp\Psr7\stream_for;
class DeleteUsersController extends AdminController
{
@@ -29,7 +21,7 @@ class DeleteUsersController extends AdminController
public function handle(Request $request, ConnectionInterface $httpConnection)
{
$this->userRepository->deleteUser($request->get('id'))
->then(function() use ($httpConnection) {
->then(function () use ($httpConnection) {
$httpConnection->send(respond_json(['deleted' => true], 200));
$httpConnection->close();
});

8
app/Server/Http/Controllers/Admin/DisconnectSiteController.php
View File

@@ -3,15 +3,9 @@
namespace App\Server\Http\Controllers\Admin;
use App\Contracts\ConnectionManager;
use App\Http\Controllers\Controller;
use App\Server\Configuration;
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 DisconnectSiteController extends AdminController
{
@@ -37,7 +31,7 @@ class DisconnectSiteController extends AdminController
}
$httpConnection->send(respond_json([
'sites' => $this->connectionManager->getConnections()
'sites' => $this->connectionManager->getConnections(),
]));
}
}

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

@@ -6,10 +6,6 @@ use App\Contracts\ConnectionManager;
use App\Server\Configuration;
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 GetSettingsController extends AdminController
{

7
app/Server/Http/Controllers/Admin/GetSitesController.php
View File

@@ -3,14 +3,9 @@
namespace App\Server\Http\Controllers\Admin;
use App\Contracts\ConnectionManager;
use App\Http\Controllers\Controller;
use App\Server\Configuration;
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 GetSitesController extends AdminController
{
@@ -33,7 +28,7 @@ class GetSitesController extends AdminController
$site['id'] = $siteId;
return $site;
})->values()
})->values(),
])
);
}

7
app/Server/Http/Controllers/Admin/GetUsersController.php
View File

@@ -3,15 +3,8 @@
namespace App\Server\Http\Controllers\Admin;
use App\Contracts\UserRepository;
use App\Http\Controllers\Controller;
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 GetUsersController extends AdminController
{

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

@@ -3,14 +3,9 @@
namespace App\Server\Http\Controllers\Admin;
use App\Contracts\ConnectionManager;
use App\Http\Controllers\Controller;
use App\Server\Configuration;
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 ListSitesController extends AdminController
{
@@ -30,7 +25,7 @@ class ListSitesController extends AdminController
$sites = $this->getView($httpConnection, 'server.sites.index', [
'scheme' => $this->configuration->port() === 443 ? 'https' : 'http',
'configuration' => $this->configuration,
'sites' => $this->connectionManager->getConnections()
'sites' => $this->connectionManager->getConnections(),
]);
$httpConnection->send(

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

@@ -3,15 +3,8 @@
namespace App\Server\Http\Controllers\Admin;
use App\Contracts\UserRepository;
use App\Http\Controllers\Controller;
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 ListUsersController extends AdminController
{

5
app/Server/Http/Controllers/Admin/RedirectToUsersController.php
View File

@@ -2,19 +2,18 @@
namespace App\Server\Http\Controllers\Admin;
use App\Http\Controllers\Controller;
use GuzzleHttp\Psr7\Response;
use function GuzzleHttp\Psr7\str;
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'
'Location' => '/sites',
])));
}
}

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

@@ -6,10 +6,6 @@ use App\Contracts\ConnectionManager;
use App\Server\Configuration;
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
{

10
app/Server/Http/Controllers/Admin/StoreSettingsController.php
View File

@@ -2,18 +2,10 @@
namespace App\Server\Http\Controllers\Admin;
use App\Contracts\ConnectionManager;
use App\Http\Controllers\Controller;
use App\Server\Configuration;
use Clue\React\SQLite\Result;
use GuzzleHttp\Psr7\Response;
use Illuminate\Http\Request;
use Illuminate\Support\Arr;
use Ratchet\ConnectionInterface;
use Twig\Environment;
use Twig\Loader\ArrayLoader;
use function GuzzleHttp\Psr7\str;
use function GuzzleHttp\Psr7\stream_for;
class StoreSettingsController extends AdminController
{
@@ -27,7 +19,7 @@ class StoreSettingsController extends AdminController
public function handle(Request $request, ConnectionInterface $httpConnection)
{
config()->set('expose.admin.validate_auth_tokens', (bool)$request->get('validate_auth_tokens'));
config()->set('expose.admin.validate_auth_tokens', (bool) $request->get('validate_auth_tokens'));
$messages = $request->get('messages');

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

@@ -3,17 +3,11 @@
namespace App\Server\Http\Controllers\Admin;
use App\Contracts\UserRepository;
use App\Http\Controllers\Controller;
use Clue\React\SQLite\Result;
use GuzzleHttp\Psr7\Response;
use function GuzzleHttp\Psr7\str;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Str;
use Ratchet\ConnectionInterface;
use Twig\Environment;
use Twig\Loader\ArrayLoader;
use function GuzzleHttp\Psr7\str;
use function GuzzleHttp\Psr7\stream_for;
class StoreUsersController extends AdminController
{
@@ -44,7 +38,7 @@ class StoreUsersController extends AdminController
$insertData = [
'name' => $request->get('name'),
'auth_token' => (string)Str::uuid()
'auth_token' => (string) Str::uuid(),
];
$this->userRepository

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

@@ -5,16 +5,15 @@ namespace App\Server\Http\Controllers;
use App\Contracts\ConnectionManager;
use App\Contracts\UserRepository;
use App\Http\QueryParameters;
use Ratchet\ConnectionInterface;
use Ratchet\WebSocket\MessageComponentInterface;
use React\Promise\Deferred;
use React\Promise\FulfilledPromise;
use React\Promise\PromiseInterface;
use stdClass;
use Ratchet\ConnectionInterface;
class ControlMessageController implements MessageComponentInterface
{
/** @var ConnectionManager */
protected $connectionManager;
@@ -28,16 +27,16 @@ class ControlMessageController implements MessageComponentInterface
}
/**
* @inheritDoc
* {@inheritdoc}
*/
function onOpen(ConnectionInterface $connection)
public function onOpen(ConnectionInterface $connection)
{
}
/**
* @inheritDoc
* {@inheritdoc}
*/
function onClose(ConnectionInterface $connection)
public function onClose(ConnectionInterface $connection)
{
if (isset($connection->request_id)) {
$httpConnection = $this->connectionManager->getHttpConnectionForRequestId($connection->request_id);
@@ -48,9 +47,9 @@ class ControlMessageController implements MessageComponentInterface
}
/**
* @inheritDoc
* {@inheritdoc}
*/
function onMessage(ConnectionInterface $connection, $msg)
public function onMessage(ConnectionInterface $connection, $msg)
{
if (isset($connection->request_id)) {
return $this->sendResponseToHttpConnection($connection->request_id, $msg);
@@ -92,15 +91,15 @@ class ControlMessageController implements MessageComponentInterface
'data' => [
'message' => config('expose.admin.messages.message_of_the_day'),
'subdomain' => $connectionInfo->subdomain,
'client_id' => $connectionInfo->client_id
'client_id' => $connectionInfo->client_id,
],
]));
}, function () use ($connection) {
$connection->send(json_encode([
'event' => 'authenticationFailed',
'data' => [
'message' => config('expose.admin.messages.invalid_auth_token')
]
'message' => config('expose.admin.messages.invalid_auth_token'),
],
]));
$connection->close();
});
@@ -112,15 +111,15 @@ class ControlMessageController implements MessageComponentInterface
$connectionInfo = $this->connectionManager->findControlConnectionForClientId($data->client_id);
$connectionInfo->emit('proxy_ready_' . $data->request_id, [
$connectionInfo->emit('proxy_ready_'.$data->request_id, [
$connection,
]);
}
/**
* @inheritDoc
* {@inheritdoc}
*/
function onError(ConnectionInterface $conn, \Exception $e)
public function onError(ConnectionInterface $conn, \Exception $e)
{
//
}
@@ -150,9 +149,9 @@ class ControlMessageController implements MessageComponentInterface
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')) {
$message = config('expose.admin.messages.subdomain_taken');
$message = str_replace(':subdomain', $subdomain, $message);
@@ -160,7 +159,7 @@ class ControlMessageController implements MessageComponentInterface
'event' => 'subdomainTaken',
'data' => [
'message' => $message,
]
],
]));
$connection->close();

13
app/Server/Http/Controllers/TunnelMessageController.php
View File

@@ -7,16 +7,13 @@ use App\Http\Controllers\Controller;
use App\Server\Configuration;
use App\Server\Connections\ControlConnection;
use App\Server\Connections\HttpConnection;
use GuzzleHttp\Psr7\Response;
use function GuzzleHttp\Psr7\str;
use Illuminate\Http\Request;
use Illuminate\Pipeline\Pipeline;
use Illuminate\Support\Str;
use Nyholm\Psr7\Factory\Psr17Factory;
use Ratchet\ConnectionInterface;
use Ratchet\RFC6455\Messaging\Frame;
use React\Promise\Deferred;
use Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory;
use function GuzzleHttp\Psr7\str;
class TunnelMessageController extends Controller
{
@@ -45,6 +42,7 @@ class TunnelMessageController extends Controller
respond_html($this->getView($httpConnection, 'server.homepage'), 200)
);
$httpConnection->close();
return;
}
@@ -55,6 +53,7 @@ class TunnelMessageController extends Controller
respond_html($this->getView($httpConnection, 'server.errors.404', ['subdomain' => $subdomain]), 404)
);
$httpConnection->close();
return;
}
@@ -77,7 +76,7 @@ class TunnelMessageController extends Controller
$httpConnection = $this->connectionManager->storeHttpConnection($httpConnection, $requestId);
transform($this->passRequestThroughModifiers($request, $httpConnection), function (Request $request) use ($controlConnection, $httpConnection, $requestId) {
$controlConnection->once('proxy_ready_' . $requestId, function (ConnectionInterface $proxy) use ($request) {
$controlConnection->once('proxy_ready_'.$requestId, function (ConnectionInterface $proxy) use ($request) {
// Convert the Laravel request into a PSR7 request
$psr17Factory = new Psr17Factory();
$psrHttpFactory = new PsrHttpFactory($psr17Factory, $psr17Factory, $psr17Factory, $psr17Factory);
@@ -110,7 +109,7 @@ class TunnelMessageController extends Controller
$host = $this->configuration->hostname();
if (!$request->isSecure()) {
if (! $request->isSecure()) {
$host .= ":{$this->configuration->port()}";
}
@@ -118,7 +117,7 @@ class TunnelMessageController extends Controller
$request->headers->set('X-Forwarded-Proto', $request->isSecure() ? 'https' : 'http');
$request->headers->set('X-Expose-Request-ID', uniqid());
$request->headers->set('Upgrade-Insecure-Requests', 1);
$request->headers->set('X-Exposed-By', config('app.name') . ' ' . config('app.version'));
$request->headers->set('X-Exposed-By', config('app.name').' '.config('app.version'));
$request->headers->set('X-Original-Host', "{$controlConnection->subdomain}.{$host}");
return $request;