Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ dependencies {
compileOnly 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:4.0.1'

// Other dependencies (moved to test scope for library)
implementation 'org.passay:passay:1.6.6'
implementation 'org.passay:passay:2.0.0'
implementation 'com.google.guava:guava:33.5.0-jre'
implementation 'org.apache.commons:commons-text:1.15.0'
compileOnly 'jakarta.validation:jakarta.validation-api:3.1.1'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@
import lombok.extern.slf4j.Slf4j;

import org.apache.commons.text.similarity.LevenshteinDistance;
import org.passay.CharacterData;
import org.passay.CharacterRule;
import org.passay.DictionaryRule;
import org.passay.EnglishCharacterData;
import org.passay.LengthRule;
import org.passay.DefaultPasswordValidator;
import org.passay.PasswordData;
import org.passay.PasswordValidator;
import org.passay.Rule;
import org.passay.RuleResult;
import org.passay.ValidationResult;
import org.passay.data.CharacterData;
import org.passay.data.EnglishCharacterData;
import org.passay.rule.CharacterRule;
import org.passay.rule.DictionaryRule;
import org.passay.rule.LengthRule;
import org.passay.rule.Rule;
import org.passay.dictionary.ArrayWordList;
import org.passay.dictionary.WordListDictionary;
import org.passay.dictionary.WordLists;
Expand Down Expand Up @@ -281,19 +282,19 @@ private Optional<String> checkPasswordSimilarity(String password, String usernam
* @return list of error messages if validation fails, empty if valid
*/
private List<String> validateWithPassay(String password, List<Rule> rules, Locale locale) {
PasswordValidator validator = new PasswordValidator(
PasswordValidator validator = new DefaultPasswordValidator(
(detail) -> messages.getMessage(detail.getErrorCode(), detail.getValues(), locale),
rules);
PasswordData passwordData = new PasswordData(password);

RuleResult result = validator.validate(passwordData);
ValidationResult result = validator.validate(passwordData);

if (result.isValid()) {
log.debug("Password is valid.");
return List.of();
} else {
log.warn("Password validation failed: {}", validator.getMessages(result));
return validator.getMessages(result);
log.warn("Password validation failed: {}", result.getMessages());
return result.getMessages();
}
}
}
Loading