Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
distribution: 'corretto'
java-version: '11'
- name: Run Tests
run: ./mvnw -B -ntp test -Ddocker.tests=true
run: ./mvnw -B -ntp test -Ddocker.tests=true -Dexternal.tests=true

RunOnMacOs:
runs-on: macos-latest
Expand All @@ -44,7 +44,7 @@ jobs:
distribution: 'corretto'
java-version: '11'
- name: Run Tests
run: ./mvnw -B -ntp test
run: ./mvnw -B -ntp test -Dexternal.tests=true

RunOnWindows:
runs-on: windows-latest
Expand All @@ -56,4 +56,4 @@ jobs:
distribution: 'corretto'
java-version: '11'
- name: Run Tests
run: ./mvnw.cmd -B -ntp test
run: ./mvnw.cmd -B -ntp test "-Dexternal.tests=true"
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,8 @@
import org.asynchttpclient.testserver.HttpTest;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Tag;

import java.net.InetSocketAddress;
import java.net.Socket;
import java.util.Arrays;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
Expand All @@ -35,6 +34,7 @@
import static org.asynchttpclient.Dsl.asyncHttpClient;
import static org.asynchttpclient.Dsl.config;
import static org.asynchttpclient.Dsl.get;
import static org.asynchttpclient.test.TestUtils.isExternalNetworkAvailable;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
Expand All @@ -50,15 +50,6 @@ public class AddressResolverGroupTest extends HttpTest {

private HttpServer server;

private static boolean isExternalNetworkAvailable() {
try (Socket socket = new Socket()) {
socket.connect(new InetSocketAddress("www.google.com", 443), 3000);
return true;
} catch (Exception e) {
return false;
}
}

@BeforeEach
public void start() throws Throwable {
server = new HttpServer();
Expand Down Expand Up @@ -143,6 +134,7 @@ public void unknownHostWithDnsResolverGroupFails() throws Throwable {
});
}

@Tag("external")
@RepeatedIfExceptionsTest(repeats = 5)
public void resolveRealDomainWithDnsResolverGroup() throws Throwable {
assumeTrue(isExternalNetworkAvailable(), "External network not available - skipping test");
Expand All @@ -159,6 +151,7 @@ public void resolveRealDomainWithDnsResolverGroup() throws Throwable {
}
}

@Tag("external")
@RepeatedIfExceptionsTest(repeats = 5)
public void resolveMultipleRealDomainsWithDnsResolverGroup() throws Throwable {
assumeTrue(isExternalNetworkAvailable(), "External network not available - skipping test");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -429,19 +429,16 @@ public Integer onCompleted() {
}));
}

// This test is flaky - see https://github.com/AsyncHttpClient/async-http-client/issues/1728#issuecomment-699962325
// For now, just run again if fails
@RepeatedIfExceptionsTest(repeats = 5)
public void asyncOptionsTest() throws Throwable {
withClient().run(client ->
withServer(server).run(server -> {
server.enqueueEcho();

final AtomicReference<HttpHeaders> responseHeaders = new AtomicReference<>();

// Some responses contain the TRACE method, some do not - account for both
final String[] expected = {"GET", "HEAD", "OPTIONS", "POST"};
final String[] expectedWithTrace = {"GET", "HEAD", "OPTIONS", "POST", "TRACE"};
Future<String> f = client.prepareOptions("https://www.google.com/").execute(new AsyncHandlerAdapter() {
final String[] expected = {"GET", "HEAD", "OPTIONS", "POST", "TRACE"};
Future<String> f = client.prepareOptions(getTargetUrl()).execute(new AsyncHandlerAdapter() {

@Override
public State onHeadersReceived(HttpHeaders headers) {
Expand All @@ -458,19 +455,11 @@ public String onCompleted() {
f.get(20, TimeUnit.SECONDS);
HttpHeaders h = responseHeaders.get();
assertNotNull(h);
if (h.contains(ALLOW)) {
String[] values = h.get(ALLOW).split(",|, ");
assertNotNull(values);
// Some responses contain the TRACE method, some do not - account for both
assert values.length == expected.length || values.length == expectedWithTrace.length;
Arrays.sort(values);
// Some responses contain the TRACE method, some do not - account for both
if (values.length == expected.length) {
assertArrayEquals(values, expected);
} else {
assertArrayEquals(values, expectedWithTrace);
}
}
assertTrue(h.contains(ALLOW));
String[] values = h.get(ALLOW).split(",|, ");
assertNotNull(values);
Arrays.sort(values);
assertArrayEquals(expected, values);
}));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ public void unknownHostThrowsUnknownHostException() throws Throwable {
withClient().run(client ->
withServer(server).run(server -> {
try {
client.prepareGet("http://null.gatling.io").execute(new AsyncCompletionHandlerAdapter() {
client.prepareGet("http://nonexistent.invalid").execute(new AsyncCompletionHandlerAdapter() {
@Override
public void onThrowable(Throwable t) {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.asynchttpclient.cookie.CookieEvictionTask;
import org.asynchttpclient.cookie.CookieStore;
import org.asynchttpclient.cookie.ThreadSafeCookieStore;
import org.asynchttpclient.testserver.HttpServer;
import org.junit.jupiter.api.condition.EnabledOnOs;
import org.junit.jupiter.api.condition.OS;

Expand All @@ -35,6 +36,7 @@

import static org.asynchttpclient.Dsl.asyncHttpClient;
import static org.asynchttpclient.Dsl.config;
import static org.asynchttpclient.test.TestUtils.createSslEngineFactory;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
Expand All @@ -52,31 +54,34 @@ public class DefaultAsyncHttpClientTest {
@RepeatedIfExceptionsTest(repeats = 5)
@EnabledOnOs(OS.LINUX)
public void testNativeTransportWithEpollOnly() throws Exception {
AsyncHttpClientConfig config = config().setUseNativeTransport(true).setUseOnlyEpollNativeTransport(true).build();

try (DefaultAsyncHttpClient client = (DefaultAsyncHttpClient) asyncHttpClient(config)) {
assertDoesNotThrow(() -> client.prepareGet("https://www.google.com").execute().get());
assertInstanceOf(EpollEventLoopGroup.class, client.channelManager().getEventLoopGroup());
}
AsyncHttpClientConfig config = config().setUseNativeTransport(true).setUseOnlyEpollNativeTransport(true)
.setSslEngineFactory(createSslEngineFactory()).build();
assertRequestSucceedsAndEventLoopGroupIs(config, EpollEventLoopGroup.class);
}

@RepeatedIfExceptionsTest(repeats = 5)
@EnabledOnOs(OS.LINUX)
public void testNativeTransportWithoutEpollOnly() throws Exception {
AsyncHttpClientConfig config = config().setUseNativeTransport(true).setUseOnlyEpollNativeTransport(false).build();
try (DefaultAsyncHttpClient client = (DefaultAsyncHttpClient) asyncHttpClient(config)) {
assertDoesNotThrow(() -> client.prepareGet("https://www.google.com").execute().get());
assertInstanceOf(MultiThreadIoEventLoopGroup.class, client.channelManager().getEventLoopGroup());
}
AsyncHttpClientConfig config = config().setUseNativeTransport(true).setUseOnlyEpollNativeTransport(false)
.setSslEngineFactory(createSslEngineFactory()).build();
assertRequestSucceedsAndEventLoopGroupIs(config, MultiThreadIoEventLoopGroup.class);
}

@RepeatedIfExceptionsTest(repeats = 5)
@EnabledOnOs(OS.MAC)
public void testNativeTransportKQueueOnMacOs() throws Exception {
AsyncHttpClientConfig config = config().setUseNativeTransport(true).build();
try (DefaultAsyncHttpClient client = (DefaultAsyncHttpClient) asyncHttpClient(config)) {
assertDoesNotThrow(() -> client.prepareGet("https://www.google.com").execute().get());
assertInstanceOf(KQueueEventLoopGroup.class, client.channelManager().getEventLoopGroup());
AsyncHttpClientConfig config = config().setUseNativeTransport(true)
.setSslEngineFactory(createSslEngineFactory()).build();
assertRequestSucceedsAndEventLoopGroupIs(config, KQueueEventLoopGroup.class);
}

private static void assertRequestSucceedsAndEventLoopGroupIs(AsyncHttpClientConfig config, Class<?> expectedEventLoopGroupType) throws Exception {
try (HttpServer server = new HttpServer();
DefaultAsyncHttpClient client = (DefaultAsyncHttpClient) asyncHttpClient(config)) {
server.start();
server.enqueueOk();
assertDoesNotThrow(() -> client.prepareGet(server.getHttpsUrl()).execute().get());
assertInstanceOf(expectedEventLoopGroupType, client.channelManager().getEventLoopGroup());
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,14 @@

import io.github.artsok.RepeatedIfExceptionsTest;
import io.netty.handler.codec.http.HttpHeaders;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.handler.AbstractHandler;
import org.junit.jupiter.api.Timeout;

import java.io.IOException;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
Expand Down Expand Up @@ -50,7 +56,7 @@ public void testFollowRedirect() throws InterruptedException {
public void run() {
final CountDownLatch l = new CountDownLatch(1);
try (AsyncHttpClient ahc = asyncHttpClient(config().setFollowRedirect(true))) {
ahc.prepareGet("http://www.google.com/").execute(new AsyncHandler<Integer>() {
ahc.prepareGet(getTargetUrl()).execute(new AsyncHandler<Integer>() {

@Override
public void onThrowable(Throwable t) {
Expand Down Expand Up @@ -96,4 +102,23 @@ public Integer onCompleted() {
pool.shutdown();
}
}

@Override
public AbstractHandler configureHandler() {
return new RedirectHandler();
}

private static class RedirectHandler extends AbstractHandler {

@Override
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
if (request.getRequestURI().endsWith("/landing")) {
response.setStatus(HttpServletResponse.SC_OK);
} else {
response.setStatus(HttpServletResponse.SC_FOUND);
response.setHeader("Location", request.getRequestURI() + "/landing");
}
baseRequest.setHandled(true);
}
}
}
13 changes: 10 additions & 3 deletions client/src/test/java/org/asynchttpclient/NoNullResponseTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,38 @@
*/
package org.asynchttpclient;

import org.asynchttpclient.testserver.HttpServer;
import org.junit.jupiter.api.RepeatedTest;

import java.time.Duration;

import static org.asynchttpclient.Dsl.asyncHttpClient;
import static org.asynchttpclient.Dsl.config;
import static org.asynchttpclient.test.TestUtils.createSslEngineFactory;
import static org.junit.jupiter.api.Assertions.assertNotNull;

public class NoNullResponseTest extends AbstractBasicTest {
private static final String GOOGLE_HTTPS_URL = "https://www.google.com";

@RepeatedTest(4)
public void multipleSslRequestsWithDelayAndKeepAlive() throws Exception {
AsyncHttpClientConfig config = config()
.setFollowRedirect(true)
.setKeepAlive(true)
.setSslEngineFactory(createSslEngineFactory())
.setConnectTimeout(Duration.ofSeconds(10))
.setPooledConnectionIdleTimeout(Duration.ofMinutes(1))
.setRequestTimeout(Duration.ofSeconds(10))
.setMaxConnectionsPerHost(-1)
.setMaxConnections(-1)
.build();

try (AsyncHttpClient client = asyncHttpClient(config)) {
final BoundRequestBuilder builder = client.prepareGet(GOOGLE_HTTPS_URL);
try (HttpServer server = new HttpServer();
AsyncHttpClient client = asyncHttpClient(config)) {
server.start();
server.enqueueOk();
server.enqueueOk();

final BoundRequestBuilder builder = client.prepareGet(server.getHttpsUrl());
final Response response1 = builder.execute().get();
Thread.sleep(4000);
final Response response2 = builder.execute().get();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ public class PerRequestRelative302Test extends AbstractBasicTest {
// FIXME super NOT threadsafe!!!
private static final AtomicBoolean isSet = new AtomicBoolean(false);

private int redirectTargetPort = -1;

private static int getPort(Uri uri) {
int port = uri.getPort();
if (port == -1) {
Expand All @@ -60,10 +62,12 @@ private static int getPort(Uri uri) {
public void setUpGlobal() throws Exception {
server = new Server();
ServerConnector connector = addHttpConnector(server);
ServerConnector redirectTargetConnector = addHttpConnector(server);

server.setHandler(new Relative302Handler());
server.start();
port1 = connector.getLocalPort();
redirectTargetPort = redirectTargetConnector.getLocalPort();
logger.info("Local HTTP server started successfully");
port2 = findFreePort();
}
Expand All @@ -81,23 +85,23 @@ public void runAllSequentiallyBecauseNotThreadSafe() throws Exception {
public void redirected302Test() throws Exception {
isSet.getAndSet(false);
try (AsyncHttpClient c = asyncHttpClient()) {
Response response = c.prepareGet(getTargetUrl()).setFollowRedirect(true).setHeader("X-redirect", "https://www.google.com/").execute().get();
String redirectTarget = "http://localhost:" + redirectTargetPort + "/";
Response response = c.prepareGet(getTargetUrl()).setFollowRedirect(true).setHeader("X-redirect", redirectTarget).execute().get();

assertNotNull(response);
assertEquals(200, response.getStatusCode());

String anyGooglePage = "https://www.google.com[^:]*:443";
String baseUrl = getBaseUrl(response.getUri());

assertTrue(baseUrl.matches(anyGooglePage), "response does not show redirection to " + anyGooglePage);
assertEquals("http://localhost:" + redirectTargetPort, baseUrl, "response does not show redirection to the local redirect target, got " + baseUrl);
}
}

@RepeatedIfExceptionsTest(repeats = 5)
public void notRedirected302Test() throws Exception {
isSet.getAndSet(false);
try (AsyncHttpClient c = asyncHttpClient(config().setFollowRedirect(true))) {
Response response = c.prepareGet(getTargetUrl()).setFollowRedirect(false).setHeader("X-redirect", "http://www.microsoft.com/").execute().get();
Response response = c.prepareGet(getTargetUrl()).setFollowRedirect(false).setHeader("X-redirect", "http://localhost:" + redirectTargetPort + "/").execute().get();
assertNotNull(response);
assertEquals(response.getStatusCode(), 302);
}
Expand Down
9 changes: 7 additions & 2 deletions client/src/test/java/org/asynchttpclient/Relative302Test.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
public class Relative302Test extends AbstractBasicTest {
private static final AtomicBoolean isSet = new AtomicBoolean(false);

private int redirectTargetPort = -1;

private static int getPort(Uri uri) {
int port = uri.getPort();
if (port == -1) {
Expand All @@ -59,9 +61,11 @@ private static int getPort(Uri uri) {
public void setUpGlobal() throws Exception {
server = new Server();
ServerConnector connector = addHttpConnector(server);
ServerConnector redirectTargetConnector = addHttpConnector(server);
server.setHandler(new Relative302Handler());
server.start();
port1 = connector.getLocalPort();
redirectTargetPort = redirectTargetConnector.getLocalPort();
logger.info("Local HTTP server started successfully");
port2 = findFreePort();
}
Expand All @@ -79,12 +83,13 @@ public void redirected302Test() throws Exception {
isSet.getAndSet(false);

try (AsyncHttpClient c = asyncHttpClient(config().setFollowRedirect(true))) {
Response response = c.prepareGet(getTargetUrl()).setHeader("X-redirect", "http://www.google.com/").execute().get();
String redirectTarget = "http://localhost:" + redirectTargetPort + "/";
Response response = c.prepareGet(getTargetUrl()).setHeader("X-redirect", redirectTarget).execute().get();
assertNotNull(response);
assertEquals(response.getStatusCode(), 200);

String baseUrl = getBaseUrl(response.getUri());
assertTrue(baseUrl.startsWith("http://www.google."), "response does not show redirection to a google subdomain, got " + baseUrl);
assertEquals("http://localhost:" + redirectTargetPort, baseUrl, "response does not show redirection to the local redirect target, got " + baseUrl);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.asynchttpclient.Response;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -43,6 +44,7 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assumptions.assumeTrue;

@Tag("external")
@Testcontainers
public class HttpsProxyTestcontainersIntegrationTest {

Expand Down
Loading
Loading