Changeset 25852

Timestamp:

2012-06-28T11:22:44+12:00 (11 years ago)

Author:

sjm84

Message:

Fixed email not being properly set in the admin interface. Also increased the maximum password length from 8 to 64. Also made password errors more useful.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/Authentication.java (modified) (6 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/Authentication.java

@@ -24 +24 @@
 public class Authentication extends ServiceRack
 {
+    //Some useful constants
+    protected static final int USERNAME_MIN_LENGTH = 2;
+    protected static final int USERNAME_MAX_LENGTH = 30;
+    protected static final int PASSWORD_MIN_LENGTH = 3;
+    protected static final int PASSWORD_MAX_LENGTH = 64;
+    
     //Error codes
     protected static final int NO_ERROR = 0;
@@ -34 +40 @@
     protected static final int ERROR_SQL_EXCEPTION = -7;
     protected static final int ERROR_INVALID_USERNAME = -8;
-    protected static final int ERROR_INVALID_PASSWORD = -9;
-    protected static final int ERROR_INCORRECT_PASSWORD = -10;
-    protected static final int ERROR_USER_ALREADY_EXISTS = -11;
-    protected static final int ERROR_ADDING_USER = -12;
-    protected static final int ERROR_REMOVING_USER = -13;
-    protected static final int ERROR_CAPTCHA_DOES_NOT_MATCH = -14;
-    protected static final int ERROR_CAPTCHA_MISSING = -15;
-    protected static final int ERROR_NOT_AUTHORISED = -16;
+    protected static final int ERROR_PASSWORD_NOT_ENTERED = -9;
+    protected static final int ERROR_PASSWORD_TOO_SHORT = -10;
+    protected static final int ERROR_PASSWORD_TOO_LONG = -11;
+    protected static final int ERROR_PASSWORD_USES_ILLEGAL_CHARACTERS = -12;
+    protected static final int ERROR_INCORRECT_PASSWORD = -13;
+    protected static final int ERROR_USER_ALREADY_EXISTS = -14;
+    protected static final int ERROR_ADDING_USER = -15;
+    protected static final int ERROR_REMOVING_USER = -16;
+    protected static final int ERROR_CAPTCHA_DOES_NOT_MATCH = -17;
+    protected static final int ERROR_CAPTCHA_MISSING = -18;
+    protected static final int ERROR_NOT_AUTHORISED = -19;
 
     protected static final HashMap<Integer, String> _errorMessageMap;
@@ -56 +65 @@
         errorMessageMap.put(ERROR_SQL_EXCEPTION, "There was an SQL exception while accessing the database.");
         errorMessageMap.put(ERROR_INVALID_USERNAME, "The username specified was invalid.");
-        errorMessageMap.put(ERROR_INVALID_PASSWORD, "The password specified was invalid.");
+        errorMessageMap.put(ERROR_PASSWORD_NOT_ENTERED, "No password was entered.");
+        errorMessageMap.put(ERROR_PASSWORD_TOO_SHORT, "The password you entered was too short (minimum of 3 characters).");
+        errorMessageMap.put(ERROR_PASSWORD_TOO_LONG, "The password you entered was too long (maximum of 64 characters).");
+        errorMessageMap.put(ERROR_PASSWORD_USES_ILLEGAL_CHARACTERS, "The password you entered contains illegal characters.");
         errorMessageMap.put(ERROR_INCORRECT_PASSWORD, "The password specified was incorrect.");
         errorMessageMap.put(ERROR_USER_ALREADY_EXISTS, "This user already exists and therefore cannot be added.");
@@ -463 +475 @@
             String newStatus = (String) paramMap.get("status");
             String newComment = (String) paramMap.get("comment");
-            String newEmail = (String) paramMap.get("email");
+            String newEmail = (String) paramMap.get("newEmail");
 
             //Check the given user name
@@ -696 +708 @@
     {
         //Check the given user name
-        if ((username == null) || (username.length() < 2) || (username.length() > 30) || (!(Pattern.matches("[a-zA-Z0-9//_//.]+", username))))
+        if ((username == null) || (username.length() < USERNAME_MIN_LENGTH) || (username.length() > USERNAME_MAX_LENGTH) || (!(Pattern.matches("[a-zA-Z0-9//_//.]+", username))))
         {
             return ERROR_INVALID_USERNAME;
@@ -706 +718 @@
     {
         //Check the given password
-        if ((password == null) || (password.length() < 3) || (password.length() > 8) || (!(Pattern.matches("[\\p{ASCII}]+", password))))
-        {
-            return ERROR_INVALID_PASSWORD;
+        if (password == null)
+        {
+            return ERROR_PASSWORD_NOT_ENTERED;
+        }
+        else if (password.length() < PASSWORD_MIN_LENGTH)
+        {
+            return ERROR_PASSWORD_TOO_SHORT;
+        }
+        else if (password.length() > PASSWORD_MAX_LENGTH)
+        {
+            return ERROR_PASSWORD_TOO_LONG;
+        }
+        else if (!(Pattern.matches("[\\p{ASCII}]+", password)))
+        {
+            return ERROR_PASSWORD_USES_ILLEGAL_CHARACTERS;
         }
         return NO_ERROR;