activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [2/2] activemq-artemis git commit: ARTEMIS-445 avoid NPE on null ks password
Date Mon, 21 Mar 2016 22:35:32 GMT
ARTEMIS-445 avoid NPE on null ks password


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/32ce8710
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/32ce8710
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/32ce8710

Branch: refs/heads/master
Commit: 32ce8710fc23763742adbddb9c4493b45b24583e
Parents: 923c12c
Author: jbertram <jbertram@apache.org>
Authored: Mon Mar 21 11:07:29 2016 -0500
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Mon Mar 21 18:35:21 2016 -0400

----------------------------------------------------------------------
 .../artemis/core/remoting/impl/ssl/SSLSupport.java       |  4 ++--
 .../unit/core/remoting/impl/ssl/SSLSupportTest.java      | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/32ce8710/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java
index 5320bac..2b97c75 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java
@@ -103,7 +103,7 @@ public class SSLSupport {
             URL keystoreURL = SSLSupport.validateStoreURL(keystorePath);
             in = keystoreURL.openStream();
          }
-         ks.load(in, keystorePassword.toCharArray());
+         ks.load(in, keystorePassword == null ? null : keystorePassword.toCharArray());
       }
       finally {
          if (in != null) {
@@ -126,7 +126,7 @@ public class SSLSupport {
       else {
          KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
          KeyStore ks = SSLSupport.loadKeystore(keyStoreProvider, keystorePath, keystorePassword);
-         kmf.init(ks, keystorePassword.toCharArray());
+         kmf.init(ks, keystorePassword == null ? null : keystorePassword.toCharArray());
 
          return kmf.getKeyManagers();
       }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/32ce8710/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java
index cb26552..6ecb385 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java
@@ -138,6 +138,17 @@ public class SSLSupportTest extends ActiveMQTestBase {
    }
 
    @Test
+   public void testContextWithNullKeyStorePassword() throws Exception {
+      try {
+         SSLSupport.createContext(storeType, keyStorePath, null, storeType, trustStorePath,
trustStorePassword);
+         Assert.fail();
+      }
+      catch (Exception e) {
+         assertFalse(e instanceof NullPointerException);
+      }
+   }
+
+   @Test
    public void testContextWithBadTrustStorePath() throws Exception {
       try {
          SSLSupport.createContext(storeType, keyStorePath, keyStorePassword, storeType, "not
a trust store", trustStorePassword);


Mime
View raw message