This commit is contained in:
Marcel Pociot
2020-04-22 12:32:29 +02:00
parent 1f8865145f
commit e5e53b8b68
41 changed files with 1593 additions and 915 deletions

View File

@@ -4,19 +4,26 @@ namespace App\HttpServer\Controllers;
use Illuminate\Http\Request;
use App\Logger\RequestLogger;
use Ratchet\ConnectionInterface;
class AttachDataToLogController extends PostController
{
public function handle(Request $request)
/** @var RequestLogger */
protected $requestLogger;
public function __construct(RequestLogger $requestLogger)
{
/** @var RequestLogger $requestLogger */
$requestLogger = app(RequestLogger::class);
$loggedRequest = $requestLogger->findLoggedRequest($request->get('request_id', ''));
$this->requestLogger = $requestLogger;
}
public function handle(Request $request, ConnectionInterface $httpConnection)
{
$loggedRequest = $this->requestLogger->findLoggedRequest($request->get('request_id', ''));
if (! is_null($loggedRequest)) {
$loggedRequest->setAdditionalData((array)$request->get('data', []));
$requestLogger->pushLogs();
$this->requestLogger->pushLogs();
}
}
}

View File

@@ -2,7 +2,7 @@
namespace App\HttpServer\Controllers;
use App\Client\TunnelConnection;
use App\Client\Http\HttpClient;
use App\HttpServer\QueryParameters;
use App\Logger\RequestLogger;
use GuzzleHttp\Psr7\Response;
@@ -12,11 +12,17 @@ use Psr\Http\Message\RequestInterface;
class ClearLogsController extends Controller
{
/** @var RequestLogger */
protected $requestLogger;
public function __construct(RequestLogger $requestLogger)
{
$this->requestLogger = $requestLogger;
}
public function onOpen(ConnectionInterface $connection, RequestInterface $request = null)
{
/** @var RequestLogger $logger */
$logger = app(RequestLogger::class);
$logger->clear();
$this->requestLogger->clear();
$connection->send(
str(new Response(

View File

@@ -10,6 +10,9 @@ abstract class Controller implements HttpServerInterface
{
public function onClose(ConnectionInterface $connection)
{
unset($connection->requestBuffer);
unset($connection->contentLength);
unset($connection->request);
}
public function onError(ConnectionInterface $connection, Exception $e)

View File

@@ -10,16 +10,21 @@ use Psr\Http\Message\RequestInterface;
class LogController extends Controller
{
/** @var RequestLogger */
protected $requestLogger;
public function __construct(RequestLogger $requestLogger)
{
$this->requestLogger = $requestLogger;
}
public function onOpen(ConnectionInterface $connection, RequestInterface $request = null)
{
/** @var RequestLogger $logger */
$logger = app(RequestLogger::class);
$connection->send(
str(new Response(
200,
['Content-Type' => 'application/json'],
json_encode($logger->getData(), JSON_INVALID_UTF8_IGNORE)
json_encode($this->requestLogger->getData(), JSON_INVALID_UTF8_IGNORE)
))
);

View File

@@ -9,11 +9,15 @@ use Illuminate\Support\Collection;
use Psr\Http\Message\RequestInterface;
use Ratchet\ConnectionInterface;
use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory;
use function GuzzleHttp\Psr7\parse_request;
abstract class PostController extends Controller
{
protected $keepConnectionOpen = false;
public function onOpen(ConnectionInterface $connection, RequestInterface $request = null)
{
dump(memory_get_usage(true));
$connection->contentLength = $this->findContentLength($request->getHeaders());
$connection->requestBuffer = (string) $request->getBody();
@@ -25,7 +29,14 @@ abstract class PostController extends Controller
public function onMessage(ConnectionInterface $from, $msg)
{
$from->requestBuffer .= $msg;
if (! isset($from->requestBuffer)) {
$request = parse_request($msg);
$from->contentLength = $this->findContentLength($request->getHeaders());
$from->request = $request;
$from->requestBuffer = (string) $request->getBody();
} else {
$from->requestBuffer .= $msg;
}
$this->checkContentLength($from);
}
@@ -42,9 +53,11 @@ abstract class PostController extends Controller
if (strlen($connection->requestBuffer) === $connection->contentLength) {
$laravelRequest = $this->createLaravelRequest($connection);
$this->handle($laravelRequest);
$this->handle($laravelRequest, $connection);
$connection->close();
if (! $this->keepConnectionOpen) {
$connection->close();
}
unset($connection->requestBuffer);
unset($connection->contentLength);
@@ -52,7 +65,7 @@ abstract class PostController extends Controller
}
}
abstract public function handle(Request $request);
abstract public function handle(Request $request, ConnectionInterface $httpConnection);
protected function createLaravelRequest(ConnectionInterface $connection): Request
{

View File

@@ -2,7 +2,7 @@
namespace App\HttpServer\Controllers;
use App\Client\TunnelConnection;
use App\Client\Http\HttpClient;
use App\HttpServer\QueryParameters;
use App\Logger\RequestLogger;
use GuzzleHttp\Psr7\Response;
@@ -12,15 +12,25 @@ use Psr\Http\Message\RequestInterface;
class ReplayLogController extends Controller
{
/** @var RequestLogger */
protected $requestLogger;
/** @var HttpClient */
protected $httpClient;
public function __construct(RequestLogger $requestLogger, HttpClient $httpClient)
{
$this->requestLogger = $requestLogger;
$this->httpClient = $httpClient;
}
public function onOpen(ConnectionInterface $connection, RequestInterface $request = null)
{
/** @var RequestLogger $logger */
$logger = app(RequestLogger::class);
$requestData = $logger->findLoggedRequest(QueryParameters::create($request)->get('log'))->getRequestData();
$requestData = $this->requestLogger->findLoggedRequest(QueryParameters::create($request)->get('log'))->getRequestData();
/** @var TunnelConnection $tunnel */
$tunnel = app(TunnelConnection::class);
$tunnel->performRequest($requestData);
/** @var HttpClient $tunnel */
$this->httpClient->performRequest($requestData);
$connection->send(
str(new Response(

View File

@@ -10,6 +10,6 @@ class HttpServer extends \Ratchet\Http\HttpServer
{
parent::__construct($component);
$this->_reqParser->maxSize = 15242880;
$this->_reqParser->maxSize = 15242880000;
}
}