Http Client made consistent with Default Proxy Configurations

Author: joviegas

.changes/next-release/bugfix-AWSSDKforJavav2-c277e61.json

@@ -0,0 +1,6 @@
+{
+    "type": "bugfix",
+    "category": "AWS SDK for Java v2",
+    "contributor": "",
+    "description": "Addressing Issue [#4745](https://github.com/aws/aws-sdk-java-v2/issues/4745) , Netty and CRT clients' default proxy settings have been made consistent with the Apache client, now using environment and system property settings by default.\n To disable the use of environment variables and system properties by default, set useSystemPropertyValue(false) and useEnvironmentVariablesValues(false) in ProxyConfigurations."
+}

http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheClientProxyConfigurationTest.java

@@ -0,0 +1,65 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.http.apache;
+
+import java.util.concurrent.ThreadLocalRandom;
+import org.apache.http.conn.HttpHostConnectException;
+import software.amazon.awssdk.http.SdkHttpClient;
+import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
+import software.amazon.awssdk.http.proxy.HttpClientDefaultPoxyConfigTest;
+import java.net.ConnectException;
+
+public class ApacheClientProxyConfigurationTest extends HttpClientDefaultPoxyConfigTest {
+
+    @Override
+    protected Class<? extends Exception> getProxyFailedExceptionType() {
+        return HttpHostConnectException.class;
+
+    }
+
+    @Override
+    protected Class<? extends Exception> getProxyFailedCauseExceptionType() {
+        return ConnectException.class;
+    }
+
+    @Override
+    protected boolean isSyncClient() {
+        return true;
+    }
+
+    @Override
+    protected SdkAsyncHttpClient createHttpClientWithDefaultProxy() {
+        throw new IllegalArgumentException("Async client is not supported");
+    }
+
+    @Override
+    protected SdkHttpClient createSyncHttpClientWithDefaultProxy() {
+        return ApacheHttpClient.builder().build();
+    }
+
+    /**
+     * Wrire code which inputs an integer args and returns one number between 0 to 65535 excluding number args
+     */
+    private int getRandomPort(int currentPort) {
+        int randomPort;
+        do {
+            randomPort = ThreadLocalRandom.current().nextInt(65535);
+        } while (randomPort == currentPort);
+        return randomPort;
+    }
+
+
+}

http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/AwsCrtClientBuilderBase.java

@@ -29,7 +29,7 @@
 public class AwsCrtClientBuilderBase<BuilderT> {
     private final AttributeMap.Builder standardOptions = AttributeMap.builder();
     private Long readBufferSize;
-    private ProxyConfiguration proxyConfiguration;
+    private ProxyConfiguration proxyConfiguration = ProxyConfiguration.builder().build();
     private ConnectionHealthConfiguration connectionHealthConfiguration;
     private TcpKeepAliveConfiguration tcpKeepAliveConfiguration;
     private Boolean postQuantumTlsEnabled;

http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/AsyncCrtClientProxyConfigurationTest.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.http.crt;
+
+import java.io.IOException;
+import java.util.concurrent.ExecutionException;
+import software.amazon.awssdk.http.SdkHttpClient;
+import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
+import software.amazon.awssdk.http.proxy.HttpClientDefaultPoxyConfigTest;
+
+public class AsyncCrtClientProxyConfigurationTest extends HttpClientDefaultPoxyConfigTest {
+
+    @Override
+    protected Class<? extends Exception> getProxyFailedExceptionType() {
+        return ExecutionException.class;
+    }
+
+    @Override
+    protected Class<? extends Exception> getProxyFailedCauseExceptionType() {
+        return IOException.class;
+    }
+
+    @Override
+    protected boolean isSyncClient() {
+        return false;
+    }
+
+    @Override
+    protected SdkAsyncHttpClient createHttpClientWithDefaultProxy() {
+        return AwsCrtAsyncHttpClient.builder().build();
+    }
+
+    @Override
+    protected SdkHttpClient createSyncHttpClientWithDefaultProxy() {
+        throw new IllegalArgumentException("Sync client is not supported");
+    }
+}

http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/SyncCrtClientProxyConfigurationTest.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.http.crt;
+
+
+import java.io.IOException;
+import software.amazon.awssdk.crt.http.HttpException;
+import software.amazon.awssdk.http.SdkHttpClient;
+import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
+import software.amazon.awssdk.http.proxy.HttpClientDefaultPoxyConfigTest;
+
+public class SyncCrtClientProxyConfigurationTest extends HttpClientDefaultPoxyConfigTest {
+
+    @Override
+    protected Class<? extends Exception> getProxyFailedExceptionType() {
+        return IOException.class;
+    }
+
+    @Override
+    protected Class<? extends Exception> getProxyFailedCauseExceptionType() {
+        return HttpException.class;
+    }
+
+    @Override
+    protected boolean isSyncClient() {
+        return true;
+    }
+
+    @Override
+    protected SdkAsyncHttpClient createHttpClientWithDefaultProxy() {
+        throw new UnsupportedOperationException("Async client does not support proxy");
+    }
+
+    @Override
+    protected SdkHttpClient createSyncHttpClientWithDefaultProxy() {
+        return AwsCrtHttpClient.create();
+    }
+}

http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClient.java

@@ -501,7 +501,7 @@ private static final class DefaultBuilder implements Builder {
         private Integer maxHttp2Streams;
         private Http2Configuration http2Configuration;
         private SslProvider sslProvider;
-        private ProxyConfiguration proxyConfiguration;
+        private ProxyConfiguration proxyConfiguration = ProxyConfiguration.builder().build();
         private Boolean useNonBlockingDnsResolver;
 
         private DefaultBuilder() {

http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/AwaitCloseChannelPoolMap.java

@@ -186,13 +186,13 @@ private Bootstrap createBootstrap(URI poolKey) {
 
 
     private boolean shouldUseProxyForHost(URI remoteAddr) {
-        if (proxyConfiguration == null) {
+        if (proxyConfiguration == null || proxyConfiguration.host() == null) {
             return false;
         }
 
 
         return shouldProxyForHostCache.computeIfAbsent(remoteAddr, (uri) ->
-           proxyConfiguration.nonProxyHosts().stream().noneMatch(h -> uri.getHost().matches(h))
+            proxyConfiguration.nonProxyHosts().stream().noneMatch(h -> uri.getHost().matches(h))
         );
     }
 

http-clients/netty-nio-client/src/test/java/NettyClientProxyConfigurationTest.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+import java.net.ConnectException;
+import java.util.concurrent.ExecutionException;
+import software.amazon.awssdk.http.SdkHttpClient;
+import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
+import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
+import software.amazon.awssdk.http.proxy.HttpClientDefaultPoxyConfigTest;
+
+public class NettyClientProxyConfigurationTest extends HttpClientDefaultPoxyConfigTest {
+    @Override
+    protected boolean isSyncClient() {
+        return false;
+    }
+
+    @Override
+    protected SdkAsyncHttpClient createHttpClientWithDefaultProxy() {
+        return NettyNioAsyncHttpClient.create();
+    }
+
+    @Override
+    protected SdkHttpClient createSyncHttpClientWithDefaultProxy() {
+        throw new IllegalArgumentException("Sync client not supported");
+    }
+
+    @Override
+    protected Class<? extends Exception> getProxyFailedExceptionType() {
+        return ExecutionException.class;
+    }
+
+    @Override
+    protected Class<? extends Exception> getProxyFailedCauseExceptionType() {
+        return ConnectException.class;
+    }
+}