merged branch Tobion/fix-double-encoding (PR symfony#6363)

fabpot · fabpot · commit d90e55cbb3cf · 2012-12-20T08:11:40.000+01:00
This PR was merged into the 2.0 branch. Commits ------- 8b2c17f fix double-decoding in the routing system Discussion ---------- fix double-decoding in the routing system @fabpot @vicb This should fix it. You know what ;) Don't want to leak more information. And the good thing, it's no hack nor does it break BC.
diff --git a/src/Symfony/Bundle/FrameworkBundle/EventListener/RouterListener.php b/src/Symfony/Bundle/FrameworkBundle/EventListener/RouterListener.php
@@ -70,7 +70,10 @@ public function onKernelRequest(GetResponseEvent $event)
 
         // add attributes based on the path info (routing)
         try {
-            $parameters = $this->router->match($request->getPathInfo());
+            // The path is returned in decoded form from the request, so we need to
+            // encode it again as the router applies its own decoding. This prevents
+            // double-decoding.
+            $parameters = $this->router->match(urlencode($request->getPathInfo()));
 
             if (null !== $this->logger) {
                 $this->logger->info(sprintf('Matched route "%s" (parameters: %s)', $parameters['_route'], $this->parametersToString($parameters)));
diff --git a/src/Symfony/Component/Security/Http/HttpUtils.php b/src/Symfony/Component/Security/Http/HttpUtils.php
@@ -107,7 +107,7 @@ public function checkRequestPath(Request $request, $path)
     {
         if ('/' !== $path[0]) {
             try {
-                $parameters = $this->router->match($request->getPathInfo());
+                $parameters = $this->router->match(urlencode($request->getPathInfo()));
 
                 return $path === $parameters['_route'];
             } catch (MethodNotAllowedException $e) {
@@ -129,7 +129,7 @@ private function resetLocale(Request $request)
         }
 
         try {
-            $parameters = $this->router->match($request->getPathInfo());
+            $parameters = $this->router->match(urlencode($request->getPathInfo()));
 
             if (isset($parameters['_locale'])) {
                 $context->setParameter('_locale', $parameters['_locale']);

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public function checkRequestPath(Request $request, $path)`
`107`	`107`	`{`
`108`	`108`	`if ('/' !== $path[0]) {`
`109`	`109`	`try {`
`110`		`- $parameters = $this->router->match($request->getPathInfo());`
	`110`	`+ $parameters = $this->router->match(urlencode($request->getPathInfo()));`
`111`	`111`
`112`	`112`	`return $path === $parameters['_route'];`
`113`	`113`	`} catch (MethodNotAllowedException $e) {`
`@@ -129,7 +129,7 @@ private function resetLocale(Request $request)`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`try {`
`132`		`- $parameters = $this->router->match($request->getPathInfo());`
	`132`	`+ $parameters = $this->router->match(urlencode($request->getPathInfo()));`
`133`	`133`
`134`	`134`	`if (isset($parameters['_locale'])) {`
`135`	`135`	`$context->setParameter('_locale', $parameters['_locale']);`