From 1a30d0260ac3af993a6a1c16cce14605e8d4f870 Mon Sep 17 00:00:00 2001
From: Puja Jagani <puja.jagani93@gmail.com>
Date: Thu, 12 Oct 2023 20:01:31 +0530
Subject: [PATCH] [java] Allow setting proxy for all http client instances

---
 .../remote/http/jdk/JdkHttpClient.java        | 46 +++++++++++--------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/java/src/org/openqa/selenium/remote/http/jdk/JdkHttpClient.java b/java/src/org/openqa/selenium/remote/http/jdk/JdkHttpClient.java
index 86aed0a109c92..4a5c04694d138 100644
--- a/java/src/org/openqa/selenium/remote/http/jdk/JdkHttpClient.java
+++ b/java/src/org/openqa/selenium/remote/http/jdk/JdkHttpClient.java
@@ -22,6 +22,7 @@
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.net.Authenticator;
+import java.net.InetSocketAddress;
 import java.net.PasswordAuthentication;
 import java.net.ProtocolException;
 import java.net.Proxy;
@@ -45,6 +46,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -123,28 +125,34 @@ protected PasswordAuthentication getPasswordAuthentication() {
       builder = builder.authenticator(authenticator);
     }
 
-    Proxy proxy = config.proxy();
-    if (proxy != null) {
-      ProxySelector proxySelector =
-          new ProxySelector() {
-            @Override
-            public List<Proxy> select(URI uri) {
-              if (proxy == null) {
-                return List.of();
-              }
-              if (uri.getScheme().toLowerCase().startsWith("http")) {
-                return List.of(proxy);
-              }
+    String proxyHost = System.getProperty("http.proxyHost");
+    String proxyPort = System.getProperty("http.proxyPort");
+
+    Proxy proxy =
+        (proxyHost != null && proxyPort != null)
+            ? new Proxy(
+                Proxy.Type.HTTP, new InetSocketAddress(proxyHost, Integer.parseInt(proxyPort)))
+            : config.proxy();
+
+    ProxySelector proxySelector =
+        new ProxySelector() {
+          @Override
+          public List<Proxy> select(URI uri) {
+            if (proxy == null) {
               return List.of();
             }
-
-            @Override
-            public void connectFailed(URI uri, SocketAddress sa, IOException ioe) {
-              // Do nothing
+            if (uri.getScheme().toLowerCase().startsWith("http")) {
+              return List.of(proxy);
             }
-          };
-      builder = builder.proxy(proxySelector);
-    }
+            return List.of();
+          }
+
+          @Override
+          public void connectFailed(URI uri, SocketAddress sa, IOException ioe) {
+            // Do nothing
+          }
+        };
+    builder = builder.proxy(proxySelector);
 
     SSLContext sslContext = config.sslContext();
     if (sslContext != null) {