From ec800c54394548448086f73f15f21892ec64aa36 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Wed, 18 Dec 2019 15:31:52 +0100 Subject: [PATCH] Enforce minimum password length (amendment to #1018) --- .../java/org/cryptomator/ui/common/NewPasswordController.java | 2 +- .../java/org/cryptomator/ui/common/PasswordStrengthUtil.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/NewPasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/common/NewPasswordController.java index a603f034b..2d0c424eb 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/common/NewPasswordController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/common/NewPasswordController.java @@ -50,7 +50,7 @@ public class NewPasswordController implements FxController { } private void passwordsDidChange(@SuppressWarnings("unused") Observable observable) { - if (hasSamePasswordInBothFields()) { + if (hasSamePasswordInBothFields() && strengthRater.fulfillsMinimumRequirements(passwordField.getCharacters())) { password.set(passwordField.getCharacters()); } else { password.set(""); diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/PasswordStrengthUtil.java b/main/ui/src/main/java/org/cryptomator/ui/common/PasswordStrengthUtil.java index b8be3a0fd..0224118cd 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/common/PasswordStrengthUtil.java +++ b/main/ui/src/main/java/org/cryptomator/ui/common/PasswordStrengthUtil.java @@ -34,6 +34,10 @@ public class PasswordStrengthUtil { this.zxcvbn = new Zxcvbn(); } + public boolean fulfillsMinimumRequirements(CharSequence password) { + return password.length() >= minPwLength; + } + public int computeRate(CharSequence password) { if (password == null || password.length() < minPwLength) { return -1;