Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.8.x' into 6.1.x

This commit is contained in:
Josh Cummings 2024-04-26 17:21:06 -06:00
parent 38ae090d3d e5ee45d568
commit 1b8cf6cc55
No known key found for this signature in database
GPG Key ID: A306A51F43B8E5A5
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/src/main/java/org/springframework/security/crypto/password/DelegatingPasswordEncoder.java
View File

@ -19,8 +19,6 @@ package org.springframework.security.crypto.password;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.springframework.util.StringUtils;
/** /**
* A password encoder that delegates to another PasswordEncoder based upon a prefixed * A password encoder that delegates to another PasswordEncoder based upon a prefixed
* identifier. * identifier.
@ -292,7 +290,7 @@ public class DelegatingPasswordEncoder implements PasswordEncoder {
@Override @Override
public boolean matches(CharSequence rawPassword, String prefixEncodedPassword) { public boolean matches(CharSequence rawPassword, String prefixEncodedPassword) {
String id = extractId(prefixEncodedPassword); String id = extractId(prefixEncodedPassword);
if (StringUtils.hasText(id)) { if (id != null && !id.isEmpty()) {
throw new IllegalArgumentException(String.format(NO_PASSWORD_ENCODER_MAPPED, id)); throw new IllegalArgumentException(String.format(NO_PASSWORD_ENCODER_MAPPED, id));
} }
throw new IllegalArgumentException(NO_PASSWORD_ENCODER_PREFIX); throw new IllegalArgumentException(NO_PASSWORD_ENCODER_PREFIX);