bug #54910 [HttpFoundation] filter out empty HTTP header parts (xabbuh)

nicolas-grekas · nicolas-grekas · commit 53be8698f1ac · 2024-05-15T16:55:32.000+02:00
This PR was merged into the 5.4 branch.

Discussion
----------

[HttpFoundation]  filter out empty HTTP header parts

| Q             | A
| ------------- | ---
| Branch?       | 5.4
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Issues        | Fix #54868
| License       | MIT

Commits
-------

7d6d8cd97f filter out empty HTTP header parts
diff --git a/HeaderUtils.php b/HeaderUtils.php
@@ -286,7 +286,11 @@ private static function groupParts(array $matches, string $separators, bool $fir
         }
 
         foreach ($partMatches as $matches) {
-            $parts[] = '' === $separators ? self::unquote($matches[0][0]) : self::groupParts($matches, $separators, false);
+            if ('' === $separators && '' !== $unquoted = self::unquote($matches[0][0])) {
+                $parts[] = $unquoted;
+            } elseif ($groupedParts = self::groupParts($matches, $separators, false)) {
+                $parts[] = $groupedParts;
+            }
         }
 
         return $parts;
diff --git a/Tests/AcceptHeaderTest.php b/Tests/AcceptHeaderTest.php
@@ -41,6 +41,8 @@ public static function provideFromStringData()
     {
         return [
             ['', []],
+            [';;;', []],
+            ['0', [new AcceptHeaderItem('0')]],
             ['gzip', [new AcceptHeaderItem('gzip')]],
             ['gzip,deflate,sdch', [new AcceptHeaderItem('gzip'), new AcceptHeaderItem('deflate'), new AcceptHeaderItem('sdch')]],
             ["gzip, deflate\t,sdch", [new AcceptHeaderItem('gzip'), new AcceptHeaderItem('deflate'), new AcceptHeaderItem('sdch')]],

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,11 @@ private static function groupParts(array $matches, string $separators, bool $fir`
`286`	`286`	`}`
`287`	`287`
`288`	`288`	`foreach ($partMatches as $matches) {`
`289`		`- $parts[] = '' === $separators ? self::unquote($matches[0][0]) : self::groupParts($matches, $separators, false);`
	`289`	`+ if ('' === $separators && '' !== $unquoted = self::unquote($matches[0][0])) {`
	`290`	`+ $parts[] = $unquoted;`
	`291`	`+ } elseif ($groupedParts = self::groupParts($matches, $separators, false)) {`
	`292`	`+ $parts[] = $groupedParts;`
	`293`	`+ }`
`290`	`294`	`}`
`291`	`295`
`292`	`296`	`return $parts;`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,8 @@ public static function provideFromStringData()`
`41`	`41`	`{`
`42`	`42`	`return [`
`43`	`43`	`['', []],`
	`44`	`+ [';;;', []],`
	`45`	`+ ['0', [new AcceptHeaderItem('0')]],`
`44`	`46`	`['gzip', [new AcceptHeaderItem('gzip')]],`
`45`	`47`	`['gzip,deflate,sdch', [new AcceptHeaderItem('gzip'), new AcceptHeaderItem('deflate'), new AcceptHeaderItem('sdch')]],`
`46`	`48`	`["gzip, deflate\t,sdch", [new AcceptHeaderItem('gzip'), new AcceptHeaderItem('deflate'), new AcceptHeaderItem('sdch')]],`