diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 396c13b2c7981..f2c63698030e8 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -37,7 +37,6 @@ commonslogging = 1.1.3 commonscodec = 1.13 hamcrest = 2.1 securemock = 1.2 -mocksocket = 1.2 mockito = 1.9.5 objenesis = 1.0 diff --git a/libs/secure-sm/src/main/java/org/opensearch/secure_sm/SecureSM.java b/libs/secure-sm/src/main/java/org/opensearch/secure_sm/SecureSM.java index 016d5a2af4573..ddb5f824781a9 100644 --- a/libs/secure-sm/src/main/java/org/opensearch/secure_sm/SecureSM.java +++ b/libs/secure-sm/src/main/java/org/opensearch/secure_sm/SecureSM.java @@ -35,7 +35,9 @@ import java.security.AccessController; import java.security.Permission; import java.security.PrivilegedAction; +import java.util.Arrays; import java.util.Objects; +import java.util.Set; /** * Extension of SecurityManager that works around a few design flaws in Java Security. @@ -104,11 +106,49 @@ public SecureSM(final String[] classesThatCanExit) { *
  • org.eclipse.internal.junit.runner.
    • *
  • com.intellij.rt.execution.junit.
    • * + * + * For testing purposes, the security manager grants network permissions "connect, accept" + * to following classes, granted they only access local network interfaces. + * + * * * @return an instance of SecureSM where test packages can halt or exit the virtual machine */ - public static SecureSM createTestSecureSM() { - return new SecureSM(TEST_RUNNER_PACKAGES); + public static SecureSM createTestSecureSM(final Set trustedHosts) { + return new SecureSM(TEST_RUNNER_PACKAGES) { + // Trust these callers inside the test suite only + final String[] TRUSTED_CALLERS = new String[] { + "sun.net.httpserver.ServerImpl", + "java.net.ServerSocket", + "java.net.Socket" + }; + + @Override + public void checkConnect(String host, int port) { + // Allow to connect from selected trusted classes to local addresses only + if (!hasTrustedCallerChain() || !trustedHosts.contains(host)) { + super.checkConnect(host, port); + } + } + + @Override + public void checkAccept(String host, int port) { + // Allow to accept connections from selected trusted classes to local addresses only + if (!hasTrustedCallerChain() || !trustedHosts.contains(host)) { + super.checkAccept(host, port); + } + } + + private boolean hasTrustedCallerChain() { + return Arrays + .stream(getClassContext()) + .anyMatch(c -> Arrays.stream(TRUSTED_CALLERS).anyMatch(t -> c.getName().startsWith(t))); + } + }; } static final String[] TEST_RUNNER_PACKAGES = new String[] { diff --git a/libs/secure-sm/src/test/java/org/opensearch/secure_sm/SecureSMTests.java b/libs/secure-sm/src/test/java/org/opensearch/secure_sm/SecureSMTests.java index a74fc8576b9c9..d1fa607429d86 100644 --- a/libs/secure-sm/src/test/java/org/opensearch/secure_sm/SecureSMTests.java +++ b/libs/secure-sm/src/test/java/org/opensearch/secure_sm/SecureSMTests.java @@ -37,6 +37,7 @@ import java.security.Permission; import java.security.Policy; import java.security.ProtectionDomain; +import java.util.Collections; import java.util.concurrent.atomic.AtomicBoolean; /** Simple tests for SecureSM */ @@ -57,7 +58,7 @@ public boolean implies(ProtectionDomain domain, Permission permission) { return true; } }); - System.setSecurityManager(SecureSM.createTestSecureSM()); + System.setSecurityManager(SecureSM.createTestSecureSM(Collections.emptySet())); } @SuppressForbidden(reason = "testing that System#exit is blocked") diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java index 0e944907b4f8f..cf36dae2cac87 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java @@ -47,7 +47,6 @@ import org.opensearch.common.ssl.PemTrustConfig; import org.opensearch.env.Environment; import org.opensearch.env.TestEnvironment; -import org.elasticsearch.mocksocket.MockHttpServer; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.watcher.ResourceWatcherService; import org.hamcrest.Matchers; @@ -91,7 +90,7 @@ public class ReindexRestClientSslTests extends OpenSearchTestCase { public static void setupHttpServer() throws Exception { InetSocketAddress address = new InetSocketAddress("localhost", 0); SSLContext sslContext = buildServerSslContext(); - server = MockHttpServer.createHttps(address, 0); + server = HttpsServer.create(address, 0); server.setHttpsConfigurator(new ClientAuthHttpsConfigurator(sslContext)); server.start(); server.createContext("/", http -> { diff --git a/modules/repository-url/src/test/java/org/opensearch/common/blobstore/url/URLBlobStoreTests.java b/modules/repository-url/src/test/java/org/opensearch/common/blobstore/url/URLBlobStoreTests.java index de4afc9d333c7..90b75f50b16ad 100644 --- a/modules/repository-url/src/test/java/org/opensearch/common/blobstore/url/URLBlobStoreTests.java +++ b/modules/repository-url/src/test/java/org/opensearch/common/blobstore/url/URLBlobStoreTests.java @@ -37,7 +37,6 @@ import org.opensearch.common.blobstore.BlobContainer; import org.opensearch.common.blobstore.BlobPath; import org.opensearch.common.settings.Settings; -import org.elasticsearch.mocksocket.MockHttpServer; import org.opensearch.test.OpenSearchTestCase; import org.junit.AfterClass; import org.junit.Before; @@ -67,7 +66,7 @@ public static void startHttp() throws Exception { } blobName = randomAlphaOfLength(8); - httpServer = MockHttpServer.createHttp(new InetSocketAddress(InetAddress.getLoopbackAddress().getHostAddress(), 6001), 0); + httpServer = HttpServer.create(new InetSocketAddress(InetAddress.getLoopbackAddress().getHostAddress(), 6001), 0); httpServer.createContext("/indices/" + blobName, (s) -> { s.sendResponseHeaders(200, message.length); diff --git a/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/Netty4SizeHeaderFrameDecoderTests.java b/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/Netty4SizeHeaderFrameDecoderTests.java index e48946946ca7c..e7d4d6060535b 100644 --- a/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/Netty4SizeHeaderFrameDecoderTests.java +++ b/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/Netty4SizeHeaderFrameDecoderTests.java @@ -40,7 +40,6 @@ import org.opensearch.common.util.MockPageCacheRecycler; import org.opensearch.common.util.PageCacheRecycler; import org.opensearch.indices.breaker.NoneCircuitBreakerService; -import org.elasticsearch.mocksocket.MockSocket; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.SharedGroupFactory; @@ -100,7 +99,7 @@ public void testThatTextMessageIsReturnedOnHTTPLikeRequest() throws Exception { String randomMethod = randomFrom("GET", "POST", "PUT", "DELETE", "HEAD", "OPTIONS", "PATCH"); String data = randomMethod + " / HTTP/1.1"; - try (Socket socket = new MockSocket(host, port)) { + try (Socket socket = new Socket(host, port)) { socket.getOutputStream().write(data.getBytes(StandardCharsets.UTF_8)); socket.getOutputStream().flush(); @@ -111,7 +110,7 @@ public void testThatTextMessageIsReturnedOnHTTPLikeRequest() throws Exception { } public void testThatNothingIsReturnedForOtherInvalidPackets() throws Exception { - try (Socket socket = new MockSocket(host, port)) { + try (Socket socket = new Socket(host, port)) { socket.getOutputStream().write("FOOBAR".getBytes(StandardCharsets.UTF_8)); socket.getOutputStream().flush(); diff --git a/plugins/discovery-azure-classic/src/internalClusterTest/java/org/opensearch/discovery/azure/classic/AzureDiscoveryClusterFormationTests.java b/plugins/discovery-azure-classic/src/internalClusterTest/java/org/opensearch/discovery/azure/classic/AzureDiscoveryClusterFormationTests.java index c128756fe062a..ab344baceba8d 100644 --- a/plugins/discovery-azure-classic/src/internalClusterTest/java/org/opensearch/discovery/azure/classic/AzureDiscoveryClusterFormationTests.java +++ b/plugins/discovery-azure-classic/src/internalClusterTest/java/org/opensearch/discovery/azure/classic/AzureDiscoveryClusterFormationTests.java @@ -46,7 +46,6 @@ import org.opensearch.common.settings.Settings; import org.opensearch.discovery.DiscoveryModule; import org.opensearch.env.Environment; -import org.elasticsearch.mocksocket.MockHttpServer; import org.opensearch.node.Node; import org.opensearch.plugin.discovery.azure.classic.AzureDiscoveryPlugin; import org.opensearch.plugins.Plugin; @@ -163,7 +162,7 @@ protected Path nodeConfigPath(int nodeOrdinal) { public static void startHttpd() throws Exception { logDir = createTempDir(); SSLContext sslContext = getSSLContext(); - httpsServer = MockHttpServer.createHttps(new InetSocketAddress(InetAddress.getLoopbackAddress().getHostAddress(), 0), 0); + httpsServer = HttpsServer.create(new InetSocketAddress(InetAddress.getLoopbackAddress().getHostAddress(), 0), 0); httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext)); httpsServer.createContext("/subscription/services/hostedservices/myservice", (s) -> { Headers headers = s.getResponseHeaders(); diff --git a/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/AbstractEC2MockAPITestCase.java b/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/AbstractEC2MockAPITestCase.java index 5f51e6221658a..51b48a8a45f21 100644 --- a/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/AbstractEC2MockAPITestCase.java +++ b/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/AbstractEC2MockAPITestCase.java @@ -40,7 +40,6 @@ import org.opensearch.common.settings.MockSecureSettings; import org.opensearch.common.settings.Settings; import org.opensearch.core.internal.io.IOUtils; -import org.elasticsearch.mocksocket.MockHttpServer; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.transport.MockTransportService; import org.opensearch.threadpool.TestThreadPool; @@ -74,7 +73,7 @@ public abstract class AbstractEC2MockAPITestCase extends OpenSearchTestCase { @Before public void setUp() throws Exception { - httpServer = MockHttpServer.createHttp(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0), 0); + httpServer = HttpServer.create(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0), 0); httpServer.start(); threadPool = new TestThreadPool(EC2RetriesTests.class.getName()); transportService = createTransportService(); diff --git a/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/Ec2NetworkTests.java b/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/Ec2NetworkTests.java index 627369bd4b32f..7544ad51b568a 100644 --- a/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/Ec2NetworkTests.java +++ b/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/Ec2NetworkTests.java @@ -38,7 +38,6 @@ import org.opensearch.common.SuppressForbidden; import org.opensearch.common.network.NetworkService; import org.opensearch.common.settings.Settings; -import org.elasticsearch.mocksocket.MockHttpServer; import org.opensearch.rest.RestStatus; import org.opensearch.test.OpenSearchTestCase; @@ -74,7 +73,7 @@ public class Ec2NetworkTests extends OpenSearchTestCase { @BeforeClass public static void startHttp() throws Exception { - httpServer = MockHttpServer.createHttp(new InetSocketAddress(InetAddress.getLoopbackAddress().getHostAddress(), 0), 0); + httpServer = HttpServer.create(new InetSocketAddress(InetAddress.getLoopbackAddress().getHostAddress(), 0), 0); BiConsumer registerContext = (path, v) ->{ final byte[] message = v.getBytes(UTF_8); diff --git a/plugins/examples/rest-handler/src/javaRestTest/java/org/opensearch/example/resthandler/ExampleFixtureIT.java b/plugins/examples/rest-handler/src/javaRestTest/java/org/opensearch/example/resthandler/ExampleFixtureIT.java index d2c2b540e2f31..0d50f9efbecd4 100644 --- a/plugins/examples/rest-handler/src/javaRestTest/java/org/opensearch/example/resthandler/ExampleFixtureIT.java +++ b/plugins/examples/rest-handler/src/javaRestTest/java/org/opensearch/example/resthandler/ExampleFixtureIT.java @@ -32,7 +32,6 @@ package org.opensearch.example.resthandler; -import org.elasticsearch.mocksocket.MockSocket; import org.opensearch.test.OpenSearchTestCase; import java.io.BufferedReader; @@ -57,7 +56,7 @@ public void testExample() throws Exception { final URL url = new URL("http://" + externalAddress); final InetAddress address = InetAddress.getByName(url.getHost()); try ( - Socket socket = new MockSocket(address, url.getPort()); + Socket socket = new Socket(address, url.getPort()); BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(socket.getOutputStream(), StandardCharsets.UTF_8)); BufferedReader reader = new BufferedReader(new InputStreamReader(socket.getInputStream(), StandardCharsets.UTF_8)) ) { diff --git a/plugins/repository-azure/src/test/java/org/opensearch/repositories/azure/AzureBlobContainerRetriesTests.java b/plugins/repository-azure/src/test/java/org/opensearch/repositories/azure/AzureBlobContainerRetriesTests.java index 10bbb2e984aa9..99d26c2bb3067 100644 --- a/plugins/repository-azure/src/test/java/org/opensearch/repositories/azure/AzureBlobContainerRetriesTests.java +++ b/plugins/repository-azure/src/test/java/org/opensearch/repositories/azure/AzureBlobContainerRetriesTests.java @@ -56,7 +56,6 @@ import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.CountDown; -import org.elasticsearch.mocksocket.MockHttpServer; import org.opensearch.rest.RestStatus; import org.opensearch.rest.RestUtils; import org.opensearch.test.OpenSearchTestCase; @@ -118,7 +117,7 @@ public class AzureBlobContainerRetriesTests extends OpenSearchTestCase { @Before public void setUp() throws Exception { threadPool = new TestThreadPool(getTestClass().getName(), AzureRepositoryPlugin.executorBuilder()); - httpServer = MockHttpServer.createHttp(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0), 0); + httpServer = HttpServer.create(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0), 0); httpServer.start(); super.setUp(); } diff --git a/server/src/main/resources/org/opensearch/bootstrap/test-framework.policy b/server/src/main/resources/org/opensearch/bootstrap/test-framework.policy index 3e70d8618742d..bddb54d1ceb71 100644 --- a/server/src/main/resources/org/opensearch/bootstrap/test-framework.policy +++ b/server/src/main/resources/org/opensearch/bootstrap/test-framework.policy @@ -73,11 +73,6 @@ grant codeBase "${codebase.junit}" { permission java.lang.reflect.ReflectPermission "suppressAccessChecks"; }; -grant codeBase "${codebase.mocksocket}" { - // mocksocket makes and accepts socket connections - permission java.net.SocketPermission "*", "accept,connect"; -}; - grant codeBase "${codebase.opensearch-nio}" { // opensearch-nio makes and accepts socket connections permission java.net.SocketPermission "*", "accept,connect"; diff --git a/server/src/test/java/org/opensearch/transport/RemoteClusterConnectionTests.java b/server/src/test/java/org/opensearch/transport/RemoteClusterConnectionTests.java index dc5d7069b2442..6baa959c5361c 100644 --- a/server/src/test/java/org/opensearch/transport/RemoteClusterConnectionTests.java +++ b/server/src/test/java/org/opensearch/transport/RemoteClusterConnectionTests.java @@ -63,7 +63,6 @@ import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.core.internal.io.IOUtils; import org.opensearch.index.IndexNotFoundException; -import org.elasticsearch.mocksocket.MockServerSocket; import org.opensearch.search.SearchHit; import org.opensearch.search.SearchHits; import org.opensearch.search.aggregations.InternalAggregations; @@ -180,7 +179,7 @@ public static MockTransportService startTransport( @SuppressForbidden(reason = "calls getLocalHost here but it's fine in this case") public void testSlowNodeCanBeCancelled() throws IOException, InterruptedException { - try (ServerSocket socket = new MockServerSocket()) { + try (ServerSocket socket = new ServerSocket()) { socket.bind(new InetSocketAddress(InetAddress.getLocalHost(), 0), 1); socket.setReuseAddress(true); DiscoveryNode seedNode = new DiscoveryNode("TEST", new TransportAddress(socket.getInetAddress(), diff --git a/test/framework/build.gradle b/test/framework/build.gradle index 69c3a39b6a9aa..984401736dad5 100644 --- a/test/framework/build.gradle +++ b/test/framework/build.gradle @@ -46,7 +46,6 @@ dependencies { api "commons-logging:commons-logging:${versions.commonslogging}" api "commons-codec:commons-codec:${versions.commonscodec}" api "org.elasticsearch:securemock:${versions.securemock}" - api "org.elasticsearch:mocksocket:${versions.mocksocket}" } compileJava.options.compilerArgs -= '-Xlint:cast' diff --git a/test/framework/src/main/java/org/opensearch/bootstrap/BootstrapForTesting.java b/test/framework/src/main/java/org/opensearch/bootstrap/BootstrapForTesting.java index 8b860ff7beb2d..0a12d8830babc 100644 --- a/test/framework/src/main/java/org/opensearch/bootstrap/BootstrapForTesting.java +++ b/test/framework/src/main/java/org/opensearch/bootstrap/BootstrapForTesting.java @@ -42,12 +42,15 @@ import org.opensearch.common.io.FileSystemUtils; import org.opensearch.common.io.PathUtils; import org.opensearch.common.network.IfConfig; +import org.opensearch.common.network.NetworkAddress; import org.opensearch.common.settings.Settings; import org.opensearch.plugins.PluginInfo; import org.opensearch.secure_sm.SecureSM; import org.junit.Assert; import java.io.InputStream; +import java.net.NetworkInterface; +import java.net.SocketException; import java.net.SocketPermission; import java.net.URL; import java.nio.file.Files; @@ -66,6 +69,7 @@ import java.util.Objects; import java.util.Properties; import java.util.Set; +import java.util.stream.Collectors; import static com.carrotsearch.randomizedtesting.RandomizedTest.systemPropertyAsBoolean; @@ -161,7 +165,7 @@ public boolean implies(ProtectionDomain domain, Permission permission) { return opensearchPolicy.implies(domain, permission) || testFramework.implies(domain, permission); } }); - System.setSecurityManager(SecureSM.createTestSecureSM()); + System.setSecurityManager(SecureSM.createTestSecureSM(getTrustedHosts())); Security.selfTest(); // guarantee plugin classes are initialized first, in case they have one-time hacks. @@ -271,6 +275,25 @@ static Set parseClassPathWithSymlinks() throws Exception { } return raw; } + + /** + * Collect host addresses of all local interfaces so we could check + * if the network connection is being made only on those. + * @return host names and addresses of all local interfaces + */ + private static Set getTrustedHosts() { + // + try { + return Collections + .list(NetworkInterface.getNetworkInterfaces()) + .stream() + .flatMap(iface -> Collections.list(iface.getInetAddresses()).stream()) + .map(address -> NetworkAddress.format(address)) + .collect(Collectors.toSet()); + } catch (final SocketException e) { + return Collections.emptySet(); + } + } // does nothing, just easy way to make sure the class is loaded. public static void ensureInitialized() {} diff --git a/test/framework/src/main/java/org/opensearch/repositories/blobstore/AbstractBlobContainerRetriesTestCase.java b/test/framework/src/main/java/org/opensearch/repositories/blobstore/AbstractBlobContainerRetriesTestCase.java index 8b79b9ca03027..add806728f1a2 100644 --- a/test/framework/src/main/java/org/opensearch/repositories/blobstore/AbstractBlobContainerRetriesTestCase.java +++ b/test/framework/src/main/java/org/opensearch/repositories/blobstore/AbstractBlobContainerRetriesTestCase.java @@ -45,7 +45,6 @@ import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.CountDown; -import org.elasticsearch.mocksocket.MockHttpServer; import org.opensearch.test.OpenSearchTestCase; import org.junit.After; import org.junit.Before; @@ -81,7 +80,7 @@ public abstract class AbstractBlobContainerRetriesTestCase extends OpenSearchTes @Before public void setUp() throws Exception { - httpServer = MockHttpServer.createHttp(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0), 0); + httpServer = HttpServer.create(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0), 0); httpServer.start(); super.setUp(); } diff --git a/test/framework/src/main/java/org/opensearch/repositories/blobstore/OpenSearchMockAPIBasedRepositoryIntegTestCase.java b/test/framework/src/main/java/org/opensearch/repositories/blobstore/OpenSearchMockAPIBasedRepositoryIntegTestCase.java index b2623b9cfcb06..4a978a7171cad 100644 --- a/test/framework/src/main/java/org/opensearch/repositories/blobstore/OpenSearchMockAPIBasedRepositoryIntegTestCase.java +++ b/test/framework/src/main/java/org/opensearch/repositories/blobstore/OpenSearchMockAPIBasedRepositoryIntegTestCase.java @@ -47,7 +47,6 @@ import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.network.InetAddresses; import org.opensearch.common.settings.Settings; -import org.elasticsearch.mocksocket.MockHttpServer; import org.opensearch.repositories.RepositoriesService; import org.opensearch.repositories.Repository; import org.opensearch.repositories.RepositoryMissingException; @@ -102,7 +101,7 @@ protected interface BlobStoreHttpHandler extends HttpHandler { @BeforeClass public static void startHttpServer() throws Exception { - httpServer = MockHttpServer.createHttp(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0), 0); + httpServer = HttpServer.create(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0), 0); httpServer.setExecutor(r -> { try { r.run(); diff --git a/test/framework/src/main/java/org/opensearch/transport/AbstractSimpleTransportTestCase.java b/test/framework/src/main/java/org/opensearch/transport/AbstractSimpleTransportTestCase.java index b3bf875a7e3cd..f3d3c75d6561c 100644 --- a/test/framework/src/main/java/org/opensearch/transport/AbstractSimpleTransportTestCase.java +++ b/test/framework/src/main/java/org/opensearch/transport/AbstractSimpleTransportTestCase.java @@ -64,7 +64,6 @@ import org.opensearch.common.util.concurrent.AbstractRunnable; import org.opensearch.common.util.concurrent.ConcurrentCollections; import org.opensearch.core.internal.io.IOUtils; -import org.elasticsearch.mocksocket.MockServerSocket; import org.opensearch.node.Node; import org.opensearch.tasks.Task; import org.opensearch.test.OpenSearchTestCase; @@ -1938,7 +1937,7 @@ public void testRegisterHandlerTwice() { public void testTimeoutPerConnection() throws IOException { assumeTrue("Works only on BSD network stacks", Constants.MAC_OS_X || Constants.FREE_BSD); - try (ServerSocket socket = new MockServerSocket()) { + try (ServerSocket socket = new ServerSocket()) { // note - this test uses backlog=1 which is implementation specific ie. it might not work on some TCP/IP stacks // on linux (at least newer ones) the listen(addr, backlog=1) should just ignore new connections if the queue is full which // means that once we received an ACK from the client we just drop the packet on the floor (which is what we want) and we run @@ -2057,7 +2056,7 @@ public void testTcpHandshake() { } public void testTcpHandshakeTimeout() throws IOException { - try (ServerSocket socket = new MockServerSocket()) { + try (ServerSocket socket = new ServerSocket()) { socket.bind(getLocalEphemeral(), 1); socket.setReuseAddress(true); DiscoveryNode dummy = new DiscoveryNode("TEST", new TransportAddress(socket.getInetAddress(), @@ -2078,7 +2077,7 @@ public void testTcpHandshakeTimeout() throws IOException { } public void testTcpHandshakeConnectionReset() throws IOException, InterruptedException { - try (ServerSocket socket = new MockServerSocket()) { + try (ServerSocket socket = new ServerSocket()) { socket.bind(getLocalEphemeral(), 1); socket.setReuseAddress(true); DiscoveryNode dummy = new DiscoveryNode("TEST", new TransportAddress(socket.getInetAddress(),