bug #33263 [Ldap] Add missing LdapUser::setPassword() (chalasr)

nicolas-grekas · nicolas-grekas · commit 543e4013d068 · 2019-08-20T23:06:27.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Ldap] Add missing LdapUser::setPassword() | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Required for password migrations. Commits ------- 08dd4f3 [Ldap] Add missing LdapUser::setPassword()
diff --git a/src/Symfony/Component/Ldap/Security/LdapUser.php b/src/Symfony/Component/Ldap/Security/LdapUser.php
@@ -90,6 +90,11 @@ public function getExtraFields(): array
         return $this->extraFields;
     }
 
+    public function setPassword(string $password)
+    {
+        $this->password = $password;
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/Ldap/Security/LdapUserProvider.php b/src/Symfony/Component/Ldap/Security/LdapUserProvider.php
@@ -125,11 +125,9 @@ public function upgradePassword(UserInterface $user, string $newEncodedPassword)
         }
 
         try {
-            if ($user->isEqualTo($this->loadUserByUsername($user->getUsername()))) {
-                $user->getEntry()->setAttribute($this->passwordAttribute, [$newEncodedPassword]);
-                $this->ldap->getEntryManager()->update($user->getEntry());
-                $user->setPassword($newEncodedPassword);
-            }
+            $user->getEntry()->setAttribute($this->passwordAttribute, [$newEncodedPassword]);
+            $this->ldap->getEntryManager()->update($user->getEntry());
+            $user->setPassword($newEncodedPassword);
         } catch (ExceptionInterface $e) {
             // ignore failed password upgrades
         }

Original file line number	Diff line number	Diff line change
`@@ -125,11 +125,9 @@ public function upgradePassword(UserInterface $user, string $newEncodedPassword)`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`try {`
`128`		`- if ($user->isEqualTo($this->loadUserByUsername($user->getUsername()))) {`
`129`		`- $user->getEntry()->setAttribute($this->passwordAttribute, [$newEncodedPassword]);`
`130`		`- $this->ldap->getEntryManager()->update($user->getEntry());`
`131`		`- $user->setPassword($newEncodedPassword);`
`132`		`- }`
	`128`	`+ $user->getEntry()->setAttribute($this->passwordAttribute, [$newEncodedPassword]);`
	`129`	`+ $this->ldap->getEntryManager()->update($user->getEntry());`
	`130`	`+ $user->setPassword($newEncodedPassword);`
`133`	`131`	`} catch (ExceptionInterface $e) {`
`134`	`132`	`// ignore failed password upgrades`
`135`	`133`	`}`