|
4 | 4 | import lombok.extern.slf4j.Slf4j; |
5 | 5 |
|
6 | 6 | import org.apache.commons.text.similarity.LevenshteinDistance; |
7 | | -import org.passay.CharacterData; |
8 | | -import org.passay.CharacterRule; |
9 | | -import org.passay.DictionaryRule; |
10 | | -import org.passay.EnglishCharacterData; |
11 | | -import org.passay.LengthRule; |
| 7 | +import org.passay.DefaultPasswordValidator; |
12 | 8 | import org.passay.PasswordData; |
13 | 9 | import org.passay.PasswordValidator; |
14 | | -import org.passay.Rule; |
15 | | -import org.passay.RuleResult; |
| 10 | +import org.passay.ValidationResult; |
| 11 | +import org.passay.data.CharacterData; |
| 12 | +import org.passay.data.EnglishCharacterData; |
| 13 | +import org.passay.rule.CharacterRule; |
| 14 | +import org.passay.rule.DictionaryRule; |
| 15 | +import org.passay.rule.LengthRule; |
| 16 | +import org.passay.rule.Rule; |
16 | 17 | import org.passay.dictionary.ArrayWordList; |
17 | 18 | import org.passay.dictionary.WordListDictionary; |
18 | 19 | import org.passay.dictionary.WordLists; |
@@ -281,19 +282,19 @@ private Optional<String> checkPasswordSimilarity(String password, String usernam |
281 | 282 | * @return list of error messages if validation fails, empty if valid |
282 | 283 | */ |
283 | 284 | private List<String> validateWithPassay(String password, List<Rule> rules, Locale locale) { |
284 | | - PasswordValidator validator = new PasswordValidator( |
| 285 | + PasswordValidator validator = new DefaultPasswordValidator( |
285 | 286 | (detail) -> messages.getMessage(detail.getErrorCode(), detail.getValues(), locale), |
286 | 287 | rules); |
287 | 288 | PasswordData passwordData = new PasswordData(password); |
288 | 289 |
|
289 | | - RuleResult result = validator.validate(passwordData); |
| 290 | + ValidationResult result = validator.validate(passwordData); |
290 | 291 |
|
291 | 292 | if (result.isValid()) { |
292 | 293 | log.debug("Password is valid."); |
293 | 294 | return List.of(); |
294 | 295 | } else { |
295 | | - log.warn("Password validation failed: {}", validator.getMessages(result)); |
296 | | - return validator.getMessages(result); |
| 296 | + log.warn("Password validation failed: {}", result.getMessages()); |
| 297 | + return result.getMessages(); |
297 | 298 | } |
298 | 299 | } |
299 | 300 | } |
0 commit comments