[HttpFoundation] fix parsing some special chars with HeaderUtils::parseQuery()

nicolas-grekas · nicolas-grekas · commit ffeac0681377 · 2020-12-07T13:06:47.000+01:00
diff --git a/HeaderUtils.php b/HeaderUtils.php
@@ -228,7 +228,7 @@ public static function parseQuery(string $query, bool $ignoreBrackets = false, s
             if (false === $i = strpos($k, '[')) {
                 $q[] = bin2hex($k).$v;
             } else {
-                $q[] = substr_replace($k, bin2hex(substr($k, 0, $i)), 0, $i).$v;
+                $q[] = bin2hex(substr($k, 0, $i)).rawurlencode(substr($k, $i)).$v;
             }
         }
 
diff --git a/Tests/HeaderUtilsTest.php b/Tests/HeaderUtilsTest.php
@@ -151,6 +151,7 @@ public function provideParseQuery()
             ['a[b]=c', 'a%5Bb%5D=c'],
             ['a[b][c.d]=c', 'a%5Bb%5D%5Bc.d%5D=c'],
             ['a%5Bb%5D=c'],
+            ['f[%2525][%26][%3D][p.c]=d', 'f%5B%2525%5D%5B%26%5D%5B%3D%5D%5Bp.c%5D=d'],
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ public static function parseQuery(string $query, bool $ignoreBrackets = false, s`
`228`	`228`	`if (false === $i = strpos($k, '[')) {`
`229`	`229`	`$q[] = bin2hex($k).$v;`
`230`	`230`	`} else {`
`231`		`- $q[] = substr_replace($k, bin2hex(substr($k, 0, $i)), 0, $i).$v;`
	`231`	`+ $q[] = bin2hex(substr($k, 0, $i)).rawurlencode(substr($k, $i)).$v;`
`232`	`232`	`}`
`233`	`233`	`}`
`234`	`234`
Original file line number	Diff line number	Diff line change
`@@ -151,6 +151,7 @@ public function provideParseQuery()`
`151`	`151`	`['a[b]=c', 'a%5Bb%5D=c'],`
`152`	`152`	`['a[b][c.d]=c', 'a%5Bb%5D%5Bc.d%5D=c'],`
`153`	`153`	`['a%5Bb%5D=c'],`
	`154`	`+ ['f[%2525][%26][%3D][p.c]=d', 'f%5B%2525%5D%5B%26%5D%5B%3D%5D%5Bp.c%5D=d'],`
`154`	`155`	`];`
`155`	`156`	`}`
`156`	`157`