Disable DNS resolution when using TLS

Fixes #400
rabbitmq · Aug 27, 2018 · 8dde8b5 · 8dde8b5
1 parent 02b21b6
commit 8dde8b5
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 1 deletion.
diff --git a/src/main/java/com/rabbitmq/client/ConnectionFactory.java b/src/main/java/com/rabbitmq/client/ConnectionFactory.java
@@ -1219,7 +1219,7 @@ public Connection newConnection(ExecutorService executor, String connectionName)
     }
 
     protected AddressResolver createAddressResolver(List<Address> addresses) {
-        if(addresses.size() == 1) {
+        if(addresses.size() == 1 && !isSSL()) {
             return new DnsRecordIpAddressResolver(addresses.get(0), isSSL());
         } else {
             return new ListAddressResolver(addresses);

diff --git a/src/test/java/com/rabbitmq/client/test/ConnectionFactoryTest.java b/src/test/java/com/rabbitmq/client/test/ConnectionFactoryTest.java
@@ -16,22 +16,32 @@
 package com.rabbitmq.client.test;
 
 import com.rabbitmq.client.Address;
+import com.rabbitmq.client.AddressResolver;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.ConnectionFactory;
+import com.rabbitmq.client.DnsRecordIpAddressResolver;
+import com.rabbitmq.client.ListAddressResolver;
 import com.rabbitmq.client.MetricsCollector;
 import com.rabbitmq.client.impl.AMQConnection;
 import com.rabbitmq.client.impl.ConnectionParams;
 import com.rabbitmq.client.impl.CredentialsProvider;
 import com.rabbitmq.client.impl.FrameHandler;
 import com.rabbitmq.client.impl.FrameHandlerFactory;
+import org.hamcrest.Matchers;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.IOException;
+import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
 
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
@@ -90,4 +100,53 @@ protected AMQConnection createConnection(ConnectionParams params, FrameHandler f
         assertTrue(createCalled.get());
     }
 
+    @Test public void shouldUseDnsResolutionWhenOneAddressAndNoTls() throws Exception {
+        AMQConnection connection = mock(AMQConnection.class);
+        AtomicReference<AddressResolver> addressResolver = new AtomicReference<>();
+
+        ConnectionFactory connectionFactory = new ConnectionFactory() {
+            @Override
+            protected AMQConnection createConnection(ConnectionParams params, FrameHandler frameHandler,
+                MetricsCollector metricsCollector) {
+                return connection;
+            }
+
+            @Override
+            protected AddressResolver createAddressResolver(List<Address> addresses) {
+                addressResolver.set(super.createAddressResolver(addresses));
+                return addressResolver.get();
+            }
+        };
+
+        doNothing().when(connection).start();
+        connectionFactory.newConnection();
+
+        assertThat(addressResolver.get(), allOf(notNullValue(), instanceOf(DnsRecordIpAddressResolver.class)));
+    }
+
+    @Test public void shouldNotUseDnsResolutionWhenOneAddressAndNoTls() throws Exception {
+        AMQConnection connection = mock(AMQConnection.class);
+        AtomicReference<AddressResolver> addressResolver = new AtomicReference<>();
+
+        ConnectionFactory connectionFactory = new ConnectionFactory() {
+            @Override
+            protected AMQConnection createConnection(ConnectionParams params, FrameHandler frameHandler,
+                MetricsCollector metricsCollector) {
+                return connection;
+            }
+
+            @Override
+            protected AddressResolver createAddressResolver(List<Address> addresses) {
+                addressResolver.set(super.createAddressResolver(addresses));
+                return addressResolver.get();
+            }
+        };
+
+        doNothing().when(connection).start();
+        connectionFactory.useSslProtocol();
+        connectionFactory.newConnection();
+
+        assertThat(addressResolver.get(), allOf(notNullValue(), instanceOf(ListAddressResolver.class)));
+    }
+
 }