Proxy support for WebSocket (#691)

jenkinsci · Oct 24, 2023 · c8c6efb · c8c6efb
1 parent 507a8ba
commit c8c6efb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/main/java/hudson/remoting/Engine.java b/src/main/java/hudson/remoting/Engine.java
@@ -37,6 +37,7 @@
 import java.net.URI;
 import java.net.URL;
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.security.AccessController;
 import java.security.KeyManagementException;
@@ -53,6 +54,7 @@
 import java.security.interfaces.RSAPublicKey;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -692,6 +694,22 @@ public void closeRead() throws IOException {
                 WebSocketContainer container = ContainerProvider.getWebSocketContainer();
                 if (container instanceof ClientManager) {
                     ClientManager client = (ClientManager) container;
+
+                    String proxyHost = System.getProperty("http.proxyHost", System.getenv("proxy_host"));
+                    String proxyPort = System.getProperty("http.proxyPort");
+                    if (proxyHost != null && "http".equals(hudsonUrl.getProtocol()) && NoProxyEvaluator.shouldProxy(hudsonUrl.getHost())) {
+                        URI proxyUri;
+                        if (proxyPort != null) {
+                            proxyUri = URI.create(String.format("http://%s:%s", proxyHost, proxyPort));
+                        } else {
+                            proxyUri = URI.create(String.format("http://%s", proxyHost));
+                        }
+                        client.getProperties().put(ClientProperties.PROXY_URI, proxyUri);
+                        if (proxyCredentials != null) {
+                            client.getProperties().put(ClientProperties.PROXY_HEADERS, Map.of("Proxy-Authorization", "Basic " + Base64.getEncoder().encodeToString(proxyCredentials.getBytes(StandardCharsets.UTF_8))));
+                        }
+                    }
+
                     SSLContext sslContext = getSSLContext(candidateCertificates, disableHttpsCertValidation);
                     if (sslContext != null) {
                         SslEngineConfigurator sslEngineConfigurator = new SslEngineConfigurator(sslContext);

diff --git a/src/main/java/hudson/remoting/Launcher.java b/src/main/java/hudson/remoting/Launcher.java
@@ -296,7 +296,6 @@ public void setNoCertificateCheck(boolean ignored) throws NoSuchAlgorithmExcepti
                 "-direct",
                 "-tunnel",
                 "-credentials",
-                "-proxyCredentials",
                 "-noKeepAlive"
             })
     public boolean webSocket;