[java] Acknowledging proxy config set in ClientConfig

diemol · diemol · commit 897caec5f850 · 2022-02-11T10:17:29.000+01:00
Fixes #10231
diff --git a/java/src/org/openqa/selenium/remote/http/netty/NettyClient.java b/java/src/org/openqa/selenium/remote/http/netty/NettyClient.java
@@ -24,6 +24,7 @@
 import org.asynchttpclient.Dsl;
 import org.asynchttpclient.Realm;
 import org.asynchttpclient.config.AsyncHttpClientConfigDefaults;
+import org.asynchttpclient.proxy.ProxyServer;
 import org.openqa.selenium.Credentials;
 import org.openqa.selenium.UsernameAndPassword;
 import org.openqa.selenium.internal.Require;
@@ -40,6 +41,7 @@
 import io.netty.util.Timer;
 import io.netty.util.concurrent.DefaultThreadFactory;
 
+import java.net.InetSocketAddress;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiFunction;
@@ -88,18 +90,30 @@ private static AsyncHttpClient createHttpClient(ClientConfig config) {
         .setRequestTimeout(toClampedInt(config.readTimeout().toMillis()))
         .setConnectTimeout(toClampedInt(config.connectionTimeout().toMillis()))
         .setReadTimeout(toClampedInt(config.readTimeout().toMillis()))
-        .setUseProxyProperties(true)
-        .setUseProxySelector(true)
         .setFollowRedirect(true);
 
+    Realm.Builder realmBuilder = null;
     if (config.credentials() != null) {
       Credentials credentials = config.credentials();
       if (!(credentials instanceof UsernameAndPassword)) {
         throw new IllegalArgumentException("Credentials must be a username and password");
       }
       UsernameAndPassword uap = (UsernameAndPassword) credentials;
-      builder.setRealm(
-        new Realm.Builder(uap.username(), uap.password()).setUsePreemptiveAuth(true));
+      realmBuilder = new Realm.Builder(uap.username(), uap.password());
+      builder.setRealm(realmBuilder.setUsePreemptiveAuth(true));
+    }
+
+    if (config.proxy() != null) {
+      InetSocketAddress address = (InetSocketAddress) config.proxy().address();
+      ProxyServer.Builder proxyBuilder = new ProxyServer.Builder(
+        address.getHostName(), address.getPort());
+      if (realmBuilder != null) {
+        proxyBuilder.setRealm(realmBuilder);
+      }
+      builder.setProxyServer(proxyBuilder);
+    } else {
+      builder.setUseProxyProperties(true)
+        .setUseProxySelector(true);
     }
 
     return Dsl.asyncHttpClient(builder);
