merged branch fabpot/hinclude-signer (PR #8960)

fabpot · fabpot · commit d4236ca8ac59 · 2013-09-08T09:34:37.000+02:00
This PR was merged into the 2.2 branch. Discussion ---------- [HttpKernel] fix HInclude src (closes #8951) | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #8951 | License | MIT | Doc PR | n/a fixes a regression introduced in #8879 Commits ------- 49f5027 [HttpKernel] fixer HInclude src (closes #8951)
diff --git a/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php
@@ -80,7 +80,8 @@ public function render($uri, Request $request, array $options = array())
                 throw new \LogicException('You must use a proper URI when using the Hinclude rendering strategy or set a URL signer.');
             }
 
-            $uri = $this->signer->sign($this->generateFragmentUri($uri, $request));
+            // we need to sign the absolute URI, but want to return the path only.
+            $uri = str_replace($request->getSchemeAndHttpHost(), '', $this->signer->sign($this->generateFragmentUri($uri, $request, true)));
         }
 
         // We need to replace ampersands in the URI with the encoded form in order to return valid html/xml content.
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/HIncludeFragmentRendererTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/HIncludeFragmentRendererTest.php
@@ -38,7 +38,7 @@ public function testRenderWithControllerAndSigner()
     {
         $strategy = new HIncludeFragmentRenderer(null, new UriSigner('foo'));
 
-        $this->assertEquals('<hx:include src="/_fragment?_path=_format%3Dhtml%26_locale%3Den%26_controller%3Dmain_controller&amp;_hash=5RZ1IkwF487EaXt6buHka73CCtQ%3D"></hx:include>', $strategy->render(new ControllerReference('main_controller', array(), array()), Request::create('/'))->getContent());
+        $this->assertEquals('<hx:include src="/_fragment?_path=_format%3Dhtml%26_locale%3Den%26_controller%3Dmain_controller&amp;_hash=g4b3vtCnhkZBFKrciEFwG7fucVo%3D"></hx:include>', $strategy->render(new ControllerReference('main_controller', array(), array()), Request::create('/'))->getContent());
     }
 
     public function testRenderWithUri()

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,8 @@ public function render($uri, Request $request, array $options = array())`
`80`	`80`	`throw new \LogicException('You must use a proper URI when using the Hinclude rendering strategy or set a URL signer.');`
`81`	`81`	`}`
`82`	`82`
`83`		`- $uri = $this->signer->sign($this->generateFragmentUri($uri, $request));`
	`83`	`+ // we need to sign the absolute URI, but want to return the path only.`
	`84`	`+ $uri = str_replace($request->getSchemeAndHttpHost(), '', $this->signer->sign($this->generateFragmentUri($uri, $request, true)));`
`84`	`85`	`}`
`85`	`86`
`86`	`87`	`// We need to replace ampersands in the URI with the encoded form in order to return valid html/xml content.`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public function testRenderWithControllerAndSigner()`
`38`	`38`	`{`
`39`	`39`	`$strategy = new HIncludeFragmentRenderer(null, new UriSigner('foo'));`
`40`	`40`
`41`		`- $this->assertEquals('<hx:include src="https://github.com/_fragment?_path=_format%3Dhtml%26_locale%3Den%26_controller%3Dmain_controller&_hash=5RZ1IkwF487EaXt6buHka73CCtQ%3D"></hx:include>', $strategy->render(new ControllerReference('main_controller', array(), array()), Request::create('/'))->getContent());`
	`41`	`+ $this->assertEquals('<hx:include src="https://github.com/_fragment?_path=_format%3Dhtml%26_locale%3Den%26_controller%3Dmain_controller&_hash=g4b3vtCnhkZBFKrciEFwG7fucVo%3D"></hx:include>', $strategy->render(new ControllerReference('main_controller', array(), array()), Request::create('/'))->getContent());`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`public function testRenderWithUri()`