fix: validation referer (#511)

Author: brendt

src/Tempest/Debug/src/Debug.php

@@ -82,14 +82,27 @@ private function writeToOut(array $items, string $callPath): void
                 $output = $this->createDump($item);
 
                 fwrite(STDOUT, $output);
+
+                fwrite(STDOUT, $callPath . PHP_EOL);
             } else {
+                echo sprintf(
+                    '<span style="
+                    display:inline-block; 
+                    color: #fff; 
+                    font-family: %s;
+                    padding: 2px 4px;
+                    font-size: 0.8rem;
+                    margin-bottom: -12px;
+                    background: #0071BC;"
+                >%s (%s)</span>',
+                    'Source Code Pro, ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace',
+                    $key,
+                    $callPath,
+                );
+
                 VarDumper::dump($item);
             }
         }
-
-        if (defined('STDOUT')) {
-            fwrite(STDOUT, $callPath . PHP_EOL);
-        }
     }
 
     private function createDump(mixed $input): string

src/Tempest/Http/src/HttpApplication.php

@@ -10,6 +10,7 @@
 use Tempest\Core\Kernel;
 use Tempest\Core\Tempest;
 use function Tempest\env;
+use Tempest\Http\Session\Session;
 use Tempest\Log\Channels\AppendLogChannel;
 use Tempest\Log\LogConfig;
 use Tempest\Support\PathHelper;
@@ -57,6 +58,8 @@ public function run(): void
             $responseSender->send(
                 $router->dispatch($psrRequest),
             );
+
+            $this->container->get(Session::class)->cleanup();
         } catch (Throwable $throwable) {
             foreach ($this->container->get(AppConfig::class)->exceptionHandlers as $exceptionHandler) {
                 $exceptionHandler->handle($throwable);

src/Tempest/Http/src/Responses/Invalid.php

@@ -4,6 +4,7 @@
 
 namespace Tempest\Http\Responses;
 
+use Exception;
 use Psr\Http\Message\ServerRequestInterface as PsrRequest;
 use Tempest\Http\IsResponse;
 use Tempest\Http\Request;
@@ -20,10 +21,10 @@ public function __construct(
         /** @var \Tempest\Validation\Rule[][] $failingRules */
         array $failingRules = [],
     ) {
-        $uri = $request instanceof PsrRequest ? (string)$request->getUri() : $request->getUri();
+        $referer = $request->getHeader('referer')[0] ?? throw new Exception("No referer found, could not redirect (this shouldn't happen, please create a bug report)");
         $body = $request instanceof PsrRequest ? $request->getParsedBody() : $request->getBody();
 
-        $this->addHeader('Location', $uri);
+        $this->addHeader('Location', $referer);
         $this->status = Status::FOUND;
         $this->flash(Session::VALIDATION_ERRORS, $failingRules);
         $this->flash(Session::ORIGINAL_VALUES, $body);

src/Tempest/Http/src/RouterInitializer.php

@@ -8,7 +8,6 @@
 use Tempest\Container\Initializer;
 use Tempest\Container\Singleton;
 use Tempest\Http\Cookie\SetCookieMiddleware;
-use Tempest\Http\Session\SessionMiddleware;
 
 final readonly class RouterInitializer implements Initializer
 {
@@ -18,7 +17,6 @@ public function initialize(Container $container): Router
         $router = $container->get(GenericRouter::class);
 
         $router->addMiddleware(SetCookieMiddleware::class);
-        $router->addMiddleware(SessionMiddleware::class);
 
         return $router;
     }

src/Tempest/Http/src/Session/Session.php

@@ -40,7 +40,7 @@ public function get(string $key, mixed $default = null): mixed
         $value = $this->getSessionManager()->get($this->id, $key, $default);
 
         if ($value instanceof FlashValue) {
-            $this->expiredKeys[] = $key;
+            $this->expiredKeys[$key] = $key;
             $value = $value->value;
         }
 

src/Tempest/Http/src/Session/SessionInitializer.php

@@ -6,9 +6,11 @@
 
 use Tempest\Container\Container;
 use Tempest\Container\Initializer;
+use Tempest\Container\Singleton;
 
 final readonly class SessionInitializer implements Initializer
 {
+    #[Singleton]
     public function initialize(Container $container): Session
     {
         $sessionManager = $container->get(SessionManager::class);

src/Tempest/Http/src/Session/SessionMiddleware.php

@@ -16,10 +16,10 @@
     #[Get('/form')]
     public function index(): View
     {
-        return view('Modules/Form/form.view.php');
+        return view(__DIR__ . '/../../Modules/Form/form.view.php');
     }
 
-    #[Post('/form')]
+    #[Post('/form/store')]
     public function store(FormRequest $request): Response
     {
         return new Ok('Ok!');

tests/Fixtures/Modules/Form/FormController.php

@@ -4,6 +4,7 @@
 
 namespace Tests\Tempest\Integration\Http\Responses;
 
+use Psr\Http\Message\ServerRequestInterface as PsrRequest;
 use Tempest\Http\GenericRequest;
 use Tempest\Http\Mappers\RequestToPsrRequestMapper;
 use Tempest\Http\Method;
@@ -21,7 +22,9 @@ final class InvalidTest extends FrameworkIntegrationTestCase
 {
     public function test_invalid(): void
     {
+        /** @var PsrRequest $request */
         $request = map(new GenericRequest(Method::GET, '/original', ['foo' => 'bar']))->with(RequestToPsrRequestMapper::class);
+        $request = $request->withHeader('Referer', '/original');
 
         $response = new Invalid(
             $request,

tests/Integration/Http/Responses/InvalidTest.php

@@ -29,11 +29,6 @@ public function test_resolving_session_from_cookie(): void
         $sessionA = $this->container->get(Session::class);
         $sessionA->set('test', 'a');
 
-        $cookieManager->set('tempest_session_id', 'session_b');
-        $sessionB = $this->container->get(Session::class);
-        $this->assertNull($sessionB->get('test'));
-
-        $cookieManager->set('tempest_session_id', 'session_a');
         $sessionA = $this->container->get(Session::class);
         $this->assertEquals('a', $sessionA->get('test'));
     }