[SecurityHttp] Fix incompatibility with 6.0

wouterj · wouterj · commit a2f927937ceb · 2021-08-17T14:03:58.000+02:00
diff --git a/src/Symfony/Component/Security/Http/Authenticator/Token/PostAuthenticationToken.php b/src/Symfony/Component/Security/Http/Authenticator/Token/PostAuthenticationToken.php
@@ -35,8 +35,10 @@ public function __construct(UserInterface $user, string $firewallName, array $ro
         $this->firewallName = $firewallName;
 
         // @deprecated since Symfony 5.4
-        // this token is meant to be used after authentication success, so it is always authenticated
-        $this->setAuthenticated(true, false);
+        if (method_exists($this, 'setAuthenticated')) {
+            // this token is meant to be used after authentication success, so it is always authenticated
+            $this->setAuthenticated(true, false);
+        }
     }
 
     /**
diff --git a/src/Symfony/Component/Security/Http/EventListener/CheckCredentialsListener.php b/src/Symfony/Component/Security/Http/EventListener/CheckCredentialsListener.php
@@ -74,7 +74,7 @@ public function checkPassport(CheckPassportEvent $event): void
                 throw new BadCredentialsException('The presented password is invalid.');
             }
 
-            $salt = $user->getSalt();
+            $salt = method_exists($user, 'getSalt') ? $user->getSalt() : '';
             if ($salt && !$user instanceof LegacyPasswordAuthenticatedUserInterface) {
                 trigger_deprecation('symfony/security-http', '5.3', 'Returning a string from "getSalt()" without implementing the "%s" interface is deprecated, the "%s" class should implement it.', LegacyPasswordAuthenticatedUserInterface::class, get_debug_type($user));
             }
diff --git a/src/Symfony/Component/Security/Http/Firewall/AccessListener.php b/src/Symfony/Component/Security/Http/Firewall/AccessListener.php
@@ -54,7 +54,7 @@ public function __construct(TokenStorageInterface $tokenStorage, AccessDecisionM
         $this->tokenStorage = $tokenStorage;
         $this->accessDecisionManager = $accessDecisionManager;
         $this->map = $map;
-        $this->authManager = $authManager ?? new NoopAuthenticationManager();
+        $this->authManager = $authManager ?? (class_exists(AuthenticationManagerInterface::class) ? new NoopAuthenticationManager() : null);
         $this->exceptionOnNoToken = $exceptionOnNoToken;
     }
 
@@ -66,7 +66,14 @@ public function supports(Request $request): ?bool
         [$attributes] = $this->map->getPatterns($request);
         $request->attributes->set('_access_control_attributes', $attributes);
 
-        return $attributes && ([AuthenticatedVoter::IS_AUTHENTICATED_ANONYMOUSLY] !== $attributes && [AuthenticatedVoter::PUBLIC_ACCESS] !== $attributes) ? true : null;
+        if ($attributes && (
+            (defined(AuthenticatedVoter::class.'::IS_AUTHENTICATED_ANONYMOUSLY') ? [AuthenticatedVoter::IS_AUTHENTICATED_ANONYMOUSLY] !== $attributes : true)
+            && [AuthenticatedVoter::PUBLIC_ACCESS] !== $attributes
+        )) {
+            return true;
+        }
+
+        return null;
     }
 
     /**
@@ -86,7 +93,11 @@ public function authenticate(RequestEvent $event)
         $attributes = $request->attributes->get('_access_control_attributes');
         $request->attributes->remove('_access_control_attributes');
 
-        if (!$attributes || ([AuthenticatedVoter::IS_AUTHENTICATED_ANONYMOUSLY] === $attributes && $event instanceof LazyResponseEvent)) {
+        if (!$attributes || ((
+                (defined(AuthenticatedVoter::class.'::IS_AUTHENTICATED_ANONYMOUSLY') ? [AuthenticatedVoter::IS_AUTHENTICATED_ANONYMOUSLY] === $attributes : false)
+                || [AuthenticatedVoter::PUBLIC_ACCESS] === $attributes
+            ) && $event instanceof LazyResponseEvent
+        )) {
             return;
         }
 
@@ -103,10 +114,13 @@ public function authenticate(RequestEvent $event)
         }
 
         // @deprecated since Symfony 5.4
-        if (!$token->isAuthenticated(false)) {
+        if (method_exists($token, 'isAuthenticated') && !$token->isAuthenticated(false)) {
             trigger_deprecation('symfony/core', '5.4', 'Returning false from "%s()" is deprecated and won\'t have any effect in Symfony 6.0 as security tokens will always be considered authenticated.');
-            $token = $this->authManager->authenticate($token);
-            $this->tokenStorage->setToken($token);
+
+            if ($this->authManager) {
+                $token = $this->authManager->authenticate($token);
+                $this->tokenStorage->setToken($token);
+            }
         }
 
         if (!$this->accessDecisionManager->decide($token, $attributes, $request, true)) {
diff --git a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
@@ -240,7 +240,9 @@ protected function refreshUser(TokenInterface $token): ?TokenInterface
                 if ($this->hasUserChanged($user, $newToken)) {
                     $userDeauthenticated = true;
                     // @deprecated since Symfony 5.4
-                    $newToken->setAuthenticated(false, false);
+                    if (method_exists($newToken, 'setAuthenticated')) {
+                        $newToken->setAuthenticated(false, false);
+                    }
 
                     if (null !== $this->logger) {
                         // @deprecated since Symfony 5.3, change to $refreshedUser->getUserIdentifier() in 6.0
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/AccessListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/AccessListenerTest.php
@@ -166,10 +166,12 @@ public function testHandleWhenThereIsNoAccessMapEntryMatchingTheRequest()
         ;
 
         $token = $this->createMock(TokenInterface::class);
-        $token
-            ->expects($this->never())
-            ->method('isAuthenticated')
-        ;
+        if (method_exists(TokenInterface::class, 'isAuthenticated')) {
+            $token
+                ->expects($this->never())
+                ->method('isAuthenticated')
+            ;
+        }
 
         $tokenStorage = $this->createMock(TokenStorageInterface::class);
         $tokenStorage

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public function checkPassport(CheckPassportEvent $event): void`
`74`	`74`	`throw new BadCredentialsException('The presented password is invalid.');`
`75`	`75`	`}`
`76`	`76`
`77`		`- $salt = $user->getSalt();`
	`77`	`+ $salt = method_exists($user, 'getSalt') ? $user->getSalt() : '';`
`78`	`78`	`if ($salt && !$user instanceof LegacyPasswordAuthenticatedUserInterface) {`
`79`	`79`	`trigger_deprecation('symfony/security-http', '5.3', 'Returning a string from "getSalt()" without implementing the "%s" interface is deprecated, the "%s" class should implement it.', LegacyPasswordAuthenticatedUserInterface::class, get_debug_type($user));`
`80`	`80`	`}`