bug #34786 [SecurityBundle] Use config variable in AnonymousFactory (martijnboers)

Robin Chalas · Robin Chalas · commit 120f32c3c411 · 2019-12-03T21:44:39.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [SecurityBundle] Use config variable in AnonymousFactory | Q | A | ------------- | --- | Branch? | 4.4 and 5.0 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT It looks like the `AnonymousFactory` was copied incorrectly in #33503 as it uses the old `$firewall` variable available in `SecurityExtension.php`. Changing this to `$config` yields the desired results Commits ------- 8d850d2 When set, get secret from config variable
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AnonymousFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AnonymousFactory.php
@@ -24,19 +24,19 @@ class AnonymousFactory implements SecurityFactoryInterface
     public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint)
     {
         if (null === $config['secret']) {
-            $firewall['anonymous']['secret'] = new Parameter('container.build_hash');
+            $config['secret'] = new Parameter('container.build_hash');
         }
 
         $listenerId = 'security.authentication.listener.anonymous.'.$id;
         $container
             ->setDefinition($listenerId, new ChildDefinition('security.authentication.listener.anonymous'))
-            ->replaceArgument(1, $firewall['anonymous']['secret'])
+            ->replaceArgument(1, $config['secret'])
         ;
 
         $providerId = 'security.authentication.provider.anonymous.'.$id;
         $container
             ->setDefinition($providerId, new ChildDefinition('security.authentication.provider.anonymous'))
-            ->replaceArgument(0, $firewall['anonymous']['secret'])
+            ->replaceArgument(0, $config['secret'])
         ;
 
         return [$providerId, $listenerId, $defaultEntryPoint];

Original file line number	Diff line number	Diff line change
`@@ -24,19 +24,19 @@ class AnonymousFactory implements SecurityFactoryInterface`
`24`	`24`	`public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint)`
`25`	`25`	`{`
`26`	`26`	`if (null === $config['secret']) {`
`27`		`- $firewall['anonymous']['secret'] = new Parameter('container.build_hash');`
	`27`	`+ $config['secret'] = new Parameter('container.build_hash');`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`$listenerId = 'security.authentication.listener.anonymous.'.$id;`
`31`	`31`	`$container`
`32`	`32`	`->setDefinition($listenerId, new ChildDefinition('security.authentication.listener.anonymous'))`
`33`		`- ->replaceArgument(1, $firewall['anonymous']['secret'])`
	`33`	`+ ->replaceArgument(1, $config['secret'])`
`34`	`34`	`;`
`35`	`35`
`36`	`36`	`$providerId = 'security.authentication.provider.anonymous.'.$id;`
`37`	`37`	`$container`
`38`	`38`	`->setDefinition($providerId, new ChildDefinition('security.authentication.provider.anonymous'))`
`39`		`- ->replaceArgument(0, $firewall['anonymous']['secret'])`
	`39`	`+ ->replaceArgument(0, $config['secret'])`
`40`	`40`	`;`
`41`	`41`
`42`	`42`	`return [$providerId, $listenerId, $defaultEntryPoint];`