librejack

commit 9e2fc3d8300cbf793b6683744b87d2c002534b32
parent 2c468948f89649da5284f364e064288612bf1a2a
Author: Michael Neuper <73108749+michaelneuper@users.noreply.github.com>
Date:   Sun, 12 Feb 2023 21:49:02 +0200

Shorten password check

Diffstat:
M
dist/librejack.jar
 | 
0

M
src/controller/LoginController.java
 | 
73
++++++++++++++++++++++++++-----------------------------------------------

2 files changed, 26 insertions(+), 47 deletions(-)
diff --git a/dist/librejack.jar b/dist/librejack.jar
Binary files differ.
diff --git a/src/controller/LoginController.java b/src/controller/LoginController.java
@@ -130,59 +130,27 @@ public class LoginController {
      * @return whether password is valid
      */
     private boolean isValidPassword(String password) {
-        if (password == null || password.isEmpty() || password.length() < 10) {
-            JOptionPane.showMessageDialog(null, "Password must be at least 10 characters long");
-            return false;
-        }
-
         boolean hasUpperCase = false;
         boolean hasLowerCase = false;
         boolean hasNumber = false;
         boolean hasSpecialChar = false;
 
+        if (password == null || password.length() < 10) {
+            JOptionPane.showMessageDialog(null, "Password must be at least 10 characters long");
+            return false;
+        }
+
         for (int i = 0; i < password.length(); i++) {
             char ch = password.charAt(i);
-            switch (ch) {
-                case '!':
-                case '@':
-                case '#':
-                case '$':
-                case '%':
-                case '^':
-                case '&':
-                case '*':
-                case '(':
-                case ')':
-                case '-':
-                case '+':
-                case '=':
-                case '[':
-                case ']':
-                case '{':
-                case '}':
-                case '|':
-                case '\\':
-                case ';':
-                case ':':
-                case '\'':
-                case '\"':
-                case ',':
-                case '<':
-                case '.':
-                case '>':
-                case '/':
-                case '?':
-                    hasSpecialChar = true;
-                    break;
-                default:
-                    if (Character.isUpperCase(ch)) {
-                        hasUpperCase = true;
-                    } else if (Character.isLowerCase(ch)) {
-                        hasLowerCase = true;
-                    } else if (Character.isDigit(ch)) {
-                        hasNumber = true;
-                    }
-                    break;
+
+            if (Character.isUpperCase(ch)) {
+                hasUpperCase = true;
+            } else if (Character.isLowerCase(ch)) {
+                hasLowerCase = true;
+            } else if (Character.isDigit(ch)) {
+                hasNumber = true;
+            } else if (isSpecialCharacter(ch)) {
+                hasSpecialChar = true;
             }
         }
 
@@ -201,6 +169,17 @@ public class LoginController {
 
         return hasUpperCase && hasLowerCase && hasNumber && hasSpecialChar;
     }
-    
 
+    /**
+    * Checks whether a character is a special character, i.e., one of the following:
+    * !@#$%^&*()-+=[]{}|\;:'",<.>/?.
+    * 
+    * @param ch the character to check
+    * @return true if the character is a special character, false otherwise
+    */
+    private boolean isSpecialCharacter(char ch) {
+        String specialCharacters = "!@#$%^&*()-+=[]{}|\\;:'\",<.>/?";
+        return specialCharacters.contains(String.valueOf(ch));
+    }
+    
 }