Skip to content

Avoid spring-core in password encoder validation #19341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
seonwooj0810 wants to merge 1 commit into
base: main
Choose a base branch
from
+2 −3
Open

Avoid spring-core in password encoder validation #19341

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .../java/org/springframework/security/crypto/password/AbstractValidatingPasswordEncoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import org.jspecify.annotations.Nullable;

import org.springframework.lang.Contract;
import org.springframework.util.StringUtils;

/**
* An abstract {@link PasswordEncoder} that implementers can use for expecting the
Expand All @@ -46,7 +45,7 @@ public abstract class AbstractValidatingPasswordEncoder implements PasswordEncod

@Override
public final boolean matches(@Nullable CharSequence rawPassword, @Nullable String encodedPassword) {
if (!StringUtils.hasLength(rawPassword) || !StringUtils.hasLength(encodedPassword)) {
if (rawPassword == null || rawPassword.isEmpty() || encodedPassword == null || encodedPassword.isEmpty()) {
return false;
}
return matchesNonNull(rawPassword.toString(), encodedPassword);
Expand All @@ -56,7 +55,7 @@ public final boolean matches(@Nullable CharSequence rawPassword, @Nullable Strin

@Override
public final boolean upgradeEncoding(@Nullable String encodedPassword) {
if (!StringUtils.hasLength(encodedPassword)) {
if (encodedPassword == null || encodedPassword.isEmpty()) {
return false;
}
return upgradeEncodingNonNull(encodedPassword);
Expand Down