bug symfony#31475 [HttpFoundation] Allow set 'None' on samesite cookie flag (markitosgv)

nicolas-grekas · nicolas-grekas · commit 11f8a1e5c907 · 2019-05-11T11:52:36.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [HttpFoundation] Allow set 'None' on samesite cookie flag Allow set samesite cookie flag to 'None' value | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony#31467 | License | MIT Google introduces new Chrome policy, marking all none setted samesite flag to 'Strict' by default. If you want to allow third party cookies you must set samesite flag to None. This PR fixes symfony#31467, allow to put samesite Cookie flag to None. Commits ------- 8bac3d6 Allow set 'None' on samesite cookie flag
diff --git a/src/Symfony/Component/HttpFoundation/Cookie.php b/src/Symfony/Component/HttpFoundation/Cookie.php
@@ -28,6 +28,7 @@ class Cookie
     private $raw;
     private $sameSite;
 
+    const SAMESITE_NONE = 'none';
     const SAMESITE_LAX = 'lax';
     const SAMESITE_STRICT = 'strict';
 
@@ -128,7 +129,7 @@ public function __construct($name, $value = null, $expire = 0, $path = '/', $dom
             $sameSite = strtolower($sameSite);
         }
 
-        if (!\in_array($sameSite, [self::SAMESITE_LAX, self::SAMESITE_STRICT, null], true)) {
+        if (!\in_array($sameSite, [self::SAMESITE_LAX, self::SAMESITE_STRICT, self::SAMESITE_NONE, null], true)) {
             throw new \InvalidArgumentException('The "sameSite" parameter value is not valid.');
         }
 

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ class Cookie`
`28`	`28`	`private $raw;`
`29`	`29`	`private $sameSite;`
`30`	`30`
	`31`	`+ const SAMESITE_NONE = 'none';`
`31`	`32`	`const SAMESITE_LAX = 'lax';`
`32`	`33`	`const SAMESITE_STRICT = 'strict';`
`33`	`34`
`@@ -128,7 +129,7 @@ public function __construct($name, $value = null, $expire = 0, $path = '/', $dom`
`128`	`129`	`$sameSite = strtolower($sameSite);`
`129`	`130`	`}`
`130`	`131`
`131`		`- if (!\in_array($sameSite, [self::SAMESITE_LAX, self::SAMESITE_STRICT, null], true)) {`
	`132`	`+ if (!\in_array($sameSite, [self::SAMESITE_LAX, self::SAMESITE_STRICT, self::SAMESITE_NONE, null], true)) {`
`132`	`133`	`throw new \InvalidArgumentException('The "sameSite" parameter value is not valid.');`
`133`	`134`	`}`
`134`	`135`