From 87456620af31532eb5af81c0207e7533ae67fb39 Mon Sep 17 00:00:00 2001 From: Alex Rudyy Date: Thu, 7 Aug 2014 00:20:24 +0000 Subject: QPID-5960: Turn on SSL host name verification by default git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1616378 13f79535-47bb-0310-9956-ffa450edef68 --- .../client/BrokerDetails/BrokerDetailsTest.java | 40 ++++++++++++++++++++-- 1 file changed, 37 insertions(+), 3 deletions(-) (limited to 'qpid/java/client/src/test') diff --git a/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java index ad9d3d3516..2733d7bf6d 100644 --- a/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java +++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java @@ -20,14 +20,14 @@ */ package org.apache.qpid.test.unit.client.BrokerDetails; -import junit.framework.TestCase; - import org.apache.qpid.client.AMQBrokerDetails; +import org.apache.qpid.configuration.ClientProperties; import org.apache.qpid.jms.BrokerDetails; +import org.apache.qpid.test.utils.QpidTestCase; import org.apache.qpid.transport.ConnectionSettings; import org.apache.qpid.url.URLSyntaxException; -public class BrokerDetailsTest extends TestCase +public class BrokerDetailsTest extends QpidTestCase { public void testDefaultTCP_NODELAY() throws URLSyntaxException { @@ -190,4 +190,38 @@ public class BrokerDetailsTest extends TestCase assertEquals(Integer.valueOf(60), broker.buildConnectionSettings().getHeartbeatInterval08()); } + + public void testSslVerifyHostNameIsTurnedOnByDefault() throws Exception + { + String brokerURL = "tcp://localhost:5672?ssl='true'"; + AMQBrokerDetails broker = new AMQBrokerDetails(brokerURL); + ConnectionSettings connectionSettings = broker.buildConnectionSettings(); + assertTrue(String.format("Unexpected '%s' option value", BrokerDetails.OPTIONS_SSL_VERIFY_HOSTNAME), + connectionSettings.isVerifyHostname()); + assertNull(String.format("Unexpected '%s' property value", BrokerDetails.OPTIONS_SSL_VERIFY_HOSTNAME), + broker.getProperty(BrokerDetails.OPTIONS_SSL_VERIFY_HOSTNAME)); + } + + public void testSslVerifyHostNameIsTurnedOff() throws Exception + { + String brokerURL = "tcp://localhost:5672?ssl='true'&ssl_verify_hostname='false'"; + AMQBrokerDetails broker = new AMQBrokerDetails(brokerURL); + ConnectionSettings connectionSettings = broker.buildConnectionSettings(); + assertFalse(String.format("Unexpected '%s' option value", BrokerDetails.OPTIONS_SSL_VERIFY_HOSTNAME), + connectionSettings.isVerifyHostname()); + assertEquals(String.format("Unexpected '%s' property value", BrokerDetails.OPTIONS_SSL_VERIFY_HOSTNAME), + "false", broker.getProperty(BrokerDetails.OPTIONS_SSL_VERIFY_HOSTNAME)); + } + + public void testSslVerifyHostNameTurnedOffViaSystemProperty() throws Exception + { + setTestSystemProperty(ClientProperties.CONNECTION_OPTION_SSL_VERIFY_HOST_NAME, "false"); + String brokerURL = "tcp://localhost:5672?ssl='true'"; + AMQBrokerDetails broker = new AMQBrokerDetails(brokerURL); + ConnectionSettings connectionSettings = broker.buildConnectionSettings(); + assertFalse(String.format("Unexpected '%s' option value", BrokerDetails.OPTIONS_SSL_VERIFY_HOSTNAME), + connectionSettings.isVerifyHostname()); + assertNull(String.format("Unexpected '%s' property value", BrokerDetails.OPTIONS_SSL_VERIFY_HOSTNAME), + broker.getProperty(BrokerDetails.OPTIONS_SSL_VERIFY_HOSTNAME)); + } } -- cgit v1.2.1