svn commit: r727336 - in /qpid/trunk/qpid/java/broker/src: main/java/org/apache/qpid/server/security/auth/database/ test/java/org/apache/qpid/server/security/auth/database/

[ritchiem]

Author: ritchiem
Date: Wed Dec 17 02:24:54 2008
New Revision: 727336

URL: http://svn.apache.org/viewvc?rev=727336&view=rev
Log:
QPID-1536 : Reverted r727057

Added:
    
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java
      - copied unchanged from r727056, 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java
    
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
      - copied unchanged from r727056, 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
Removed:
    
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64HashedUser.java
    
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64HashedUserTest.java
Modified:
    
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
    
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java?rev=727336&r1=727335&r2=727336&view=diff
==============================================================================
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
 Wed Dec 17 02:24:54 2008
@@ -61,7 +61,7 @@
 
     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 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 @@
             return false;
         }
 
-        Base64HashedUser user = new Base64HashedUser(principal.getName(), 
password);
+        HashedUser user = new HashedUser(principal.getName(), password);
 
         try
         {
@@ -260,7 +260,7 @@
 
     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 @@
      */
     private char[] lookupPassword(String name)
     {
-        Base64HashedUser user = _users.get(name);
+        HashedUser user = _users.get(name);
         if (user == null)
         {
             return null;
@@ -356,7 +356,7 @@
                         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 @@
                         continue;
                     }
 
-                    Base64HashedUser user = _users.get(result[0]);
+                    HashedUser user = _users.get(result[0]);
 
                     if (user == null)
                     {
@@ -444,7 +444,7 @@
                     }
                 }
 
-                for (Base64HashedUser user : _users.values())
+                for (HashedUser user : _users.values())
                 {
                     if (user.isModified())
                     {

Modified: 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java?rev=727336&r1=727335&r2=727336&view=diff
==============================================================================
--- 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
 Wed Dec 17 02:24:54 2008
@@ -228,9 +228,8 @@
 
         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());