[10.x] Cookies Having Independent Partitioned State (CHIPS) (#48745)

* [10.x] Cookies Having Independent Partitioned State (CHIPS) * Clean up cookie duplication * Bump components symfony/http-foundation version
laravel · Nov 30, 2023 · bd30b02 · bd30b02
1 parent 378e4b3
commit bd30b02
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -44,7 +44,7 @@
         "symfony/console": "^6.2",
         "symfony/error-handler": "^6.2",
         "symfony/finder": "^6.2",
-        "symfony/http-foundation": "^6.3",
+        "symfony/http-foundation": "^6.4",
         "symfony/http-kernel": "^6.2",
         "symfony/mailer": "^6.2",
         "symfony/mime": "^6.2",

diff --git a/src/Illuminate/Cookie/Middleware/EncryptCookies.php b/src/Illuminate/Cookie/Middleware/EncryptCookies.php
@@ -195,11 +195,7 @@ protected function encrypt(Response $response)
      */
     protected function duplicate(Cookie $cookie, $value)
     {
-        return new Cookie(
-            $cookie->getName(), $value, $cookie->getExpiresTime(),
-            $cookie->getPath(), $cookie->getDomain(), $cookie->isSecure(),
-            $cookie->isHttpOnly(), $cookie->isRaw(), $cookie->getSameSite()
-        );
+        return $cookie->withValue($value);
     }
 
     /**

diff --git a/src/Illuminate/Cookie/composer.json b/src/Illuminate/Cookie/composer.json
@@ -20,7 +20,7 @@
         "illuminate/contracts": "^10.0",
         "illuminate/macroable": "^10.0",
         "illuminate/support": "^10.0",
-        "symfony/http-foundation": "^6.2",
+        "symfony/http-foundation": "^6.4",
         "symfony/http-kernel": "^6.2"
     },
     "autoload": {

diff --git a/src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php b/src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php
@@ -211,7 +211,8 @@ protected function newCookie($request, $config)
             $config['secure'],
             false,
             false,
-            $config['same_site'] ?? null
+            $config['same_site'] ?? null,
+            $config['partitioned'] ?? false
         );
     }
 

diff --git a/src/Illuminate/Http/composer.json b/src/Illuminate/Http/composer.json
@@ -22,7 +22,7 @@
         "illuminate/macroable": "^10.0",
         "illuminate/session": "^10.0",
         "illuminate/support": "^10.0",
-        "symfony/http-foundation": "^6.2",
+        "symfony/http-foundation": "^6.4",
         "symfony/http-kernel": "^6.2",
         "symfony/mime": "^6.2"
     },

diff --git a/src/Illuminate/Routing/composer.json b/src/Illuminate/Routing/composer.json
@@ -25,7 +25,7 @@
         "illuminate/pipeline": "^10.0",
         "illuminate/session": "^10.0",
         "illuminate/support": "^10.0",
-        "symfony/http-foundation": "^6.2",
+        "symfony/http-foundation": "^6.4",
         "symfony/http-kernel": "^6.2",
         "symfony/routing": "^6.2"
     },

diff --git a/src/Illuminate/Session/Middleware/StartSession.php b/src/Illuminate/Session/Middleware/StartSession.php
@@ -219,9 +219,16 @@ protected function addCookieToResponse(Response $response, Session $session)
     {
         if ($this->sessionIsPersistent($config = $this->manager->getSessionConfig())) {
             $response->headers->setCookie(new Cookie(
-                $session->getName(), $session->getId(), $this->getCookieExpirationDate(),
-                $config['path'], $config['domain'], $config['secure'] ?? false,
-                $config['http_only'] ?? true, false, $config['same_site'] ?? null
+                $session->getName(),
+                $session->getId(),
+                $this->getCookieExpirationDate(),
+                $config['path'],
+                $config['domain'],
+                $config['secure'] ?? false,
+                $config['http_only'] ?? true,
+                false,
+                $config['same_site'] ?? null,
+                $config['partitioned'] ?? false
             ));
         }
     }

diff --git a/src/Illuminate/Session/composer.json b/src/Illuminate/Session/composer.json
@@ -22,7 +22,7 @@
         "illuminate/filesystem": "^10.0",
         "illuminate/support": "^10.0",
         "symfony/finder": "^6.2",
-        "symfony/http-foundation": "^6.2"
+        "symfony/http-foundation": "^6.4"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Illuminate/Testing/TestResponse.php b/src/Illuminate/Testing/TestResponse.php
@@ -498,7 +498,8 @@ public function getCookie($cookieName, $decrypt = true, $unserialize = false)
                     $cookie->isSecure(),
                     $cookie->isHttpOnly(),
                     $cookie->isRaw(),
-                    $cookie->getSameSite()
+                    $cookie->getSameSite(),
+                    $cookie->isPartitioned()
                 );
             }
         }

diff --git a/src/Illuminate/Validation/composer.json b/src/Illuminate/Validation/composer.json
@@ -25,7 +25,7 @@
         "illuminate/macroable": "^10.0",
         "illuminate/support": "^10.0",
         "illuminate/translation": "^10.0",
-        "symfony/http-foundation": "^6.2",
+        "symfony/http-foundation": "^6.4",
         "symfony/mime": "^6.2"
     },
     "autoload": {