Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename CompromisedPasswordCheckResult to CompromisedPasswordDecision

Browse Source 
Issue gh-7395
This commit is contained in:
Marcus Hert Da Coregio
2024-04-30 08:38:03 -03:00
parent 1ca381c364
commit b3c7f3ff19
11 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/org/springframework/security/authentication/AbstractUserDetailsReactiveAuthenticationManager.java
View File

@@ -25,8 +25,8 @@ import reactor.core.scheduler.Schedulers;
import org.springframework.context.MessageSource;
import org.springframework.context.MessageSourceAware;
import org.springframework.context.support.MessageSourceAccessor;
import org.springframework.security.authentication.password.CompromisedPasswordCheckResult;
import org.springframework.security.authentication.password.CompromisedPasswordChecker;
import org.springframework.security.authentication.password.CompromisedPasswordDecision;
import org.springframework.security.authentication.password.CompromisedPasswordException;
import org.springframework.security.authentication.password.ReactiveCompromisedPasswordChecker;
import org.springframework.security.core.Authentication;
@@ -118,7 +118,7 @@ public abstract class AbstractUserDetailsReactiveAuthenticationManager
return Mono.empty();
}
return this.compromisedPasswordChecker.check(password)
.filter(CompromisedPasswordCheckResult::isCompromised)
.filter(CompromisedPasswordDecision::isCompromised)
.flatMap((compromised) -> Mono.error(new CompromisedPasswordException(
"The provided password is compromised, please change your password")));
}

4
core/src/main/java/org/springframework/security/authentication/password/CompromisedPasswordChecker.java
View File

@@ -29,9 +29,9 @@ public interface CompromisedPasswordChecker {
/**
* Check whether the password is compromised
* @param password the password to check
* @return a non-null {@link CompromisedPasswordCheckResult}
* @return a non-null {@link CompromisedPasswordDecision}
*/
@NonNull
CompromisedPasswordCheckResult check(String password);
CompromisedPasswordDecision check(String password);
}

4
core/src/main/java/org/springframework/security/authentication/password/CompromisedPasswordCheckResult.java → core/src/main/java/org/springframework/security/authentication/password/CompromisedPasswordDecision.java
View File

@@ -16,11 +16,11 @@
package org.springframework.security.authentication.password;
public class CompromisedPasswordCheckResult {
public class CompromisedPasswordDecision {
private final boolean compromised;
public CompromisedPasswordCheckResult(boolean compromised) {
public CompromisedPasswordDecision(boolean compromised) {
this.compromised = compromised;
}

4
core/src/main/java/org/springframework/security/authentication/password/ReactiveCompromisedPasswordChecker.java
View File

@@ -29,8 +29,8 @@ public interface ReactiveCompromisedPasswordChecker {
/**
* Check whether the password is compromised
* @param password the password to check
* @return a {@link Mono} containing the {@link CompromisedPasswordCheckResult}
* @return a {@link Mono} containing the {@link CompromisedPasswordDecision}
*/
Mono<CompromisedPasswordCheckResult> check(String password);
Mono<CompromisedPasswordDecision> check(String password);
}

8
core/src/test/java/org/springframework/security/authentication/UserDetailsRepositoryReactiveAuthenticationManagerTests.java
View File

@@ -27,7 +27,7 @@ import reactor.core.scheduler.Schedulers;
import reactor.test.StepVerifier;
import org.springframework.context.MessageSource;
import org.springframework.security.authentication.password.CompromisedPasswordCheckResult;
import org.springframework.security.authentication.password.CompromisedPasswordDecision;
import org.springframework.security.authentication.password.CompromisedPasswordException;
import org.springframework.security.authentication.password.ReactiveCompromisedPasswordChecker;
import org.springframework.security.core.Authentication;
@@ -276,11 +276,11 @@ public class UserDetailsRepositoryReactiveAuthenticationManagerTests {
static class TestReactivePasswordChecker implements ReactiveCompromisedPasswordChecker {
@Override
public Mono<CompromisedPasswordCheckResult> check(String password) {
public Mono<CompromisedPasswordDecision> check(String password) {
if ("password".equals(password)) {
return Mono.just(new CompromisedPasswordCheckResult(true));
return Mono.just(new CompromisedPasswordDecision(true));
}
return Mono.just(new CompromisedPasswordCheckResult(false));
return Mono.just(new CompromisedPasswordDecision(false));
}
}

8
core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java
View File

@@ -33,8 +33,8 @@ import org.springframework.security.authentication.InternalAuthenticationService
import org.springframework.security.authentication.LockedException;
import org.springframework.security.authentication.TestingAuthenticationToken;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.authentication.password.CompromisedPasswordCheckResult;
import org.springframework.security.authentication.password.CompromisedPasswordChecker;
import org.springframework.security.authentication.password.CompromisedPasswordDecision;
import org.springframework.security.authentication.password.CompromisedPasswordException;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
@@ -637,11 +637,11 @@ public class DaoAuthenticationProviderTests {
private static class TestCompromisedPasswordChecker implements CompromisedPasswordChecker {
@Override
public CompromisedPasswordCheckResult check(String password) {
public CompromisedPasswordDecision check(String password) {
if ("password".equals(password)) {
return new CompromisedPasswordCheckResult(true);
return new CompromisedPasswordDecision(true);
}
return new CompromisedPasswordCheckResult(false);
return new CompromisedPasswordDecision(false);
}
}