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

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

9
app/Client/Http/Controllers/AttachDataToLogController.php
View File

@@ -3,11 +3,11 @@
namespace App\Client\Http\Controllers;
use App\Http\Controllers\Controller;
use GuzzleHttp\Psr7\Response;
use Illuminate\Http\Request;
use App\Logger\RequestLogger;
use Ratchet\ConnectionInterface;
use GuzzleHttp\Psr7\Response;
use function GuzzleHttp\Psr7\str;
use Illuminate\Http\Request;
use Ratchet\ConnectionInterface;
class AttachDataToLogController extends Controller
{
@@ -24,11 +24,12 @@ class AttachDataToLogController extends Controller
$loggedRequest = $this->requestLogger->findLoggedRequest($request->get('request_id', ''));
if (! is_null($loggedRequest)) {
$loggedRequest->setAdditionalData((array)$request->get('data', []));
$loggedRequest->setAdditionalData((array) $request->get('data', []));
$this->requestLogger->pushLoggedRequest($loggedRequest);
$httpConnection->send(str(new Response(200)));
return;
}

12
app/Client/Http/Controllers/CreateTunnelController.php
View File

@@ -3,18 +3,13 @@
namespace App\Client\Http\Controllers;
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;
use Psr\Http\Message\RequestInterface;
use Illuminate\Http\Request;
use Ratchet\ConnectionInterface;
class CreateTunnelController extends Controller
{
protected $keepConnectionOpen = true;
public function handle(Request $request, ConnectionInterface $httpConnection)
@@ -24,10 +19,9 @@ class CreateTunnelController extends Controller
->then(function ($data) use ($httpConnection) {
$httpConnection->send(respond_json($data));
$httpConnection->close();
}, function() use ($httpConnection) {
}, function () use ($httpConnection) {
$httpConnection->send(str(new Response(500)));
$httpConnection->close();
});
}
}

4
app/Client/Http/Controllers/DashboardController.php
View File

@@ -4,15 +4,11 @@ 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 handle(Request $request, ConnectionInterface $httpConnection)
{
$httpConnection->send(respond_html($this->getView($httpConnection, 'client.dashboard', [

3
app/Client/Http/Controllers/LogController.php
View File

@@ -4,11 +4,8 @@ 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;
class LogController extends Controller
{

9
app/Client/Http/Controllers/PushLogsToDashboardController.php
View File

@@ -3,18 +3,15 @@
namespace App\Client\Http\Controllers;
use App\Http\Controllers\Controller;
use Exception;
use App\WebSockets\Socket;
use Exception;
use GuzzleHttp\Psr7\Response;
use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use Ratchet\ConnectionInterface;
use function GuzzleHttp\Psr7\str;
use Psr\Http\Message\RequestInterface;
use Illuminate\Http\Request;
use Ratchet\ConnectionInterface;
class PushLogsToDashboardController extends Controller
{
public function handle(Request $request, ConnectionInterface $httpConnection)
{
try {

5
app/Client/Http/Controllers/ReplayLogController.php
View File

@@ -4,13 +4,11 @@ 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 function GuzzleHttp\Psr7\str;
use Illuminate\Http\Request;
use Ratchet\ConnectionInterface;
use function GuzzleHttp\Psr7\str;
use Psr\Http\Message\RequestInterface;
class ReplayLogController extends Controller
{
@@ -32,6 +30,7 @@ class ReplayLogController extends Controller
if (is_null($loggedRequest)) {
$httpConnection->send(str(new Response(404)));
return;
}

16
app/Client/Http/HttpClient.php
View File

@@ -5,8 +5,8 @@ namespace App\Client\Http;
use App\Client\Http\Modifiers\CheckBasicAuthentication;
use App\Logger\RequestLogger;
use Clue\React\Buzz\Browser;
use Illuminate\Pipeline\Pipeline;
use Illuminate\Support\Arr;
use function GuzzleHttp\Psr7\parse_request;
use function GuzzleHttp\Psr7\str;
use Laminas\Http\Request;
use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\ResponseInterface;
@@ -14,8 +14,6 @@ use Ratchet\Client\WebSocket;
use Ratchet\RFC6455\Messaging\Frame;
use React\EventLoop\LoopInterface;
use React\Socket\Connector;
use function GuzzleHttp\Psr7\parse_request;
use function GuzzleHttp\Psr7\str;
class HttpClient
{
@@ -67,13 +65,13 @@ class HttpClient
protected function createConnector(): Connector
{
return new Connector($this->loop, array(
return new Connector($this->loop, [
'dns' => '127.0.0.1',
'tls' => array(
'tls' => [
'verify_peer' => false,
'verify_peer_name' => false
)
));
'verify_peer_name' => false,
],
]);
}
protected function sendRequestToApplication(RequestInterface $request, $proxyConnection = null)

14
app/Client/Http/Modifiers/CheckBasicAuthentication.php
View File

@@ -4,10 +4,10 @@ namespace App\Client\Http\Modifiers;
use App\Client\Configuration;
use GuzzleHttp\Psr7\Response;
use function GuzzleHttp\Psr7\str;
use Illuminate\Support\Arr;
use Psr\Http\Message\RequestInterface;
use Ratchet\Client\WebSocket;
use function GuzzleHttp\Psr7\str;
class CheckBasicAuthentication
{
@@ -30,10 +30,11 @@ class CheckBasicAuthentication
if (is_null($username)) {
$proxyConnection->send(
str(new Response(401, [
'WWW-Authenticate' => 'Basic realm=Expose'
'WWW-Authenticate' => 'Basic realm=Expose',
], 'Unauthorized'))
);
$proxyConnection->close();
return null;
}
@@ -49,7 +50,7 @@ class CheckBasicAuthentication
return null;
}
if (!array_key_exists($authorization['username'], $credentials)) {
if (! array_key_exists($authorization['username'], $credentials)) {
return null;
}
@@ -63,13 +64,13 @@ class CheckBasicAuthentication
protected function parseAuthorizationHeader(string $header)
{
if (strpos($header, 'Basic') !== 0) {
return null;
return;
}
$header = base64_decode(substr($header, 6));
if ($header === false) {
return null;
return;
}
$header = explode(':', $header, 2);
@@ -82,13 +83,14 @@ class CheckBasicAuthentication
protected function requiresAuthentication(): bool
{
return !empty($this->getCredentials());
return ! empty($this->getCredentials());
}
protected function getCredentials()
{
try {
$credentials = explode(':', $this->configuration->auth());
return [
$credentials[0] => $credentials[1],
];