parse cookie values containing the equal sign

xabbuh · xabbuh · commit 276d2395154d · 2021-01-04T22:49:27.000+01:00
diff --git a/src/Symfony/Component/HttpFoundation/HeaderUtils.php b/src/Symfony/Component/HttpFoundation/HeaderUtils.php
@@ -193,7 +193,7 @@ public static function makeDisposition(string $disposition, string $filename, st
         return $disposition.'; '.self::toString($params, ';');
     }
 
-    private static function groupParts(array $matches, string $separators): array
+    private static function groupParts(array $matches, string $separators, bool $first = true): array
     {
         $separator = $separators[0];
         $partSeparators = substr($separators, 1);
@@ -211,12 +211,19 @@ private static function groupParts(array $matches, string $separators): array
         $parts = [];
         if ($partSeparators) {
             foreach ($partMatches as $matches) {
-                $parts[] = self::groupParts($matches, $partSeparators);
+                $parts[] = self::groupParts($matches, $partSeparators, false);
             }
         } else {
             foreach ($partMatches as $matches) {
                 $parts[] = self::unquote($matches[0][0]);
             }
+
+            if (!$first && 2 < count($parts)) {
+                $parts = [
+                    $parts[0],
+                    implode($separator, array_slice($parts, 1)),
+                ];
+            }
         }
 
         return $parts;
diff --git a/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php b/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php
@@ -227,6 +227,12 @@ public function testFromString()
 
         $cookie = Cookie::fromString('foo', true);
         $this->assertEquals(Cookie::create('foo', null, 0, '/', null, false, false, false, null), $cookie);
+
+        $cookie = Cookie::fromString('foo_cookie=foo=1&bar=2&baz=3; expires=Tue, 22-Sep-2020 06:27:09 GMT; path=/');
+        $this->assertEquals(Cookie::create('foo_cookie', 'foo=1&bar=2&baz=3', strtotime('Tue, 22-Sep-2020 06:27:09 GMT'), '/', null, false, false, true, null), $cookie);
+
+        $cookie = Cookie::fromString('foo_cookie=foo==; expires=Tue, 22-Sep-2020 06:27:09 GMT; path=/');
+        $this->assertEquals(Cookie::create('foo_cookie', 'foo==', strtotime('Tue, 22-Sep-2020 06:27:09 GMT'), '/', null, false, false, true, null), $cookie);
     }
 
     public function testFromStringWithHttpOnly()
diff --git a/src/Symfony/Component/HttpFoundation/Tests/HeaderUtilsTest.php b/src/Symfony/Component/HttpFoundation/Tests/HeaderUtilsTest.php
@@ -35,6 +35,8 @@ public function testSplit()
         $this->assertSame(['foo bar'], HeaderUtils::split('"foo" bar', ','));
         $this->assertSame(['foo bar'], HeaderUtils::split('"foo" "bar"', ','));
 
+        $this->assertSame([['foo_cookie', 'foo=1&bar=2&baz=3'], ['expires', 'Tue, 22-Sep-2020 06:27:09 GMT'], ['path', '/']], HeaderUtils::split('foo_cookie=foo=1&bar=2&baz=3; expires=Tue, 22-Sep-2020 06:27:09 GMT; path=/', ';='));
+
         // These are not a valid header values. We test that they parse anyway,
         // and that both the valid and invalid parts are returned.
         $this->assertSame([], HeaderUtils::split('', ','));

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ public static function makeDisposition(string $disposition, string $filename, st`
`193`	`193`	`return $disposition.'; '.self::toString($params, ';');`
`194`	`194`	`}`
`195`	`195`
`196`		`- private static function groupParts(array $matches, string $separators): array`
	`196`	`+ private static function groupParts(array $matches, string $separators, bool $first = true): array`
`197`	`197`	`{`
`198`	`198`	`$separator = $separators[0];`
`199`	`199`	`$partSeparators = substr($separators, 1);`
`@@ -211,12 +211,19 @@ private static function groupParts(array $matches, string $separators): array`
`211`	`211`	`$parts = [];`
`212`	`212`	`if ($partSeparators) {`
`213`	`213`	`foreach ($partMatches as $matches) {`
`214`		`- $parts[] = self::groupParts($matches, $partSeparators);`
	`214`	`+ $parts[] = self::groupParts($matches, $partSeparators, false);`
`215`	`215`	`}`
`216`	`216`	`} else {`
`217`	`217`	`foreach ($partMatches as $matches) {`
`218`	`218`	`$parts[] = self::unquote($matches[0][0]);`
`219`	`219`	`}`
	`220`	`+`
	`221`	`+ if (!$first && 2 < count($parts)) {`
	`222`	`+ $parts = [`
	`223`	`+ $parts[0],`
	`224`	`+ implode($separator, array_slice($parts, 1)),`
	`225`	`+ ];`
	`226`	`+ }`
`220`	`227`	`}`
`221`	`228`
`222`	`229`	`return $parts;`