bug #34915 [FrameworkBundle] Fix invalid Windows path normalization in TemplateNameParser (mvorisek)

fabpot · fabpot · commit 00c775e2715b · 2019-12-15T14:43:43.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [FrameworkBundle] Fix invalid Windows path normalization in TemplateNameParser | Q | A | ------------- | --- | Branch? | 3.4 - <5.0 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | no | License | MIT | Doc PR | Fix invalid Windows path normalization All versions of Symfony until 5.0 (which does no longer do extra file path normalization) normalize Windows paths wrongly. See PrestaShop/PrestaShop#16736 and https://bugs.php.net/bug.php?id=78939 Currently this issue can be observed when Symfony is run by NTS PHP only, but once the PHP issue will be fixed, this issue will probably affects all Windows users when absolute template name is passed to Symfony templating. Commits ------- 130df8c Fix invalid Windows path normalization
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/TemplateNameParser.php b/src/Symfony/Bundle/FrameworkBundle/Templating/TemplateNameParser.php
@@ -44,7 +44,7 @@ public function parse($name)
         }
 
         // normalize name
-        $name = str_replace(':/', ':', preg_replace('#/{2,}#', '/', str_replace('\\', '/', $name)));
+        $name = preg_replace('#/{2,}#', '/', str_replace('\\', '/', $name));
 
         if (false !== strpos($name, '..')) {
             throw new \RuntimeException(sprintf('Template name "%s" contains invalid characters.', $name));
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateNameParserTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateNameParserTest.php
@@ -98,8 +98,8 @@ public function provideAbsolutePaths()
     {
         return [
             ['/path/to/section/index.html.php', '/path/to/section/index.html.php', '/path/to/section/index.html.php', new BaseTemplateReference('/path/to/section/index.html.php', 'php')],
-            ['C:\\path\\to\\section\\name.html.php', 'C:path/to/section/name.html.php', 'C:path/to/section/name.html.php', new BaseTemplateReference('C:path/to/section/name.html.php', 'php')],
-            ['C:\\path\\to\\section\\name:foo.html.php', 'C:path/to/section/name:foo.html.php', 'C:path/to/section/name:foo.html.php', new BaseTemplateReference('C:path/to/section/name:foo.html.php', 'php')],
+            ['C:\\path\\to\\section\\name.html.php', 'C:/path/to/section/name.html.php', 'C:/path/to/section/name.html.php', new BaseTemplateReference('C:/path/to/section/name.html.php', 'php')],
+            ['C:\\path\\to\\section\\name:foo.html.php', 'C:/path/to/section/name:foo.html.php', 'C:/path/to/section/name:foo.html.php', new BaseTemplateReference('C:/path/to/section/name:foo.html.php', 'php')],
             ['\\path\\to\\section\\name.html.php', '/path/to/section/name.html.php', '/path/to/section/name.html.php', new BaseTemplateReference('/path/to/section/name.html.php', 'php')],
             ['/path/to/section/name.php', '/path/to/section/name.php', '/path/to/section/name.php', new BaseTemplateReference('/path/to/section/name.php', 'php')],
         ];

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function parse($name)`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`// normalize name`
`47`		`- $name = str_replace(':/', ':', preg_replace('#/{2,}#', '/', str_replace('\\', '/', $name)));`
	`47`	`+ $name = preg_replace('#/{2,}#', '/', str_replace('\\', '/', $name));`
`48`	`48`
`49`	`49`	`if (false !== strpos($name, '..')) {`
`50`	`50`	`throw new \RuntimeException(sprintf('Template name "%s" contains invalid characters.', $name));`