bug #34759 [SecurityBundle] Fix switch_user provider configuration handling (fancyweb)

Robin Chalas · Robin Chalas · commit e1f7b7886efb · 2019-12-03T21:51:34.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [SecurityBundle] Fix switch_user provider configuration handling | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - The default provider here can be null if there are multiple configured providers configured + the firewall doesn't define its provider at the root level + it is anonymous, ie: ```yaml providers: my_provider: # ... monitor_provider: # ... firewalls: main: switch_user: provider: my_provider anonymous: true # ... ``` Commits ------- 417169b [SecurityBundle] Fix switch_user provider configuration handling
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -681,7 +681,7 @@ private function createExceptionListener(ContainerBuilder $container, array $con
         return $exceptionListenerId;
     }
 
-    private function createSwitchUserListener(ContainerBuilder $container, string $id, array $config, string $defaultProvider, bool $stateless): string
+    private function createSwitchUserListener(ContainerBuilder $container, string $id, array $config, ?string $defaultProvider, bool $stateless): string
     {
         $userProvider = isset($config['provider']) ? $this->getUserProviderId($config['provider']) : $defaultProvider;
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
@@ -390,6 +390,30 @@ public function sessionConfigurationProvider()
         ];
     }
 
+    public function testSwitchUserWithSeveralDefinedProvidersButNoFirewallRootProviderConfigured()
+    {
+        $container = $this->getRawContainer();
+        $container->loadFromExtension('security', [
+            'providers' => [
+                'first' => ['id' => 'foo'],
+                'second' => ['id' => 'bar'],
+            ],
+
+            'firewalls' => [
+                'foobar' => [
+                    'switch_user' => [
+                        'provider' => 'second',
+                    ],
+                    'anonymous' => true,
+                ],
+            ],
+        ]);
+
+        $container->compile();
+
+        $this->assertEquals(new Reference('security.user.provider.concrete.second'), $container->getDefinition('security.authentication.switchuser_listener.foobar')->getArgument(1));
+    }
+
     protected function getRawContainer()
     {
         $container = new ContainerBuilder();

Original file line number	Diff line number	Diff line change
`@@ -681,7 +681,7 @@ private function createExceptionListener(ContainerBuilder $container, array $con`
`681`	`681`	`return $exceptionListenerId;`
`682`	`682`	`}`
`683`	`683`
`684`		`- private function createSwitchUserListener(ContainerBuilder $container, string $id, array $config, string $defaultProvider, bool $stateless): string`
	`684`	`+ private function createSwitchUserListener(ContainerBuilder $container, string $id, array $config, ?string $defaultProvider, bool $stateless): string`
`685`	`685`	`{`
`686`	`686`	`$userProvider = isset($config['provider']) ? $this->getUserProviderId($config['provider']) : $defaultProvider;`
`687`	`687`