bug #60626 [Ldap] Fix LdapUser::isEqualTo (MatTheCat)

nicolas-grekas · nicolas-grekas · commit dd64f650a5a1 · 2025-06-02T10:49:27.000+02:00
This PR was merged into the 7.3 branch. Discussion ---------- [Ldap] Fix `LdapUser::isEqualTo` | Q | A | ------------- | --- | Branch? | 7.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #60454 | License | MIT Since #59682 `LdapUser`s’ password no longer is serialized in the session, which means that `isEqualTo` will crash when trying to access it. This PR makes `getPassword` returns `null` by default to fix this, and update `isEqualTo` to apply #59539’s logic. Commits ------- ad74742 [Ldap] Fix `LdapUser::isEqualTo`
diff --git a/src/Symfony/Component/Ldap/Security/LdapUser.php b/src/Symfony/Component/Ldap/Security/LdapUser.php
@@ -47,7 +47,7 @@ public function getRoles(): array
 
     public function getPassword(): ?string
     {
-        return $this->password;
+        return $this->password ?? null;
     }
 
     public function getSalt(): ?string
@@ -89,7 +89,7 @@ public function isEqualTo(UserInterface $user): bool
             return false;
         }
 
-        if ($this->getPassword() !== $user->getPassword()) {
+        if (($this->getPassword() ?? $user->getPassword()) !== $user->getPassword()) {
             return false;
         }
 
diff --git a/src/Symfony/Component/Ldap/Tests/Security/LdapUserTest.php b/src/Symfony/Component/Ldap/Tests/Security/LdapUserTest.php
@@ -0,0 +1,27 @@
+<?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\Ldap\Entry;
+use Symfony\Component\Ldap\Security\LdapUser;
+
+class LdapUserTest extends TestCase
+{
+    public function testIsEqualToWorksOnUnserializedUser()
+    {
+        $user = new LdapUser(new Entry('uid=jonhdoe,ou=MyBusiness,dc=symfony,dc=com', []), 'jonhdoe', 'p455w0rd');
+        $unserializedUser = unserialize(serialize($user));
+
+        $this->assertTrue($unserializedUser->isEqualTo($user));
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function getRoles(): array`
`47`	`47`
`48`	`48`	`public function getPassword(): ?string`
`49`	`49`	`{`
`50`		`- return $this->password;`
	`50`	`+ return $this->password ?? null;`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`public function getSalt(): ?string`
`@@ -89,7 +89,7 @@ public function isEqualTo(UserInterface $user): bool`
`89`	`89`	`return false;`
`90`	`90`	`}`
`91`	`91`
`92`		`- if ($this->getPassword() !== $user->getPassword()) {`
	`92`	`+ if (($this->getPassword() ?? $user->getPassword()) !== $user->getPassword()) {`
`93`	`93`	`return false;`
`94`	`94`	`}`
`95`	`95`