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

Timestamp:

2012-03-28T16:59:57+13:00 (12 years ago)

Author:

sjm84

Message:

Fixed some bugs in the administration service

File:

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

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

@@ -7 +7 @@
 
 import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
 
 import java.util.ArrayList;
@@ -113 +114 @@
     protected DerbyWrapper _derbyWrapper = null;
 
+    protected String _recaptchaPrivateKey = null;
+    protected String _recaptchaPublicKey = null;
+
     /** constructor */
     public Authentication()
@@ -134 +138 @@
         getUserInformation_service.setAttribute(GSXML.NAME_ATT, GET_USER_INFORMATION_SERVICE);
         this.short_service_info.appendChild(getUserInformation_service);
+
+        NodeList recaptchaElems = info.getElementsByTagName("recaptcha");
+
+        for (int i = 0; i < recaptchaElems.getLength(); i++)
+        {
+            Element currentElem = (Element) recaptchaElems.item(i);
+            if (currentElem.getAttribute(GSXML.NAME_ATT) != null && currentElem.getAttribute(GSXML.NAME_ATT).equals("public_key"))
+            {
+                if (currentElem.getAttribute(GSXML.VALUE_ATT) != null)
+                {
+                    _recaptchaPublicKey = currentElem.getAttribute(GSXML.VALUE_ATT);
+                }
+            }
+            else if (currentElem.getAttribute(GSXML.NAME_ATT) != null && currentElem.getAttribute(GSXML.NAME_ATT).equals("private_key"))
+            {
+                if (currentElem.getAttribute(GSXML.VALUE_ATT) != null)
+                {
+                    _recaptchaPrivateKey = currentElem.getAttribute(GSXML.VALUE_ATT);
+                }
+            }
+        }
 
         return true;
@@ -333 +358 @@
             String newComment = (String) paramMap.get("comment");
             String newEmail = (String) paramMap.get("email");
-
-            int error = addUser(newUsername, newPassword, newGroups, newStatus, newComment, newEmail);
+            
+            //Check the given user name
+            int error;
+            if ((error = checkUsername(newUsername)) != NO_ERROR)
+            {
+                GSXML.addError(this.doc, result, _errorMessageMap.get(error));
+                return result;
+            }
+
+            //Check the given password
+            if ((error = checkPassword(newPassword)) != NO_ERROR)
+            {
+                GSXML.addError(this.doc, result, _errorMessageMap.get(error));
+                return result;
+            }
+
+            newPassword = hashPassword(newPassword);
+
+            error = addUser(newUsername, newPassword, newGroups, newStatus, newComment, newEmail);
             if (error != NO_ERROR)
             {
@@ -351 +393 @@
             String newPassword = (String) paramMap.get("password");
             String newEmail = (String) paramMap.get("email");
-
-            ReCaptchaImpl reCaptcha = new ReCaptchaImpl();
-            reCaptcha.setPrivateKey("6LckI88SAAAAAGnGy1PwuXYZzIMXZYoPxN51bWWG"); //TODO: MOVE TO SITECONFIG.XML FILE
-
-            String challenge = (String) paramMap.get("recaptcha_challenge_field");
-            String uResponse = (String) paramMap.get("recaptcha_response_field");
-
-            if (challenge == null || uResponse == null)
-            {
-                serviceNode.setAttribute("operation", REGISTER);
-                GSXML.addError(this.doc, result, _errorMessageMap.get(ERROR_CAPTCHA_MISSING));
-                return result;
-            }
-
-            ReCaptchaResponse reCaptchaResponse = reCaptcha.checkAnswer(request.getAttribute("remoteAddress"), challenge, uResponse);
-
-            if (!reCaptchaResponse.isValid())
-            {
-                serviceNode.setAttribute("operation", REGISTER);
-                GSXML.addError(this.doc, result, _errorMessageMap.get(ERROR_CAPTCHA_DOES_NOT_MATCH));
-                return result;
-            }
-
-            int error = addUser(newUsername, newPassword, "", "true", "", newEmail);
+            
+            //Check the given user name
+            int error;
+            if ((error = checkUsername(newUsername)) != NO_ERROR)
+            {
+                GSXML.addError(this.doc, result, _errorMessageMap.get(error));
+                return result;
+            }
+
+            //Check the given password
+            if ((error = checkPassword(newPassword)) != NO_ERROR)
+            {
+                GSXML.addError(this.doc, result, _errorMessageMap.get(error));
+                return result;
+            }
+            
+            newPassword = hashPassword(newPassword);
+
+            if(_recaptchaPrivateKey != null)
+            {
+                ReCaptchaImpl reCaptcha = new ReCaptchaImpl();
+                reCaptcha.setPrivateKey(_recaptchaPrivateKey);
+    
+                String challenge = (String) paramMap.get("recaptcha_challenge_field");
+                String uResponse = (String) paramMap.get("recaptcha_response_field");
+    
+                if (challenge == null || uResponse == null)
+                {
+                    serviceNode.setAttribute("operation", REGISTER);
+                    GSXML.addError(this.doc, result, _errorMessageMap.get(ERROR_CAPTCHA_MISSING));
+                    return result;
+                }
+    
+                ReCaptchaResponse reCaptchaResponse = reCaptcha.checkAnswer(request.getAttribute("remoteAddress"), challenge, uResponse);
+    
+                if (!reCaptchaResponse.isValid())
+                {
+                    serviceNode.setAttribute("operation", REGISTER);
+                    GSXML.addError(this.doc, result, _errorMessageMap.get(ERROR_CAPTCHA_DOES_NOT_MATCH));
+                    return result;
+                }
+            }
+
+            error = addUser(newUsername, newPassword, "", "true", "", newEmail);
             if (error != NO_ERROR)
             {
@@ -391 +453 @@
             String newEmail = (String) paramMap.get("email");
 
+            //Check the given user name
+            int error;
+            if ((error = checkUsername(newUsername)) != NO_ERROR)
+            {
+                GSXML.addError(this.doc, result, _errorMessageMap.get(error));
+                return result;
+            }
+
             if (newPassword == null)
             {
                 newPassword = retrieveDataForUser(previousUsername, "password");
             }
-
-            int error = removeUser(previousUsername);
+            else
+            {
+                //Check the given password
+                if ((error = checkPassword(newPassword)) != NO_ERROR)
+                {
+                    GSXML.addError(this.doc, result, _errorMessageMap.get(error));
+                    return result;
+                }
+                
+                newPassword = hashPassword(newPassword);
+            }
+            
+            error = removeUser(previousUsername);
             if (error != NO_ERROR)
             {
@@ -411 +492 @@
                 return result;
             }
+
             error = addUser(newUsername, newPassword, newGroups, newStatus, newComment, newEmail);
             if (error != NO_ERROR)
@@ -453 +535 @@
                     return result;
                 }
+                
+                //Check the given password
+                int error;
+                if ((error = checkPassword(newPassword)) != NO_ERROR)
+                {
+                    GSXML.addError(this.doc, result, _errorMessageMap.get(error));
+                    return result;
+                }
+                
+                newPassword = hashPassword(newPassword);
             }
             else
@@ -458 +550 @@
                 newPassword = prevPassword;
             }
-
+            
+            //Check the given user name
+            int error;
+            if ((error = checkUsername(newUsername)) != NO_ERROR)
+            {
+                GSXML.addError(this.doc, result, _errorMessageMap.get(error));
+                return result;
+            }
+            
             String prevGroups = retrieveDataForUser(previousUsername, "groups");
             String prevStatus = retrieveDataForUser(previousUsername, "status");
             String prevComment = retrieveDataForUser(previousUsername, "comment");
 
-            int error = removeUser(previousUsername);
+            error = removeUser(previousUsername);
             if (error != NO_ERROR)
             {
@@ -501 +601 @@
         {
             String editUsername = (String) paramMap.get("username");
-            
-            if(editUsername == null)
+
+            if (editUsername == null)
             {
                 serviceNode.setAttribute("operation", "");
@@ -508 +608 @@
                 return result;
             }
-            
-            if(!editUsername.equals(username))
+
+            if (!editUsername.equals(username))
             {
                 serviceNode.setAttribute("operation", LOGIN);
@@ -524 +624 @@
         {
             String passwordResetUser = (String) paramMap.get("username");
-            
+
             String newPassword = UUID.randomUUID().toString();
             newPassword = newPassword.substring(0, newPassword.indexOf("-"));
-            
+
             String email = retrieveDataForUser(passwordResetUser, "email");
             String from = "[email protected]";
             String host = request.getAttribute("remoteAddress");
-            
+
             //TODO: FINISH THIS
+        }
+        else if (op.equals(REGISTER))
+        {
+            if(_recaptchaPublicKey != null && _recaptchaPrivateKey != null)
+            {
+                Element recaptchaElem = this.doc.createElement("recaptcha");
+                recaptchaElem.setAttribute("publicKey", _recaptchaPublicKey);
+                recaptchaElem.setAttribute("privateKey", _recaptchaPrivateKey);
+                result.appendChild(recaptchaElem);
+            }
         }
         else if (op.equals(PERFORM_DELETE_USER))
@@ -547 +657 @@
 
         return result;
+    }
+    
+    public int checkUsernameAndPassword(String username, String password)
+    {
+        int uResult = checkUsername(username);
+        int pResult = checkPassword(password);
+        
+        return (uResult != NO_ERROR ? uResult : (pResult != NO_ERROR ? pResult : NO_ERROR));
+    }
+    
+    public int checkUsername(String username)
+    {
+        //Check the given user name
+        if ((username == null) || (username.length() < 2) || (username.length() > 30) || (!(Pattern.matches("[a-zA-Z0-9//_//.]+", username))))
+        {
+            return ERROR_INVALID_USERNAME;
+        }
+        return NO_ERROR;
+    }
+    
+    public int checkPassword(String password)
+    {
+        //Check the given password
+        if ((password == null) || (password.length() < 3) || (password.length() > 8) || (!(Pattern.matches("[\\p{ASCII}]+", password))))
+        {
+            return ERROR_INVALID_PASSWORD;
+        }
+        return NO_ERROR;
     }
 
@@ -688 +826 @@
         }
 
-        //Check the given user name
-        if ((newUsername == null) || (newUsername.length() < 2) || (newUsername.length() > 30) || (!(Pattern.matches("[a-zA-Z0-9//_//.]+", newUsername))))
-        {
-            closeDatabase();
-            return ERROR_INVALID_USERNAME;
-        }
-
-        //Check the given password
-        if ((newPassword == null) || (newPassword.length() < 3) || (newPassword.length() > 8) || (!(Pattern.matches("[\\p{ASCII}]+", newPassword))))
-        {
-            closeDatabase();
-            return ERROR_INVALID_PASSWORD;
-        }
-
-        newPassword = hashPassword(newPassword);
-
         newGroups = newGroups.replaceAll(" ", "");
 
@@ -710 +832 @@
         if (userQueryResult != null)
         {
+            closeDatabase();
             return ERROR_USER_ALREADY_EXISTS;
         }