QPID-1536 : Reverted r727057

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@727336 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 20 insertions, 34 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
index 0f0c0309db..cca9deb6da 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
@@ -61,7 +61,7 @@ public class Base64MD5PasswordFilePrincipalDatabase implements PrincipalDatabase
 
     AMQUserManagementMBean _mbean;
     public static final String DEFAULT_ENCODING = "utf-8";
-    private Map<String, Base64HashedUser> _users = new HashMap<String, Base64HashedUser>();
+    private Map<String, HashedUser> _users = new HashMap<String, HashedUser>();
     private ReentrantLock _userUpdate = new ReentrantLock();
 
     public Base64MD5PasswordFilePrincipalDatabase()
@@ -180,7 +180,7 @@ public class Base64MD5PasswordFilePrincipalDatabase implements PrincipalDatabase
      */
     public boolean updatePassword(Principal principal, char[] password) throws AccountNotFoundException
     {
-        Base64HashedUser user = _users.get(principal.getName());
+        HashedUser user = _users.get(principal.getName());
 
         if (user == null)
         {
@@ -230,7 +230,7 @@ public class Base64MD5PasswordFilePrincipalDatabase implements PrincipalDatabase
             return false;
         }
 
-        Base64HashedUser user = new Base64HashedUser(principal.getName(), password);
+        HashedUser user = new HashedUser(principal.getName(), password);
 
         try
         {
@@ -260,7 +260,7 @@ public class Base64MD5PasswordFilePrincipalDatabase implements PrincipalDatabase
 
     public boolean deletePrincipal(Principal principal) throws AccountNotFoundException
     {
-        Base64HashedUser user = _users.get(principal.getName());
+        HashedUser user = _users.get(principal.getName());
 
         if (user == null)
         {
@@ -324,7 +324,7 @@ public class Base64MD5PasswordFilePrincipalDatabase implements PrincipalDatabase
      */
     private char[] lookupPassword(String name)
     {
-        Base64HashedUser user = _users.get(name);
+        HashedUser user = _users.get(name);
         if (user == null)
         {
             return null;
@@ -356,7 +356,7 @@ public class Base64MD5PasswordFilePrincipalDatabase implements PrincipalDatabase
                         continue;
                     }
 
-                    Base64HashedUser user = new Base64HashedUser(result);
+                    HashedUser user = new HashedUser(result);
                     _logger.info("Created user:" + user);
                     _users.put(user.getName(), user);
                 }
@@ -408,7 +408,7 @@ public class Base64MD5PasswordFilePrincipalDatabase implements PrincipalDatabase
                         continue;
                     }
 
-                    Base64HashedUser user = _users.get(result[0]);
+                    HashedUser user = _users.get(result[0]);
 
                     if (user == null)
                     {
@@ -444,7 +444,7 @@ public class Base64MD5PasswordFilePrincipalDatabase implements PrincipalDatabase
                     }
                 }
 
-                for (Base64HashedUser user : _users.values())
+                for (HashedUser user : _users.values())
                 {
                     if (user.isModified())
                     {
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64HashedUser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java
index 2caccebb2a..4d92e3fb4c 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64HashedUser.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java
@@ -27,11 +27,10 @@ import org.apache.log4j.Logger;
 import java.io.UnsupportedEncodingException;
 import java.security.NoSuchAlgorithmException;
 import java.security.Principal;
-import java.security.MessageDigest;
 
-public class Base64HashedUser implements Principal
+public class HashedUser implements Principal
 {
-    private static final Logger _logger = Logger.getLogger(Base64HashedUser.class);
+    private static final Logger _logger = Logger.getLogger(HashedUser.class);
 
     String _name;
     char[] _password;
@@ -39,7 +38,7 @@ public class Base64HashedUser implements Principal
     private boolean _modified = false;
     private boolean _deleted = false;
 
-    Base64HashedUser(String[] data) throws UnsupportedEncodingException
+    HashedUser(String[] data) throws UnsupportedEncodingException
     {
         if (data.length != 2)
         {
@@ -64,20 +63,7 @@ public class Base64HashedUser implements Principal
         }
     }
 
-    public byte[] getMD5(byte[] data) throws NoSuchAlgorithmException, UnsupportedEncodingException
-    {
-        MessageDigest md = MessageDigest.getInstance("MD5");
-
-        for (byte b : data)
-        {
-            md.update(b);
-        }
-
-        return md.digest();
-    }
-    
-    
-    public Base64HashedUser(String name, char[] password)
+    public HashedUser(String name, char[] password)
     {
         _name = name;
         setPassword(password);
@@ -122,8 +108,7 @@ public class Base64HashedUser implements Principal
         {
             byteArray[index++] = (byte) c;
         }
-                        
-        _encodedPassword = (new Base64()).encode(getMD5(byteArray));
+        _encodedPassword = (new Base64()).encode(byteArray);
     }
 
     public boolean isModified()
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
index 6af042dee6..b5034d9f5d 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
@@ -228,9 +228,8 @@ public class Base64MD5PasswordFilePrincipalDatabaseTest extends TestCase
 
         assertNotNull(testUser);
 
-        String NEW_PASSWORD = "guest";
-        
-        String NEW_PASSWORD_HASH = "CE4DQ6BIb/BVMN9scFyLtA==";
+        String NEW_PASSWORD = "NewPassword";
+        String NEW_PASSWORD_HASH = "TmV3UGFzc3dvcmQ=";
         try
         {
             _database.updatePassword(testUser, NEW_PASSWORD.toCharArray());
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64HashedUserTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
index 4c69edcac7..a7d951cb5b 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64HashedUserTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
@@ -21,13 +21,15 @@
 package org.apache.qpid.server.security.auth.database;
 
 import junit.framework.TestCase;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
 
 import java.io.UnsupportedEncodingException;
 
 /*
     Note User is mainly tested by Base64MD5PFPDTest this is just to catch the extra methods
  */
-public class Base64HashedUserTest extends TestCase
+public class HashedUserTest extends TestCase
 {
 
     String USERNAME = "username";
@@ -38,7 +40,7 @@ public class Base64HashedUserTest extends TestCase
     {
         try
         {
-            Base64HashedUser user = new Base64HashedUser(new String[]{USERNAME, PASSWORD, USERNAME});
+            HashedUser user = new HashedUser(new String[]{USERNAME, PASSWORD, USERNAME});
             fail("Error expected");
         }
         catch (IllegalArgumentException e)
@@ -55,7 +57,7 @@ public class Base64HashedUserTest extends TestCase
     {
         try
         {
-            Base64HashedUser user = new Base64HashedUser(new String[]{USERNAME, HASHED_PASSWORD});
+            HashedUser user = new HashedUser(new String[]{USERNAME, HASHED_PASSWORD});
             assertEquals("Username incorrect", USERNAME, user.getName());
             int index = 0;