Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-445 avoid NPE on null ks password

This commit is contained in:
jbertram 2016-03-21 11:07:29 -05:00 committed by Clebert Suconic
parent 923c12c7a4
commit 32ce8710fc
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java
View File

@ -103,7 +103,7 @@ public class SSLSupport {
URL keystoreURL = SSLSupport.validateStoreURL(keystorePath); URL keystoreURL = SSLSupport.validateStoreURL(keystorePath);
in = keystoreURL.openStream(); in = keystoreURL.openStream();
} }
ks.load(in, keystorePassword.toCharArray()); ks.load(in, keystorePassword == null ? null : keystorePassword.toCharArray());
} }
finally { finally {
if (in != null) { if (in != null) {
@ -126,7 +126,7 @@ public class SSLSupport {
else { else {
KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm()); KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
KeyStore ks = SSLSupport.loadKeystore(keyStoreProvider, keystorePath, keystorePassword); KeyStore ks = SSLSupport.loadKeystore(keyStoreProvider, keystorePath, keystorePassword);
kmf.init(ks, keystorePassword.toCharArray()); kmf.init(ks, keystorePassword == null ? null : keystorePassword.toCharArray());
return kmf.getKeyManagers(); return kmf.getKeyManagers();
} }

11
tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java
View File

@ -137,6 +137,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 @Test
public void testContextWithBadTrustStorePath() throws Exception { public void testContextWithBadTrustStorePath() throws Exception {
try { try {