Fix merged tests

Signed-off-by: Peter Nied <petern@amazon.com>

build.gradle

@@ -470,9 +470,7 @@ sourceSets {
 task integrationTest(type: Test) {
     doFirst {
         // Only run resources tests on resource-test CI environments or locally
-        if (System.getenv('CI_ENVIRONMENT') == 'resource-test' || System.getenv('CI_ENVIRONMENT') == null) {
-            include '**/ResourceFocusedTests.class'
-        } else {
+        if (System.getenv('CI_ENVIRONMENT') != 'resource-test' && System.getenv('CI_ENVIRONMENT') != null) {
             exclude '**/ResourceFocusedTests.class'
         }
         // Only run with retries while in CI systems

src/integrationTest/java/org/opensearch/security/CrossClusterSearchTests.java

@@ -18,6 +18,7 @@
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 

src/integrationTest/java/org/opensearch/security/IpBruteForceAttacksPreventionTests.java

@@ -37,8 +37,8 @@
 @RunWith(com.carrotsearch.randomizedtesting.RandomizedRunner.class)
 @ThreadLeakScope(ThreadLeakScope.Scope.NONE)
 public class IpBruteForceAttacksPreventionTests {
-    private static final User USER_1 = new User("simple-user-1").roles(ALL_ACCESS);
-    private static final User USER_2 = new User("simple-user-2").roles(ALL_ACCESS);
+    protected static final User USER_1 = new User("simple-user-1").roles(ALL_ACCESS);
+    protected static final User USER_2 = new User("simple-user-2").roles(ALL_ACCESS);
 
     public static final int ALLOWED_TRIES = 3;
     public static final int TIME_WINDOW_SECONDS = 3;
@@ -52,7 +52,7 @@ public class IpBruteForceAttacksPreventionTests {
     public static final String CLIENT_IP_8 = "127.0.0.8";
     public static final String CLIENT_IP_9 = "127.0.0.9";
 
-    private static final AuthFailureListeners listener = new AuthFailureListeners().addRateLimit(
+    protected static final AuthFailureListeners listener = new AuthFailureListeners().addRateLimit(
         new RateLimiting("internal_authentication_backend_limiting").type("ip")
             .allowedTries(ALLOWED_TRIES)
             .timeWindowSeconds(TIME_WINDOW_SECONDS)
@@ -156,7 +156,7 @@ public void shouldReleaseIpAddressLock() throws InterruptedException {
         }
     }
 
-    private static void authenticateUserWithIncorrectPassword(String sourceIpAddress, User user, int numberOfRequests) {
+    private void authenticateUserWithIncorrectPassword(String sourceIpAddress, User user, int numberOfRequests) {
         var clientConfiguration = new TestRestClientConfiguration().username(user.getName())
             .password("incorrect password")
             .sourceInetAddress(sourceIpAddress);

src/integrationTest/java/org/opensearch/security/http/JwtAuthenticationTests.java

@@ -18,8 +18,8 @@
 import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
 import io.jsonwebtoken.SignatureAlgorithm;
 import io.jsonwebtoken.security.Keys;
-import org.apache.http.Header;
-import org.apache.http.message.BasicHeader;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.message.BasicHeader;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Rule;

src/integrationTest/java/org/opensearch/security/http/JwtAuthorizationHeaderFactory.java

@@ -19,8 +19,8 @@
 import com.google.common.collect.ImmutableMap;
 import io.jsonwebtoken.Jwts;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.Header;
-import org.apache.http.message.BasicHeader;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.message.BasicHeader;
 
 import static io.jsonwebtoken.SignatureAlgorithm.RS256;
 import static java.util.Objects.requireNonNull;

src/integrationTest/java/org/opensearch/security/http/LdapTlsAuthenticationTest.java

@@ -14,7 +14,7 @@
 import java.util.Map;
 
 import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
-import org.apache.http.message.BasicHeader;
+import org.apache.hc.core5.http.message.BasicHeader;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Rule;

src/integrationTest/java/org/opensearch/test/framework/cluster/OpenSearchClientProvider.java

@@ -28,8 +28,6 @@
 
 package org.opensearch.test.framework.cluster;
 
-import static org.opensearch.test.framework.cluster.TestRestClientConfiguration.getBasicAuthHeader;
-
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.URI;
@@ -47,15 +45,26 @@
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLEngine;
 import javax.net.ssl.TrustManagerFactory;
 
+import org.apache.hc.client5.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
+import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
-import org.apache.http.Header;
-import org.apache.http.HttpHost;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.conn.ssl.NoopHostnameVerifier;
-import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManagerBuilder;
+import org.apache.hc.client5.http.nio.AsyncClientConnectionManager;
+import org.apache.hc.client5.http.ssl.ClientTlsStrategyBuilder;
+import org.apache.hc.client5.http.ssl.NoopHostnameVerifier;
+import org.apache.hc.core5.function.Factory;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.nio.ssl.TlsStrategy;
+import org.apache.hc.core5.reactor.ssl.TlsDetails;
+import org.apache.hc.core5.http.message.BasicHeader;
+import org.opensearch.client.RestClient;
+import org.opensearch.client.RestClientBuilder;
+import org.apache.hc.core5.reactor.ssl.TlsDetails;
 import org.apache.http.nio.conn.ssl.SSLIOSessionStrategy;
 import org.opensearch.client.RestClient;
 import org.opensearch.client.RestClientBuilder;
@@ -64,6 +73,8 @@
 import org.opensearch.test.framework.certificate.CertificateData;
 import org.opensearch.test.framework.certificate.TestCertificates;
 
+import static org.opensearch.test.framework.cluster.TestRestClientConfiguration.getBasicAuthHeader;
+
 /**
 * OpenSearchClientProvider provides methods to get a REST client for an underlying cluster or node.
 *

src/integrationTest/java/org/opensearch/test/framework/cluster/TestRestClient.java

@@ -67,24 +67,6 @@
 import org.apache.hc.core5.http.io.entity.StringEntity;
 import org.apache.hc.core5.http.message.BasicHeader;
 import org.apache.hc.core5.net.URIBuilder;
-import org.apache.http.Header;
-import org.apache.http.HttpEntity;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpDelete;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpHead;
-import org.apache.http.client.methods.HttpOptions;
-import org.apache.http.client.methods.HttpPatch;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpPut;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.conn.routing.HttpRoutePlanner;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.message.BasicHeader;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -149,7 +131,7 @@ public HttpResponse getOnBehalfOfToken(String jsonData, Header... headers) {
             HttpPost httpPost = new HttpPost(
                 new URIBuilder(getHttpServerUri() + "/_plugins/_security/api/generateonbehalfoftoken?pretty").build()
             );
-            httpPost.setEntity(toStringEntity(jsonData));
+            httpPost.setEntity(new StringEntity(jsonData));
             return executeRequest(httpPost, mergeHeaders(CONTENT_TYPE_JSON, headers));
         } catch (URISyntaxException ex) {
             throw new RuntimeException("Incorrect URI syntax", ex);
@@ -159,7 +141,7 @@ public HttpResponse getOnBehalfOfToken(String jsonData, Header... headers) {
     public HttpResponse changeInternalUserPassword(String jsonData, Header... headers) {
         try {
             HttpPut httpPut = new HttpPut(new URIBuilder(getHttpServerUri() + "/_plugins/_security/api/account?pretty").build());
-            httpPut.setEntity(toStringEntity(jsonData));
+            httpPut.setEntity(new StringEntity(jsonData));
             return executeRequest(httpPut, mergeHeaders(CONTENT_TYPE_JSON, headers));
         } catch (URISyntaxException ex) {
             throw new RuntimeException("Incorrect URI syntax", ex);
@@ -185,7 +167,7 @@ public HttpResponse options(String path, Header... headers) {
 
     public HttpResponse putJson(String path, String body, Header... headers) {
         HttpPut uriRequest = new HttpPut(getHttpServerUri() + "/" + path);
-        uriRequest.setEntity(toStringEntity(body));
+        uriRequest.setEntity(new StringEntity(body));
         return executeRequest(uriRequest, mergeHeaders(CONTENT_TYPE_JSON, headers));
     }
 
@@ -197,18 +179,10 @@ public String getMethod() {
                 return "GET";
             }
         };
-        uriRequest.setEntity(toStringEntity(body));
+        uriRequest.setEntity(new StringEntity(body));
         return executeRequest(uriRequest, mergeHeaders(CONTENT_TYPE_JSON, headers));
     }
 
-    private StringEntity toStringEntity(String body) {
-        try {
-            return new StringEntity(body);
-        } catch (UnsupportedEncodingException uee) {
-            throw new RuntimeException(uee);
-        }
-    }
-
     public HttpResponse putJson(String path, ToXContentObject body) {
         return putJson(path, Strings.toString(XContentType.JSON, body));
     }
@@ -224,7 +198,7 @@ public HttpResponse delete(String path, Header... headers) {
 
     public HttpResponse postJson(String path, String body, Header... headers) {
         HttpPost uriRequest = new HttpPost(getHttpServerUri() + "/" + path);
-        uriRequest.setEntity(toStringEntity(body));
+        uriRequest.setEntity(new StringEntity(body));
         return executeRequest(uriRequest, mergeHeaders(CONTENT_TYPE_JSON, headers));
     }
 
@@ -239,7 +213,7 @@ public HttpResponse post(String path) {
 
     public HttpResponse patch(String path, String body) {
         HttpPatch uriRequest = new HttpPatch(getHttpServerUri() + "/" + path);
-        uriRequest.setEntity(toStringEntity(body));
+        uriRequest.setEntity(new StringEntity(body));
         return executeRequest(uriRequest, CONTENT_TYPE_JSON);
     }
 

src/integrationTest/java/org/opensearch/test/framework/cluster/TestRestClientConfiguration.java

@@ -22,8 +22,8 @@
 import java.util.stream.Stream;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.Header;
-import org.apache.http.message.BasicHeader;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.message.BasicHeader;
 
 import org.opensearch.test.framework.cluster.OpenSearchClientProvider.UserCredentialsHolder;