Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-05-22 21:33:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refine upgradeEncoding condition in DaoAuthenticationProvider

Browse Source 
After adding jspecify support in the module that contains the
DaoAuthenticationProvider class, we actually changed the contract logic,
which is a good thing, and this commit fixes it.

Closes: gh-18781

Signed-off-by: Andrey Litvitski <andrey1010102008@gmail.com>
This commit is contained in:
Andrey Litvitski
2026-02-23 22:26:33 +03:00
committed by Josh Cummings
parent fdaa883fb7
commit 4f97217f68
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/springframework/security/authentication/dao/DaoAuthenticationProvider.java
+4 -1
View File
@@ -16,6 +16,7 @@
package org.springframework.security.authentication.dao; package org.springframework.security.authentication.dao;
import java.util.Objects;
import java.util.function.Supplier; import java.util.function.Supplier;
import org.jspecify.annotations.Nullable; import org.jspecify.annotations.Nullable;
@@ -43,6 +44,7 @@ import org.springframework.util.function.SingletonSupplier;
* *
* @author Ben Alex * @author Ben Alex
* @author Rob Winch * @author Rob Winch
* @author Andrey Litvitski
*/ */
public class DaoAuthenticationProvider extends AbstractUserDetailsAuthenticationProvider { public class DaoAuthenticationProvider extends AbstractUserDetailsAuthenticationProvider {
@@ -131,7 +133,8 @@ public class DaoAuthenticationProvider extends AbstractUserDetailsAuthentication
throw new CompromisedPasswordException("The provided password is compromised, please change your password"); throw new CompromisedPasswordException("The provided password is compromised, please change your password");
} }
String existingEncodedPassword = user.getPassword(); String existingEncodedPassword = user.getPassword();
boolean upgradeEncoding = existingEncodedPassword != null && this.userDetailsPasswordService != null boolean upgradeEncoding = existingEncodedPassword != null
&& !Objects.equals(this.userDetailsPasswordService, UserDetailsPasswordService.NOOP)
&& this.passwordEncoder.get().upgradeEncoding(existingEncodedPassword); && this.passwordEncoder.get().upgradeEncoding(existingEncodedPassword);
if (upgradeEncoding) { if (upgradeEncoding) {
String newPassword = this.passwordEncoder.get().encode(presentedPassword); String newPassword = this.passwordEncoder.get().encode(presentedPassword);