Fix compatibility of ldap 6.0 with security 5.x

Author: jderusse

Security/LdapAuthenticator.php

@@ -18,6 +18,7 @@
 use Symfony\Component\Security\Http\Authenticator\AuthenticatorInterface;
 use Symfony\Component\Security\Http\Authenticator\InteractiveAuthenticatorInterface;
 use Symfony\Component\Security\Http\Authenticator\Passport\Passport;
+use Symfony\Component\Security\Http\Authenticator\Passport\PassportInterface;
 use Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface;
 use Symfony\Component\Security\Http\EntryPoint\Exception\NotAnEntryPointException;
 
@@ -64,6 +65,14 @@ public function authenticate(Request $request): Passport
         return $passport;
     }
 
+    /**
+     * @internal
+     */
+    public function createAuthenticatedToken(PassportInterface $passport, string $firewallName): TokenInterface
+    {
+        throw new \BadMethodCallException(sprintf('The "%s()" method cannot be called.', __METHOD__));
+    }
+
     public function createToken(Passport $passport, string $firewallName): TokenInterface
     {
         return $this->authenticator->createToken($passport, $firewallName);

Tests/Security/LdapAuthenticatorTest.php

@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Ldap\Tests\Security;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Ldap\Security\LdapAuthenticator;
+use Symfony\Component\Ldap\Security\LdapBadge;
+use Symfony\Component\Security\Http\Authenticator\AuthenticatorInterface;
+use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge;
+use Symfony\Component\Security\Http\Authenticator\Passport\Credentials\PasswordCredentials;
+use Symfony\Component\Security\Http\Authenticator\Passport\Passport;
+
+class LdapAuthenticatorTest extends TestCase
+{
+    public function testAuthenticate()
+    {
+        $decorated = $this->createMock(AuthenticatorInterface::class);
+        $passport = new Passport(new UserBadge('test'), new PasswordCredentials('s3cret'));
+        $decorated
+            ->expects($this->once())
+            ->method('authenticate')
+            ->willReturn($passport)
+        ;
+
+        $authenticator = new LdapAuthenticator($decorated, 'serviceId');
+        $request = new Request();
+
+        $authenticator->authenticate($request);
+
+        /** @var LdapBadge $badge */
+        $badge = $passport->getBadge(LdapBadge::class);
+        $this->assertNotNull($badge);
+        $this->assertSame('serviceId', $badge->getLdapServiceId());
+    }
+}

composer.json

@@ -21,7 +21,8 @@
         "symfony/options-resolver": "^5.4|^6.0"
     },
     "require-dev": {
-        "symfony/security-core": "^5.4|^6.0"
+        "symfony/security-core": "^5.4|^6.0",
+        "symfony/security-http": "^5.4|^6.0"
     },
     "conflict": {
         "symfony/options-resolver": "<5.4",