X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Futil%2FPasswordStrengthChecker.java;h=cad2aba58106f21a872a41d32f80f5094174f4e6;hb=2824d1c165c501e2f3a8809044788b33b81f478a;hp=efc776ef08da4836d2c30701966b87463a38c776;hpb=6b6a343822732845953729656820042966f0b78c;p=gigi.git diff --git a/src/org/cacert/gigi/util/PasswordStrengthChecker.java b/src/org/cacert/gigi/util/PasswordStrengthChecker.java index efc776ef..cad2aba5 100644 --- a/src/org/cacert/gigi/util/PasswordStrengthChecker.java +++ b/src/org/cacert/gigi/util/PasswordStrengthChecker.java @@ -9,9 +9,11 @@ public class PasswordStrengthChecker { static Pattern lower = Pattern.compile("[a-z]"); static Pattern upper = Pattern.compile("[A-Z]"); static Pattern whitespace = Pattern.compile("\\s"); - static Pattern special = Pattern.compile("\\W"); + static Pattern special = Pattern.compile("(?!\\s)\\W"); + private PasswordStrengthChecker() { } + private static int checkpwlight(String pw) { int points = 0; if (pw.length() > 15) { @@ -43,6 +45,7 @@ public class PasswordStrengthChecker { } return points; } + public static int checkpw(String pw, User u) { if (pw == null) { return 0; @@ -66,6 +69,7 @@ public class PasswordStrengthChecker { // TODO dictionary check return light; } + private static boolean contained(String pw, String check) { if (check == null || check.equals("")) { return false;