You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2018/04/05 15:29:28 UTC
[1/2] qpid-jms-amqp-0-x git commit: QPID-8135: [Qpid JMS AMQP 0-x]
Mask passwords associated with end to end encryption in the
BrokerDetails#toString()
Repository: qpid-jms-amqp-0-x
Updated Branches:
refs/heads/master 44cec584d -> 97347f0fb
QPID-8135: [Qpid JMS AMQP 0-x] Mask passwords associated with end to end encryption in the BrokerDetails#toString()
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/commit/97347f0f
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/tree/97347f0f
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/diff/97347f0f
Branch: refs/heads/master
Commit: 97347f0fb0e0782398bd16a7ba2d318bbb759bd1
Parents: 78cf85c
Author: Keith Wall <kw...@apache.org>
Authored: Thu Apr 5 16:13:36 2018 +0100
Committer: Keith Wall <kw...@apache.org>
Committed: Thu Apr 5 16:22:03 2018 +0100
----------------------------------------------------------------------
.../org/apache/qpid/client/BrokerDetails.java | 12 ++++++++++-
.../client/BrokerDetails/BrokerDetailsTest.java | 22 ++++++++++++++++++++
2 files changed, 33 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/97347f0f/client/src/main/java/org/apache/qpid/client/BrokerDetails.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/client/BrokerDetails.java b/client/src/main/java/org/apache/qpid/client/BrokerDetails.java
index c7865ef..5b99285 100644
--- a/client/src/main/java/org/apache/qpid/client/BrokerDetails.java
+++ b/client/src/main/java/org/apache/qpid/client/BrokerDetails.java
@@ -23,8 +23,12 @@ package org.apache.qpid.client;
import java.io.Serializable;
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Map;
+import java.util.Set;
import org.apache.qpid.configuration.ClientProperties;
import org.apache.qpid.transport.ConnectionSettings;
@@ -65,6 +69,12 @@ public class BrokerDetails implements Serializable
public static final String OPTIONS_ENCRYPTION_KEY_STORE = "encryption_key_store";
public static final String OPTIONS_ENCRYPTION_KEY_STORE_PASSWORD = "encryption_key_store_password";
+ private static final Set<String> PASSWORD_YIELDING_OPTIONS =
+ Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
+ OPTIONS_TRUST_STORE_PASSWORD,
+ OPTIONS_KEY_STORE_PASSWORD,
+ OPTIONS_ENCRYPTION_TRUST_STORE_PASSWORD,
+ OPTIONS_ENCRYPTION_KEY_STORE_PASSWORD)));
public static final int DEFAULT_PORT = 5672;
public static final String TCP = "tcp";
@@ -427,7 +437,7 @@ public class BrokerDetails implements Serializable
optionsURL.append("='");
- if (OPTIONS_TRUST_STORE_PASSWORD.equals(key) || OPTIONS_KEY_STORE_PASSWORD.equals(key))
+ if (PASSWORD_YIELDING_OPTIONS.contains(key))
{
optionsURL.append("********");
}
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/97347f0f/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java
----------------------------------------------------------------------
diff --git a/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java b/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java
index 2a33bf7..fd0e7d0 100644
--- a/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java
+++ b/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java
@@ -144,6 +144,28 @@ public class BrokerDetailsTest extends QpidTestCase
assertEquals("Unexpected toString", expectedToString, actualToString);
}
+ public void testToStringMasksEncryptionTrustStorePassword() throws Exception
+ {
+ String url = "tcp://localhost:5672?encryption_trust_store_password='password'";
+ BrokerDetails details = new BrokerDetails(url);
+
+ String expectedToString = "tcp://localhost:5672?encryption_trust_store_password='********'";
+ String actualToString = details.toString();
+
+ assertEquals("Unexpected toString", expectedToString, actualToString);
+ }
+
+ public void testToStringMasksEncryptionKeyStorePassword() throws Exception
+ {
+ String url = "tcp://localhost:5672?encryption_key_store_password='password'";
+ BrokerDetails details = new BrokerDetails(url);
+
+ String expectedToString = "tcp://localhost:5672?encryption_key_store_password='********'";
+ String actualToString = details.toString();
+
+ assertEquals("Unexpected toString", expectedToString, actualToString);
+ }
+
public void testDefaultSsl() throws URLSyntaxException
{
String brokerURL = "tcp://localhost:5672";
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] qpid-jms-amqp-0-x git commit: QPID-8153: [Qpid JMS AMQP 0-x]
Pass host/port through to the SSLEngine so that SNI may function
Posted by kw...@apache.org.
QPID-8153: [Qpid JMS AMQP 0-x] Pass host/port through to the SSLEngine so that SNI may function
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/commit/78cf85c6
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/tree/78cf85c6
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/diff/78cf85c6
Branch: refs/heads/master
Commit: 78cf85c60fbedddfc08f978262aaa23061cae2b4
Parents: 44cec58
Author: Keith Wall <kw...@apache.org>
Authored: Thu Apr 5 15:21:28 2018 +0100
Committer: Keith Wall <kw...@apache.org>
Committed: Thu Apr 5 16:22:03 2018 +0100
----------------------------------------------------------------------
.../network/security/SecurityLayerFactory.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/78cf85c6/client/src/main/java/org/apache/qpid/transport/network/security/SecurityLayerFactory.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/transport/network/security/SecurityLayerFactory.java b/client/src/main/java/org/apache/qpid/transport/network/security/SecurityLayerFactory.java
index 7239c5a..0522936 100644
--- a/client/src/main/java/org/apache/qpid/transport/network/security/SecurityLayerFactory.java
+++ b/client/src/main/java/org/apache/qpid/transport/network/security/SecurityLayerFactory.java
@@ -29,6 +29,7 @@ import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLEngine;
import javax.net.ssl.TrustManager;
+import org.apache.qpid.client.BrokerDetails;
import org.apache.qpid.configuration.CommonProperties;
import org.apache.qpid.ssl.SSLContextFactory;
import org.apache.qpid.transport.ByteBufferSender;
@@ -122,7 +123,16 @@ public class SecurityLayerFactory
CommonProperties.QPID_SECURITY_TLS_CIPHER_SUITE_BLACK_LIST_DEFAULT);
try
{
- _engine = sslCtx.createSSLEngine();
+ if (BrokerDetails.SOCKET.equals(settings.getTransport())
+ || settings.getHost() == null
+ || settings.getHost().length() == 0)
+ {
+ _engine = sslCtx.createSSLEngine();
+ }
+ else
+ {
+ _engine = sslCtx.createSSLEngine(settings.getHost(), settings.getPort());
+ }
_engine.setUseClientMode(true);
SSLUtil.updateEnabledTlsProtocols(_engine, protocolWhiteList, protocolBlackList);
SSLUtil.updateEnabledCipherSuites(_engine, cipherSuiteWhiteList, cipherSuiteBlackList);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org