Work around the missing DateTimeInterface|string types on setCookie()…

…'s $expire param Could be reverted if this PR is merged and released nette/http#237
spaze · Mar 30, 2024 · 0a8a273 · 0a8a273
1 parent 2725bcf
commit 0a8a273
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/site/app/EasterEgg/CrLfUrlInjections.php b/site/app/EasterEgg/CrLfUrlInjections.php
@@ -3,7 +3,6 @@
 
 namespace MichalSpacekCz\EasterEgg;
 
-use DateTimeImmutable;
 use Nette\Http\IRequest;
 use Nette\Http\IResponse;
 use Nette\Utils\Strings;
@@ -33,8 +32,8 @@ public function detectAttempt(): bool
 			$this->httpResponse->setCookie(
 				self::COOKIE_NAME,
 				$match[1],
-				new DateTimeImmutable('-3 years 1 month 3 days 3 hours 7 minutes'),
-				'/expired=3years/1month/3days/3hours/7minutes/ago',
+				time() - 31337 * 1337,
+				'/expired=31337*1337seconds/(1.3years)/ago',
 			);
 		}
 		$this->httpResponse->setCode(IResponse::S204_NoContent, 'U WOT M8');

diff --git a/site/app/Http/Cookies/Cookies.php b/site/app/Http/Cookies/Cookies.php
@@ -7,6 +7,7 @@
 use Nette\Http\IRequest;
 use Nette\Http\IResponse;
 use Nette\Http\Response;
+use Nette\Utils\DateTime;
 
 readonly class Cookies
 {
@@ -40,7 +41,7 @@ public function set(
 	): void {
 		/** @var Response $response Not IResponse because https://github.com/nette/http/issues/200, can't use instanceof check because it's a different Response in tests */
 		$response = $this->response;
-		$response->setCookie($name->value, $value, $expire, $path, $domain, $secure, $httpOnly, $sameSite);
+		$response->setCookie($name->value, $value, (int)DateTime::from($expire)->format('U'), $path, $domain, $secure, $httpOnly, $sameSite);
 	}
 
 

diff --git a/site/app/Test/Http/Response.php b/site/app/Test/Http/Response.php
@@ -3,6 +3,7 @@
 
 namespace MichalSpacekCz\Test\Http;
 
+use DateTimeInterface;
 use Nette\Http\IResponse;
 use Override;
 
@@ -142,8 +143,16 @@ public function deleteHeader(string $name): self
 
 
 	#[Override]
-	public function setCookie(string $name, string $value, $expire, string $path = null, string $domain = null, bool $secure = null, bool $httpOnly = null, string $sameSite = null): self
-	{
+	public function setCookie(
+		string $name,
+		string $value,
+		string|int|DateTimeInterface|null $expire,
+		string $path = null,
+		string $domain = null,
+		bool $secure = null,
+		bool $httpOnly = null,
+		string $sameSite = null,
+	): self {
 		$this->cookies[$name][] = new Cookie(
 			$name,
 			$value,