[Security] Move AbstractListener abstract methods to the new FirewallListenerInterface

chalasr · chalasr · commit 5dd70bd62e7e · 2020-10-25T22:41:40.000+01:00
diff --git a/src/Symfony/Bundle/SecurityBundle/Debug/TraceableFirewallListener.php b/src/Symfony/Bundle/SecurityBundle/Debug/TraceableFirewallListener.php
@@ -15,7 +15,7 @@
 use Symfony\Bundle\SecurityBundle\Security\FirewallContext;
 use Symfony\Bundle\SecurityBundle\Security\LazyFirewallContext;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
-use Symfony\Component\Security\Http\Firewall\AbstractListener;
+use Symfony\Component\Security\Http\Firewall\FirewallListenerInterface;
 
 /**
  * Firewall collecting called listeners.
@@ -41,7 +41,7 @@ protected function callListeners(RequestEvent $event, iterable $listeners)
                 \Closure::bind(function () use (&$wrappedLazyListeners, &$wrappedListeners) {
                     $listeners = [];
                     foreach ($this->listeners as $listener) {
-                        if ($listener instanceof AbstractListener) {
+                        if ($listener instanceof FirewallListenerInterface) {
                             $listener = new WrappedLazyListener($listener);
                             $listeners[] = $listener;
                             $wrappedLazyListeners[] = $listener;
@@ -58,7 +58,7 @@ protected function callListeners(RequestEvent $event, iterable $listeners)
 
                 $listener($event);
             } else {
-                $wrappedListener = $listener instanceof AbstractListener ? new WrappedLazyListener($listener) : new WrappedListener($listener);
+                $wrappedListener = $listener instanceof FirewallListenerInterface ? new WrappedLazyListener($listener) : new WrappedListener($listener);
                 $wrappedListener($event);
                 $wrappedListeners[] = $wrappedListener->getInfo();
             }
diff --git a/src/Symfony/Bundle/SecurityBundle/Debug/WrappedLazyListener.php b/src/Symfony/Bundle/SecurityBundle/Debug/WrappedLazyListener.php
@@ -15,6 +15,7 @@
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\Security\Core\Exception\LazyResponseException;
 use Symfony\Component\Security\Http\Firewall\AbstractListener;
+use Symfony\Component\Security\Http\Firewall\FirewallListenerInterface;
 
 /**
  * Wraps a lazy security listener.
@@ -27,7 +28,7 @@ final class WrappedLazyListener extends AbstractListener
 {
     use TraceableListenerTrait;
 
-    public function __construct(AbstractListener $listener)
+    public function __construct(FirewallListenerInterface $listener)
     {
         $this->listener = $listener;
     }
diff --git a/src/Symfony/Bundle/SecurityBundle/Security/LazyFirewallContext.php b/src/Symfony/Bundle/SecurityBundle/Security/LazyFirewallContext.php
@@ -14,8 +14,8 @@
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
 use Symfony\Component\Security\Http\Event\LazyResponseEvent;
-use Symfony\Component\Security\Http\Firewall\AbstractListener;
 use Symfony\Component\Security\Http\Firewall\ExceptionListener;
+use Symfony\Component\Security\Http\Firewall\FirewallListenerInterface;
 use Symfony\Component\Security\Http\Firewall\LogoutListener;
 
 /**
@@ -46,9 +46,9 @@ public function __invoke(RequestEvent $event)
         $lazy = $request->isMethodCacheable();
 
         foreach (parent::getListeners() as $listener) {
-            if (!$lazy || !$listener instanceof AbstractListener) {
+            if (!$lazy || !$listener instanceof FirewallListenerInterface) {
                 $listeners[] = $listener;
-                $lazy = $lazy && $listener instanceof AbstractListener;
+                $lazy = $lazy && $listener instanceof FirewallListenerInterface;
             } elseif (false !== $supports = $listener->supports($request)) {
                 $listeners[] = [$listener, 'authenticate'];
                 $lazy = null === $supports;
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/SortFirewallListenersPassTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/SortFirewallListenersPassTest.php
@@ -17,6 +17,8 @@
 use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\Security\Http\Firewall\FirewallListenerInterface;
 
 class SortFirewallListenersPassTest extends TestCase
@@ -59,6 +61,14 @@ public function testSortFirewallListeners()
 
 class FirewallListenerPriorityMinus1 implements FirewallListenerInterface
 {
+    public function supports(Request $request): ?bool
+    {
+    }
+
+    public function authenticate(RequestEvent $event)
+    {
+    }
+
     public static function getPriority(): int
     {
         return -1;
@@ -67,6 +77,14 @@ public static function getPriority(): int
 
 class FirewallListenerPriority1 implements FirewallListenerInterface
 {
+    public function supports(Request $request): ?bool
+    {
+    }
+
+    public function authenticate(RequestEvent $event)
+    {
+    }
+
     public static function getPriority(): int
     {
         return 1;
@@ -75,6 +93,14 @@ public static function getPriority(): int
 
 class FirewallListenerPriority2 implements FirewallListenerInterface
 {
+    public function supports(Request $request): ?bool
+    {
+    }
+
+    public function authenticate(RequestEvent $event)
+    {
+    }
+
     public static function getPriority(): int
     {
         return 2;
diff --git a/src/Symfony/Component/Security/CHANGELOG.md b/src/Symfony/Component/Security/CHANGELOG.md
@@ -14,6 +14,7 @@ CHANGELOG
  * Added a CurrentUser attribute to force the UserValueResolver to resolve an argument to the current user.
  * Added `LoginThrottlingListener`.
  * Added `LoginLinkAuthenticator`.
+ * Moved methods `supports()` and `authenticate()` from `AbstractListener` to `FirewallListenerInterface`.
 
 5.1.0
 -----
diff --git a/src/Symfony/Component/Security/Http/Authentication/AuthenticatorManagerInterface.php b/src/Symfony/Component/Security/Http/Authentication/AuthenticatorManagerInterface.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Security\Http\Firewall\AbstractListener;
+use Symfony\Component\Security\Http\Firewall\FirewallListenerInterface;
 
 /**
  * @author Wouter de Jong <wouter@wouterj.nl>
@@ -26,7 +26,7 @@ interface AuthenticatorManagerInterface
     /**
      * Called to see if authentication should be attempted on this request.
      *
-     * @see AbstractListener::supports()
+     * @see FirewallListenerInterface::supports()
      */
     public function supports(Request $request): ?bool;
 
diff --git a/src/Symfony/Component/Security/Http/Firewall/AbstractListener.php b/src/Symfony/Component/Security/Http/Firewall/AbstractListener.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Security\Http\Firewall;
 
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 
 /**
@@ -28,18 +27,6 @@ final public function __invoke(RequestEvent $event)
         }
     }
 
-    /**
-     * Tells whether the authenticate() method should be called or not depending on the incoming request.
-     *
-     * Returning null means authenticate() can be called lazily when accessing the token storage.
-     */
-    abstract public function supports(Request $request): ?bool;
-
-    /**
-     * Does whatever is required to authenticate the request, typically calling $event->setResponse() internally.
-     */
-    abstract public function authenticate(RequestEvent $event);
-
     public static function getPriority(): int
     {
         return 0; // Default
diff --git a/src/Symfony/Component/Security/Http/Firewall/FirewallListenerInterface.php b/src/Symfony/Component/Security/Http/Firewall/FirewallListenerInterface.php
@@ -11,13 +11,30 @@
 
 namespace Symfony\Component\Security\Http\Firewall;
 
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
+
 /**
- * Can be implemented by firewall listeners to define their priority in execution.
+ * Can be implemented by firewall listeners.
  *
  * @author Christian Scheb <me@christianscheb.de>
+ * @author Nicolas Grekas <p@tchwork.com>
+ * @author Robin Chalas <robin.chalas@gmail.com>
  */
 interface FirewallListenerInterface
 {
+    /**
+     * Tells whether the authenticate() method should be called or not depending on the incoming request.
+     *
+     * Returning null means authenticate() can be called lazily when accessing the token storage.
+     */
+    public function supports(Request $request): ?bool;
+
+    /**
+     * Does whatever is required to authenticate the request, typically calling $event->setResponse() internally.
+     */
+    public function authenticate(RequestEvent $event);
+
     /**
      * Defines the priority of the listener.
      * The higher the number, the earlier a listener is executed.

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`use Symfony\Component\HttpKernel\Event\RequestEvent;`
`16`	`16`	`use Symfony\Component\Security\Core\Exception\LazyResponseException;`
`17`	`17`	`use Symfony\Component\Security\Http\Firewall\AbstractListener;`
	`18`	`+use Symfony\Component\Security\Http\Firewall\FirewallListenerInterface;`
`18`	`19`
`19`	`20`	`/**`
`20`	`21`	`* Wraps a lazy security listener.`
`@@ -27,7 +28,7 @@ final class WrappedLazyListener extends AbstractListener`
`27`	`28`	`{`
`28`	`29`	`use TraceableListenerTrait;`
`29`	`30`
`30`		`- public function __construct(AbstractListener $listener)`
	`31`	`+ public function __construct(FirewallListenerInterface $listener)`
`31`	`32`	`{`
`32`	`33`	`$this->listener = $listener;`
`33`	`34`	`}`