[SecurityBundle] Dont throw if "security.http_utils" is not found

nicolas-grekas · nicolas-grekas · commit db88330448f1 · 2018-06-25T11:35:14.000+02:00
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSessionDomainConstraintPass.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSessionDomainConstraintPass.php
@@ -26,15 +26,14 @@ class AddSessionDomainConstraintPass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container)
     {
-        if (!$container->hasParameter('session.storage.options')) {
+        if (!$container->hasParameter('session.storage.options') || !$container->has('security.http_utils')) {
             return;
         }
 
         $sessionOptions = $container->getParameter('session.storage.options');
         $domainRegexp = empty($sessionOptions['cookie_domain']) ? '%s' : sprintf('(?:%%s|(?:.+\.)?%s)', preg_quote(trim($sessionOptions['cookie_domain'], '.')));
         $domainRegexp = (empty($sessionOptions['cookie_secure']) ? 'https?://' : 'https://').$domainRegexp;
 
-        // if the service doesn't exist, an exception must be thrown - ignoring would put security at risk
         $container->findDefinition('security.http_utils')->addArgument(sprintf('{^%s$}i', $domainRegexp));
     }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/AddSessionDomainConstraintPassTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/AddSessionDomainConstraintPassTest.php
@@ -96,19 +96,6 @@ public function testNoSession()
         $this->assertTrue($utils->createRedirectResponse($request, 'http://pirate.com/foo')->isRedirect('http://pirate.com/foo'));
     }
 
-    /**
-     * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException
-     * @expectedExceptionMessage You have requested a non-existent service "security.http_utils".
-     */
-    public function testNoHttpUtils()
-    {
-        $container = new ContainerBuilder();
-        $container->setParameter('session.storage.options', array());
-
-        $pass = new AddSessionDomainConstraintPass();
-        $pass->process($container);
-    }
-
     private function createContainer($sessionStorageOptions)
     {
         $container = new ContainerBuilder();

Original file line number	Diff line number	Diff line change
`@@ -26,15 +26,14 @@ class AddSessionDomainConstraintPass implements CompilerPassInterface`
`26`	`26`	`*/`
`27`	`27`	`public function process(ContainerBuilder $container)`
`28`	`28`	`{`
`29`		`- if (!$container->hasParameter('session.storage.options')) {`
	`29`	`+ if (!$container->hasParameter('session.storage.options') \|\| !$container->has('security.http_utils')) {`
`30`	`30`	`return;`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`$sessionOptions = $container->getParameter('session.storage.options');`
`34`	`34`	`$domainRegexp = empty($sessionOptions['cookie_domain']) ? '%s' : sprintf('(?:%%s\|(?:.+\.)?%s)', preg_quote(trim($sessionOptions['cookie_domain'], '.')));`
`35`	`35`	`$domainRegexp = (empty($sessionOptions['cookie_secure']) ? 'https?://' : 'https://').$domainRegexp;`
`36`	`36`
`37`		`- // if the service doesn't exist, an exception must be thrown - ignoring would put security at risk`
`38`	`37`	`$container->findDefinition('security.http_utils')->addArgument(sprintf('{^%s$}i', $domainRegexp));`
`39`	`38`	`}`
`40`	`39`	`}`