honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NETWORKING: Fix IpFiltering Test (#35730) 

* The port assigned to all loopback interfaces doesn't necessarily have to be the same  for ipv4 and ipv6
=> use actual address from profile instead of just port + loopback in test
* Closes #35584
This commit is contained in:
Armin Braun 2018-11-20 17:50:08 +01:00 committed by GitHub
parent e91f404d16
commit 89cf4a7397
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/transport/filter/IpFilteringIntegrationTests.java
View File

@ -19,7 +19,6 @@ import org.junit.BeforeClass;
import java.io.IOException;
import java.io.OutputStream;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.nio.charset.StandardCharsets;
@ -69,7 +68,7 @@ public class IpFilteringIntegrationTests extends SecurityIntegTestCase {
public void testThatIpFilteringIsAppliedForProfile() throws Exception {
try (Socket socket = new Socket()){
trySocketConnection(socket, new InetSocketAddress(InetAddress.getLoopbackAddress(), getProfilePort("client")));
trySocketConnection(socket, getProfileAddress("client"));
assertThat(socket.isClosed(), is(true));
}
}
@ -86,9 +85,9 @@ public class IpFilteringIntegrationTests extends SecurityIntegTestCase {
}
}
private static int getProfilePort(String profile) {
private static InetSocketAddress getProfileAddress(String profile) {
TransportAddress transportAddress =
randomFrom(internalCluster().getInstance(Transport.class).profileBoundAddresses().get(profile).boundAddresses());
return transportAddress.address().getPort();
return transportAddress.address();
}
}