You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/06/03 16:02:33 UTC
[1/2] activemq-artemis git commit: ARTEMIS-551 Obfuscate truststore
password
Repository: activemq-artemis
Updated Branches:
refs/heads/master 36bb52c0f -> 4d51f4d0b
ARTEMIS-551 Obfuscate truststore password
Obfuscate truststore password in TransportConfiguration.toString()
in the same way as keystore. The password will not be logged in
plain text when bridge is connected.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/f84018a4
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/f84018a4
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/f84018a4
Branch: refs/heads/master
Commit: f84018a417cee7bbb1261f5ae36e51c9ddef748f
Parents: 36bb52c
Author: Martin \u0160m�rek <ms...@redhat.com>
Authored: Fri Jun 3 15:52:17 2016 +0200
Committer: Martin \u0160m�rek <ms...@redhat.com>
Committed: Fri Jun 3 16:12:31 2016 +0200
----------------------------------------------------------------------
.../artemis/api/core/TransportConfiguration.java | 2 +-
.../api/core/TransportConfigurationTest.java | 16 ++++++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f84018a4/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java
index deceeea..a3e1d7c 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java
@@ -257,7 +257,7 @@ public class TransportConfiguration implements Serializable {
// HORNETQ-1281 - don't log passwords
String val;
- if (key.equals(TransportConstants.KEYSTORE_PASSWORD_PROP_NAME) || key.equals(TransportConstants.DEFAULT_TRUSTSTORE_PASSWORD)) {
+ if (key.equals(TransportConstants.KEYSTORE_PASSWORD_PROP_NAME) || key.equals(TransportConstants.TRUSTSTORE_PASSWORD_PROP_NAME)) {
val = "****";
}
else {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f84018a4/artemis-core-client/src/test/java/org/apache/activemq/artemis/api/core/TransportConfigurationTest.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/test/java/org/apache/activemq/artemis/api/core/TransportConfigurationTest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/api/core/TransportConfigurationTest.java
index 965036c..9f0d29c 100644
--- a/artemis-core-client/src/test/java/org/apache/activemq/artemis/api/core/TransportConfigurationTest.java
+++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/api/core/TransportConfigurationTest.java
@@ -19,9 +19,13 @@ package org.apache.activemq.artemis.api.core;
import java.util.HashMap;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
import org.junit.Assert;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.not;
+
public class TransportConfigurationTest {
@Test
@@ -61,4 +65,16 @@ public class TransportConfigurationTest {
Assert.assertNotEquals(configuration.hashCode(), configuration2.hashCode());
}
+
+ @Test
+ public void testToStringObfuscatesPasswords() {
+ HashMap<String, Object> params = new HashMap<>();
+ params.put(TransportConstants.TRUSTSTORE_PASSWORD_PROP_NAME, "secret_password");
+ params.put(TransportConstants.KEYSTORE_PASSWORD_PROP_NAME, "secret_password");
+
+ TransportConfiguration configuration = new TransportConfiguration("SomeClass", params, null);
+
+ Assert.assertThat(configuration.toString(), not(containsString("secret_password")));
+ }
+
}
[2/2] activemq-artemis git commit: This closes #557
Posted by cl...@apache.org.
This closes #557
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/4d51f4d0
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/4d51f4d0
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/4d51f4d0
Branch: refs/heads/master
Commit: 4d51f4d0b855c8018acdc70e5efe174dbb674e63
Parents: 36bb52c f84018a
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri Jun 3 12:02:10 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Jun 3 12:02:10 2016 -0400
----------------------------------------------------------------------
.../artemis/api/core/TransportConfiguration.java | 2 +-
.../api/core/TransportConfigurationTest.java | 16 ++++++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------