Skip to content

Commit daca285

Browse files
authored
Merge pull request #298 from devondragon/dependabot/gradle/org.passay-passay-2.0.0
chore(deps): bump org.passay:passay from 1.6.6 to 2.0.0
2 parents 3e6ed42 + 42335ee commit daca285

2 files changed

Lines changed: 13 additions & 12 deletions

File tree

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ dependencies {
4545
compileOnly 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:4.0.1'
4646

4747
// Other dependencies (moved to test scope for library)
48-
implementation 'org.passay:passay:1.6.6'
48+
implementation 'org.passay:passay:2.0.0'
4949
implementation 'com.google.guava:guava:33.5.0-jre'
5050
implementation 'org.apache.commons:commons-text:1.15.0'
5151
compileOnly 'jakarta.validation:jakarta.validation-api:3.1.1'

src/main/java/com/digitalsanctuary/spring/user/service/PasswordPolicyService.java

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@
44
import lombok.extern.slf4j.Slf4j;
55

66
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;
128
import org.passay.PasswordData;
139
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;
1617
import org.passay.dictionary.ArrayWordList;
1718
import org.passay.dictionary.WordListDictionary;
1819
import org.passay.dictionary.WordLists;
@@ -281,19 +282,19 @@ private Optional<String> checkPasswordSimilarity(String password, String usernam
281282
* @return list of error messages if validation fails, empty if valid
282283
*/
283284
private List<String> validateWithPassay(String password, List<Rule> rules, Locale locale) {
284-
PasswordValidator validator = new PasswordValidator(
285+
PasswordValidator validator = new DefaultPasswordValidator(
285286
(detail) -> messages.getMessage(detail.getErrorCode(), detail.getValues(), locale),
286287
rules);
287288
PasswordData passwordData = new PasswordData(password);
288289

289-
RuleResult result = validator.validate(passwordData);
290+
ValidationResult result = validator.validate(passwordData);
290291

291292
if (result.isValid()) {
292293
log.debug("Password is valid.");
293294
return List.of();
294295
} 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();
297298
}
298299
}
299300
}

0 commit comments

Comments
 (0)