[SecurityBundle] Fix valid provider considered undefined

Robin Chalas · Robin Chalas · commit c924b6117e57 · 2017-09-07T21:42:30.000+02:00
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -331,10 +331,10 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
 
         // Provider id (take the first registered provider if none defined)
         if (isset($firewall['provider'])) {
-            $defaultProvider = $this->getUserProviderId($firewall['provider']);
-            if (!in_array($defaultProvider, $providerIds, true)) {
+            if (!$this->isValidProviderName($firewall['provider'], $providerIds)) {
                 throw new InvalidConfigurationException(sprintf('Invalid firewall "%s": user provider "%s" not found.', $id, $firewall['provider']));
             }
+            $defaultProvider = $providerIds[$firewall]['provider'];
         } else {
             $defaultProvider = reset($providerIds);
         }
@@ -491,10 +491,10 @@ private function createAuthenticationListeners($container, $id, $firewall, &$aut
 
                 if (isset($firewall[$key])) {
                     if (isset($firewall[$key]['provider'])) {
-                        if (!in_array($firewall[$key]['provider'], $providerIds, true)) {
+                        if (!$this->isValidProviderName($firewall[$key]['provider'], $providerIds)) {
                             throw new InvalidConfigurationException(sprintf('Invalid firewall "%s": user provider "%s" not found.', $id, $firewall[$key]['provider']));
                         }
-                        $userProvider = $this->getUserProviderId($firewall[$key]['provider']);
+                        $userProvider = $providerIds[$firewall[$key]['provider']];
                     } else {
                         $userProvider = $defaultProvider;
                     }
@@ -596,7 +596,7 @@ private function createUserProviders($config, ContainerBuilder $container)
         $providerIds = array();
         foreach ($config['providers'] as $name => $provider) {
             $id = $this->createUserDaoProvider($name, $provider, $container);
-            $providerIds[] = $id;
+            $providerIds[$name] = $id;
         }
 
         return $providerIds;
@@ -647,6 +647,11 @@ private function getUserProviderId($name)
         return 'security.user.provider.concrete.'.strtolower($name);
     }
 
+    private function isValidProviderName($providerName, array $allowedProviders)
+    {
+        return isset($allowedProviders[$providerName]) || isset($allowedProviders[str_replace('-', '_', $providerName)]);
+    }
+
     private function createExceptionListener($container, $config, $id, $defaultEntryPoint, $stateless)
     {
         $exceptionListenerId = 'security.exception_listener.'.$id;
