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

ARTEMIS-2087 fix NPE; mask password in example

This commit is contained in:
Justin Bertram 2018-09-25 13:59:51 -05:00 committed by Clebert Suconic
parent 7a463f038a
commit 5d329a70d1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java
View File

@ -61,7 +61,7 @@ public final class PasswordMaskingUtil {
}
public static boolean isEncMasked(String password) {
return (password.startsWith(BEGIN_ENC) && password.endsWith(END_ENC));
return password == null ? false : (password.startsWith(BEGIN_ENC) && password.endsWith(END_ENC));
}
//remove ENC() from the password body

4
examples/features/standard/jmx-ssl/src/main/resources/activemq/server0/management.xml
View File

@ -21,9 +21,9 @@
connector-host="localhost"
secured="true"
key-store-path="${data.dir}/../etc/server-side-keystore.jks"
key-store-password="secureexample"
key-store-password="ENC(2a7c211d21c295cdbcde3589c205decb)"
trust-store-path="${data.dir}/../etc/server-side-truststore.jks"
trust-store-password="secureexample"/>
trust-store-password="ENC(2a7c211d21c295cdbcde3589c205decb)"/>
<authorisation>
<whitelist>
<entry domain="hawtio"/>