Using localhost (not local loopback) in SurefireForkChannel.java

apache · Jun 6, 2020 · 5f492fa · 5f492fa
1 parent eb48f1b
commit 5f492fa
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/...common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireForkChannel.java b/...common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireForkChannel.java
@@ -84,7 +84,7 @@ final class SurefireForkChannel extends ForkChannel
         super( arguments );
         server = open( withThreadPool( THREAD_POOL ) );
         setTrueOptions( SO_REUSEADDR, TCP_NODELAY, SO_KEEPALIVE );
-        InetAddress ip = Inet4Address.getLoopbackAddress();
+        InetAddress ip = Inet4Address.getLocalHost();
         server.bind( new InetSocketAddress( ip, 0 ), 1 );
         InetSocketAddress localAddress = (InetSocketAddress) server.getLocalAddress();
         localHost = localAddress.getHostString();

diff --git a/...n-surefire-common/src/test/java/org/apache/maven/surefire/extensions/ForkChannelTest.java b/...n-surefire-common/src/test/java/org/apache/maven/surefire/extensions/ForkChannelTest.java
@@ -33,6 +33,7 @@
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
+import java.net.InetAddress;
 import java.net.Socket;
 import java.net.URI;
 import java.nio.ByteBuffer;
@@ -98,9 +99,10 @@ public ConsoleLogger getConsoleLogger()
             assertThat( channel.getCountdownCloseablePermits() )
                 .isEqualTo( 3 );
 
+            String localHost = InetAddress.getLocalHost().getHostAddress();
             assertThat( channel.getForkNodeConnectionString() )
-                .startsWith( "tcp://127.0.0.1:" )
-                .isNotEqualTo( "tcp://127.0.0.1:" );
+                .startsWith( "tcp://" + localHost + ":" )
+                .isNotEqualTo( "tcp://" + localHost + ":" );
 
             URI uri = new URI( channel.getForkNodeConnectionString() );
 
@@ -171,7 +173,7 @@ private Client( int port )
         @Override
         public void run()
         {
-            try ( Socket socket = new Socket( "127.0.0.1", port ) )
+            try ( Socket socket = new Socket( InetAddress.getLocalHost().getHostAddress(), port ) )
             {
                 byte[] data = new byte[128];
                 int readLength = socket.getInputStream().read( data );

diff --git a/surefire-api/src/test/java/org/apache/maven/surefire/api/util/internal/AsyncSocketTest.java b/surefire-api/src/test/java/org/apache/maven/surefire/api/util/internal/AsyncSocketTest.java
@@ -191,7 +191,7 @@ public void run()
     @SuppressWarnings( "checkstyle:magicnumber" )
     private void client() throws Exception
     {
-        InetSocketAddress hostAddress = new InetSocketAddress( InetAddress.getLoopbackAddress(), address.getPort() );
+        InetSocketAddress hostAddress = new InetSocketAddress( InetAddress.getLocalHost(), address.getPort() );
         AsynchronousSocketChannel clientSocketChannel = AsynchronousSocketChannel.open();
         clientSocketChannel.connect( hostAddress ).get(); // Wait until connection is done.
         InputStream is = new BufferedInputStream( newInputStream( clientSocketChannel ), 64 * 1024 );