QPID-6162 : Add authentication providers which store user data in the config file

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

4 files changed, 50 insertions, 114 deletions

diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/scripts/QpidPasswdTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/scripts/QpidPasswdTest.java
deleted file mode 100644
index e483660f4c..0000000000
--- a/qpid/java/systests/src/test/java/org/apache/qpid/scripts/QpidPasswdTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.qpid.scripts;
-
-import java.io.File;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.qpid.test.utils.Piper;
-import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.util.SystemUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class QpidPasswdTest extends QpidTestCase
-{
-    private static final Logger LOGGER = LoggerFactory.getLogger(QpidPasswdTest.class);
-
-    private static final String PASSWD_SCRIPT = "qpid-passwd";
-    private static final String EXPECTED_OUTPUT = "user1:rL0Y20zC+Fzt72VPzMSk2A==";
-
-    public void testRunScript() throws Exception
-    {
-        if(SystemUtils.isWindows())
-        {
-            return;
-        }
-        Process process = null;
-        try
-        {
-            String scriptPath =
-                    QpidTestCase.QPID_HOME + File.separatorChar
-                    + "bin" + File.separatorChar
-                    + PASSWD_SCRIPT;
-
-            LOGGER.info("About to run script: " + scriptPath);
-
-            ProcessBuilder pb = new ProcessBuilder(scriptPath, "user1", "foo");
-            pb.redirectErrorStream(true);
-            process = pb.start();
-
-            Piper piper = new Piper(process.getInputStream(), System.out, EXPECTED_OUTPUT, EXPECTED_OUTPUT);
-            piper.start();
-
-            boolean finishedSuccessfully = piper.await(2, TimeUnit.SECONDS);
-            assertTrue(
-                    "Script should have completed with expected output " + EXPECTED_OUTPUT + ". Check standard output for actual output.",
-                    finishedSuccessfully);
-            process.waitFor();
-            piper.join();
-
-            assertEquals("Unexpected exit value from backup script", 0, process.exitValue());
-        }
-        finally
-        {
-            if (process != null)
-            {
-                process.getErrorStream().close();
-                process.getInputStream().close();
-                process.getOutputStream().close();
-            }
-        }
-
-    }
-}
diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/UserManagementTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/UserManagementTest.java
index 25b09f04c3..0bcae6431c 100644
--- a/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/UserManagementTest.java
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/UserManagementTest.java
@@ -35,7 +35,6 @@ import org.apache.qpid.server.security.auth.manager.PlainPasswordDatabaseAuthent
 import org.apache.qpid.test.utils.JMXTestUtils;
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
 import org.apache.qpid.test.utils.TestBrokerConfiguration;
-import org.apache.qpid.tools.security.Passwd;
 
 /**
  * System test for User Management.
@@ -49,11 +48,9 @@ public class UserManagementTest extends QpidBrokerTestCase
     private String _testUserName;
     private File _passwordFile;
     private UserManagement _userManagement;
-    private Passwd _passwd;
 
     public void setUp() throws Exception
     {
-        _passwd = createPasswordEncodingUtility();
         _passwordFile = createTemporaryPasswordFileWithJmxAdminUser();
 
         Map<String, Object> newAttributes = new HashMap<String, Object>();
@@ -161,17 +158,6 @@ public class UserManagementTest extends QpidBrokerTestCase
         assertEquals("unexpected authentication provider type", getAuthenticationManagerType(), actualType);
     }
 
-    protected Passwd createPasswordEncodingUtility()
-    {
-        return new Passwd()
-        {
-            @Override
-            public String getOutput(String username, String password)
-            {
-                return username + ":" + password;
-            }
-        };
-    }
 
     protected String getAuthenticationManagerType()
     {
@@ -188,21 +174,25 @@ public class UserManagementTest extends QpidBrokerTestCase
 
     private void writePasswordFile(File passwordFile, String... userNamePasswordPairs) throws Exception
     {
-        FileWriter writer = null;
-        try
+        try(FileWriter writer = new FileWriter(passwordFile))
         {
-            writer = new FileWriter(passwordFile);
             for (int i = 0; i < userNamePasswordPairs.length; i=i+2)
             {
                 String username = userNamePasswordPairs[i];
                 String password = userNamePasswordPairs[i+1];
-                writer.append(_passwd.getOutput(username, password) + "\n");
+                writeUsernamePassword(writer, username, password);
             }
         }
-        finally
-        {
-            writer.close();
-        }
+
+    }
+
+    protected void writeUsernamePassword(final FileWriter writer, final String username, final String password)
+            throws IOException
+    {
+        writer.append(username);
+        writer.append(':');
+        writer.append(password);
+        writer.append('\n');
     }
 
 
@@ -218,10 +208,8 @@ public class UserManagementTest extends QpidBrokerTestCase
 
     private boolean passwordFileContainsUser(String username) throws IOException
     {
-        BufferedReader reader = null;
-        try
+        try(BufferedReader reader = new BufferedReader(new FileReader(_passwordFile)))
         {
-            reader = new BufferedReader(new FileReader(_passwordFile));
             String line = reader.readLine();
             while(line != null)
             {
@@ -234,10 +222,6 @@ public class UserManagementTest extends QpidBrokerTestCase
 
             return false;
         }
-        finally
-        {
-            reader.close();
-        }
     }
 
     private void assertJmsConnectionSucceeds(String username, String password) throws Exception
diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/UserManagementWithBase64MD5PasswordsTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/UserManagementWithBase64MD5PasswordsTest.java
index ff441169b3..96ee2d3ae6 100644
--- a/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/UserManagementWithBase64MD5PasswordsTest.java
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/UserManagementWithBase64MD5PasswordsTest.java
@@ -18,17 +18,42 @@
  */
 package org.apache.qpid.systest.management.jmx;
 
+import java.io.FileWriter;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+import javax.xml.bind.DatatypeConverter;
+
 import org.apache.qpid.server.security.auth.manager.Base64MD5PasswordDatabaseAuthenticationManager;
-import org.apache.qpid.tools.security.Passwd;
+import org.apache.qpid.server.util.ServerScopedRuntimeException;
 
 public class UserManagementWithBase64MD5PasswordsTest extends UserManagementTest
 {
     @Override
-    protected Passwd createPasswordEncodingUtility()
+    protected void writeUsernamePassword(final FileWriter writer, final String username, final String password)
+            throws IOException
     {
-        return new Passwd();
+        writer.append(username);
+        writer.append(":");
+        byte[] data = password.getBytes(StandardCharsets.UTF_8);
+        MessageDigest md = null;
+        try
+        {
+            md = MessageDigest.getInstance("MD5");
+        }
+        catch (NoSuchAlgorithmException e)
+        {
+            throw new ServerScopedRuntimeException("MD5 not supported although Java compliance requires it");
+        }
+
+        md.update(data);
+        writer.append(DatatypeConverter.printBase64Binary(md.digest()));
+        writer.append('\n');
     }
 
+
     @Override
     protected String getAuthenticationManagerType()
     {
diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/SaslRestTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/SaslRestTest.java
index 547b7b1b00..57a958edd0 100644
--- a/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/SaslRestTest.java
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/SaslRestTest.java
@@ -29,11 +29,14 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
+import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.bind.DatatypeConverter;
+
 import org.apache.commons.codec.binary.Base64;
 import org.codehaus.jackson.JsonParseException;
 import org.codehaus.jackson.map.JsonMappingException;
@@ -41,7 +44,6 @@ import org.codehaus.jackson.map.JsonMappingException;
 import org.apache.qpid.server.model.AuthenticationProvider;
 import org.apache.qpid.server.security.auth.manager.Base64MD5PasswordDatabaseAuthenticationManager;
 import org.apache.qpid.test.utils.TestBrokerConfiguration;
-import org.apache.qpid.tools.security.Passwd;
 
 public class SaslRestTest extends QpidRestTestCase
 {
@@ -353,7 +355,12 @@ public class SaslRestTest extends QpidRestTestCase
         String passwordFileEntry;
         try
         {
-            passwordFileEntry = new Passwd().getOutput("admin", "admin");
+
+            MessageDigest md = MessageDigest.getInstance("MD5");
+
+            md.update("admin".getBytes("utf-8"));
+
+            passwordFileEntry = "admin" + ":" + DatatypeConverter.printBase64Binary(md.digest());
         }
         catch (NoSuchAlgorithmException e)
         {