bug #36650 [Security] Fix bug introduced in entry_point configuration (#36575) (wouterj)

fabpot · fabpot · commit c30d6f9e38b8 · 2020-05-01T09:57:08.000+02:00
This PR was merged into the 5.1-dev branch. Discussion ---------- [Security] Fix bug introduced in entry_point configuration (#36575) | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Commits ------- 6978471 Fixed #36575
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -560,14 +560,12 @@ private function createAuthenticationListeners(ContainerBuilder $container, stri
         if ($entryPoints) {
             // we can be sure the authenticator system is enabled
             if (null !== $defaultEntryPoint) {
-                return $entryPoints[$defaultEntryPoint] ?? $defaultEntryPoint;
-            }
-
-            if (1 === \count($entryPoints)) {
-                return current($entryPoints);
+                $defaultEntryPoint = $entryPoints[$defaultEntryPoint] ?? $defaultEntryPoint;
+            } elseif (1 === \count($entryPoints)) {
+                $defaultEntryPoint = current($entryPoints);
+            } else {
+                throw new InvalidConfigurationException(sprintf('Because you have multiple authenticators in firewall "%s", you need to set the "entry_point" key to one of your authenticators (%s) or a service ID implementing "%s". The "entry_point" determines what should happen (e.g. redirect to "/login") when an anonymous user tries to access a protected page.', $id, implode(', ', $entryPoints), AuthenticationEntryPointInterface::class));
             }
-
-            throw new InvalidConfigurationException(sprintf('Because you have multiple authenticators in firewall "%s", you need to set the "entry_point" key to one of your authenticators (%s) or a service ID implementing "%s". The "entry_point" determines what should happen (e.g. redirect to "/login") when an anonymous user tries to access a protected page.', $id, implode(', ', $entryPoints), AuthenticationEntryPointInterface::class));
         }
 
         if (false === $hasListeners) {
