From 3d5bc9ef0e20255595ab806b401aac9ff98b8246 Mon Sep 17 00:00:00 2001 From: Athou Date: Tue, 7 Apr 2026 02:11:37 +0200 Subject: [PATCH] adapt to passay 2.0 api --- .../password/PasswordConstraintValidator.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/commafeed-server/src/main/java/com/commafeed/security/password/PasswordConstraintValidator.java b/commafeed-server/src/main/java/com/commafeed/security/password/PasswordConstraintValidator.java index 34e84e2c..44adfccb 100644 --- a/commafeed-server/src/main/java/com/commafeed/security/password/PasswordConstraintValidator.java +++ b/commafeed-server/src/main/java/com/commafeed/security/password/PasswordConstraintValidator.java @@ -6,11 +6,12 @@ import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; import org.apache.commons.lang3.StringUtils; -import org.passay.LengthRule; +import org.passay.DefaultPasswordValidator; import org.passay.PasswordData; import org.passay.PasswordValidator; -import org.passay.RuleResult; -import org.passay.WhitespaceRule; +import org.passay.ValidationResult; +import org.passay.rule.LengthRule; +import org.passay.rule.WhitespaceRule; import lombok.Setter; @@ -31,20 +32,20 @@ public class PasswordConstraintValidator implements ConstraintValidator messages = validator.getMessages(result); + List messages = result.getMessages(); String message = String.join(System.lineSeparator(), messages); context.buildConstraintViolationWithTemplate(message).addConstraintViolation().disableDefaultConstraintViolation(); return false; } private PasswordValidator buildPasswordValidator() { - return new PasswordValidator( + return new DefaultPasswordValidator( // length new LengthRule(minimumPasswordLength, 256), // no whitespace