diff --git a/Resources/views/Collector/profiler.html.twig b/Resources/views/Collector/profiler.html.twig
index c246e63..10f02a6 100644
--- a/Resources/views/Collector/profiler.html.twig
+++ b/Resources/views/Collector/profiler.html.twig
@@ -135,7 +135,7 @@
{% for index, call in collector.calls %}
- {% include '@SimpleHttp/Collector/partials/call.html.twig' with { 'call': call } %}
+ {% include '@SimpleHttp/Collector/partials/call.html.twig' with { 'call': call, 'index': index, 'token': token } %}
{% endfor %}
diff --git a/Service/ReplayRequestResolver.php b/Service/ReplayRequestResolver.php
new file mode 100644
index 0000000..e3d9031
--- /dev/null
+++ b/Service/ReplayRequestResolver.php
@@ -0,0 +1,107 @@
+profiler;
+ }
+
+ /**
+ * @return array{
+ * method: string,
+ * uri: string,
+ * content: string,
+ * headers: string[],
+ * cookies: array
+ * }
+ */
+ public function resolve(string $token, int $callIndex): array
+ {
+ if (!$this->profiler) {
+ throw new NotFoundHttpException('Profiler is not available.');
+ }
+
+ $profile = $this->profiler->loadProfile($token);
+ if (!$profile instanceof Profile) {
+ throw new NotFoundHttpException('Profiler token not found.');
+ }
+
+ if (!$profile->hasCollector('simplehttpprofiler')) {
+ throw new NotFoundHttpException('Simple HTTP collector not found.');
+ }
+
+ $collector = $profile->getCollector('simplehttpprofiler');
+ if (!$collector instanceof ProfilerDataCollector) {
+ throw new NotFoundHttpException('Simple HTTP collector is invalid.');
+ }
+
+ $calls = $collector->getCalls();
+ if (!array_key_exists($callIndex, $calls) || !is_array($calls[$callIndex])) {
+ throw new NotFoundHttpException('HTTP call not found.');
+ }
+
+ $request = $calls[$callIndex]['request'] ?? null;
+ if (!is_array($request)) {
+ throw new NotFoundHttpException('Stored request is invalid.');
+ }
+
+ $method = isset($request['method']) && is_string($request['method']) ? $request['method'] : '';
+ $uri = $this->resolveUri($request);
+
+ if ('' === $method || '' === $uri) {
+ throw new NotFoundHttpException('Stored request is incomplete.');
+ }
+
+ return [
+ 'method' => $method,
+ 'uri' => $uri,
+ 'content' => isset($request['content']) && is_string($request['content']) ? $request['content'] : '',
+ 'headers' => $this->normalizeHeaders($request['headers'] ?? []),
+ 'cookies' => is_array($request['cookies'] ?? null) ? $request['cookies'] : [],
+ ];
+ }
+
+ /**
+ * @param mixed $headers
+ * @return string[]
+ */
+ private function normalizeHeaders(mixed $headers): array
+ {
+ if (!is_array($headers)) {
+ return [];
+ }
+
+ return array_values(array_filter($headers, static fn (mixed $header): bool => is_string($header)));
+ }
+
+ /**
+ * @param array $request
+ */
+ private function resolveUri(array $request): string
+ {
+ if (isset($request['uri']) && is_string($request['uri']) && '' !== $request['uri']) {
+ return $request['uri'];
+ }
+
+ $schemeAndHttpHost = $request['schemeAndHttpHost'] ?? null;
+ $requestUri = $request['requestUri'] ?? null;
+
+ if (is_string($schemeAndHttpHost) && is_string($requestUri) && '' !== $schemeAndHttpHost && '' !== $requestUri) {
+ return $schemeAndHttpHost . $requestUri;
+ }
+
+ return '';
+ }
+}
diff --git a/Service/ReplayRequestSignature.php b/Service/ReplayRequestSignature.php
new file mode 100644
index 0000000..6918936
--- /dev/null
+++ b/Service/ReplayRequestSignature.php
@@ -0,0 +1,46 @@
+buildTokenId($token, $callIndex);
+
+ if ($this->csrfTokenManager) {
+ return $this->csrfTokenManager->getToken($tokenId)->getValue();
+ }
+
+ return hash_hmac('sha256', $tokenId, $this->secret);
+ }
+
+ public function isValid(string $token, int $callIndex, ?string $submittedToken): bool
+ {
+ if (!is_string($submittedToken) || '' === $submittedToken) {
+ return false;
+ }
+
+ $tokenId = $this->buildTokenId($token, $callIndex);
+
+ if ($this->csrfTokenManager) {
+ return $this->csrfTokenManager->isTokenValid(new CsrfToken($tokenId, $submittedToken));
+ }
+
+ return hash_equals($this->generate($token, $callIndex), $submittedToken);
+ }
+
+ private function buildTokenId(string $token, int $callIndex): string
+ {
+ return 'simple_http.replay.' . $token . '.' . $callIndex;
+ }
+}
diff --git a/Tests/Unit/ReplayRequestSignatureTest.php b/Tests/Unit/ReplayRequestSignatureTest.php
new file mode 100644
index 0000000..39c5ab5
--- /dev/null
+++ b/Tests/Unit/ReplayRequestSignatureTest.php
@@ -0,0 +1,20 @@
+generate('abc123', 4);
+
+ $this->assertNotSame('', $token);
+ $this->assertTrue($signature->isValid('abc123', 4, $token));
+ $this->assertFalse($signature->isValid('abc123', 5, $token));
+ $this->assertFalse($signature->isValid('abc123', 4, 'invalid'));
+ }
+}
diff --git a/Twig/Extension.php b/Twig/Extension.php
index 9fe9671..0587298 100644
--- a/Twig/Extension.php
+++ b/Twig/Extension.php
@@ -2,6 +2,7 @@
namespace evaisse\SimpleHttpBundle\Twig;
+use evaisse\SimpleHttpBundle\Service\ReplayRequestSignature;
use Symfony\Component\BrowserKit\Exception\JsonException;
use Symfony\Component\HttpFoundation\Response;
use Twig\Error\LoaderError;
@@ -12,7 +13,10 @@
class Extension extends AbstractExtension
{
- public function __construct(protected LoaderInterface $loader)
+ public function __construct(
+ protected LoaderInterface $loader,
+ private ?ReplayRequestSignature $replayRequestSignature = null
+ )
{
}
@@ -43,6 +47,7 @@ public function getFunctions(): array
return [
new TwigFunction('simple_http_decode_body', array($this, 'decodeBody'), $safe),
+ new TwigFunction('simple_http_replay_token', array($this, 'buildReplayToken')),
];
}
@@ -253,4 +258,13 @@ public function decodeBody(array $response): array
return [];
}
+
+ public function buildReplayToken(string $token, int $callIndex): string
+ {
+ if (!$this->replayRequestSignature) {
+ return '';
+ }
+
+ return $this->replayRequestSignature->generate($token, $callIndex);
+ }
}
diff --git a/composer.json b/composer.json
index 299d3f2..a184285 100644
--- a/composer.json
+++ b/composer.json
@@ -12,18 +12,20 @@
"client"
],
"homepage": "https://github.com/evaisse/SimpleHttpBundle",
- "require": {
- "php": "^8.0",
- "react/promise": "^2.2 || ^3.0",
- "symfony/http-foundation": "^5.4 || ^6.0",
- "symfony/browser-kit": "^5.4 || ^6.0",
- "symfony/event-dispatcher": "^5.4 || ^6.0",
+ "require": {
+ "php": "^8.1",
+ "react/promise": "^2.2 || ^3.0",
+ "twig/twig": "^3.27",
+ "symfony/http-foundation": "^5.4 || ^6.0",
+ "symfony/browser-kit": "^5.4 || ^6.0",
+ "symfony/event-dispatcher": "^5.4 || ^6.0",
"symfony/serializer": "^5.4 || ^6.0",
"symfony/http-kernel": "^5.4 || ^6.0",
"symfony/stopwatch": "^5.4 || ^6.0",
"symfony/routing": "^5.4 || ^6.0",
"symfony/config": "^5.4 || ^6.0",
"symfony/dependency-injection": "^5.4 || ^6.0",
+ "symfony/security-csrf": "^5.4 || ^6.0",
"symfony/security-http": "^5.4 || ^6.0",
"symfony/twig-bundle": "^5.4 || ^6.0",
"symfony/mime": "^5.4 || ^6.0",