[SecurityBundle] Do not replace authenticators service by their traceable version

MatTheCat · MatTheCat · commit ffbd82c4a545 · 2024-12-27T17:39:37.000+01:00
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -643,11 +643,13 @@ private function createAuthenticationListeners(ContainerBuilder $container, stri
         }
 
         if ($container->hasDefinition('debug.security.firewall')) {
-            foreach ($authenticationProviders as $authenticatorId) {
-                $container->register('debug.'.$authenticatorId, TraceableAuthenticator::class)
-                    ->setDecoratedService($authenticatorId)
-                    ->setArguments([new Reference('debug.'.$authenticatorId.'.inner')])
+            foreach ($authenticationProviders as &$authenticatorId) {
+                $traceableId = 'debug.'.$authenticatorId;
+                $container
+                    ->register($traceableId, TraceableAuthenticator::class)
+                    ->setArguments([new Reference($authenticatorId)])
                 ;
+                $authenticatorId = $traceableId;
             }
         }
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
@@ -20,7 +20,9 @@
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\Compiler\DecoratorServicePass;
 use Symfony\Component\DependencyInjection\Compiler\ResolveChildDefinitionsPass;
+use Symfony\Component\DependencyInjection\Compiler\ResolveReferencesToAliasesPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\ExpressionLanguage\Expression;
@@ -900,6 +902,25 @@ public function testCustomHasherWithMigrateFrom()
         ]);
     }
 
+    public function testAuthenticatorsStillExistAfterBeingDecorated()
+    {
+        $container = $this->getRawContainer();
+        $container->setParameter('kernel.debug', true);
+        $container->getCompilerPassConfig()->setOptimizationPasses([
+            new ResolveChildDefinitionsPass(),
+            new DecoratorServicePass(),
+            new ResolveReferencesToAliasesPass(),
+        ]);
+
+        $container->register(TestAuthenticator::class);
+        $container->loadFromExtension('security', [
+            'firewalls' => ['main' => ['custom_authenticator' => TestAuthenticator::class]],
+        ]);
+        $container->compile();
+
+        $this->assertTrue($container->hasDefinition(TestAuthenticator::class));
+    }
+
     protected function getRawContainer()
     {
         $container = new ContainerBuilder();

Original file line number	Diff line number	Diff line change
`@@ -643,11 +643,13 @@ private function createAuthenticationListeners(ContainerBuilder $container, stri`
`643`	`643`	`}`
`644`	`644`
`645`	`645`	`if ($container->hasDefinition('debug.security.firewall')) {`
`646`		`- foreach ($authenticationProviders as $authenticatorId) {`
`647`		`- $container->register('debug.'.$authenticatorId, TraceableAuthenticator::class)`
`648`		`- ->setDecoratedService($authenticatorId)`
`649`		`- ->setArguments([new Reference('debug.'.$authenticatorId.'.inner')])`
	`646`	`+ foreach ($authenticationProviders as &$authenticatorId) {`
	`647`	`+ $traceableId = 'debug.'.$authenticatorId;`
	`648`	`+ $container`
	`649`	`+ ->register($traceableId, TraceableAuthenticator::class)`
	`650`	`+ ->setArguments([new Reference($authenticatorId)])`
`650`	`651`	`;`
	`652`	`+ $authenticatorId = $traceableId;`
`651`	`653`	`}`
`652`	`654`	`}`
`653`	`655`