[FIXED JENKINS-10634] JDK downloader now uses Jenkins proxy settings

jenkinsci · Sep 18, 2011 · fa00cd2 · fa00cd2 · tom-canova · Sep 19, 2011
1 parent beb1666
commit fa00cd2
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/changelog.html b/changelog.html
@@ -55,6 +55,9 @@
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
+  <li class=bug>
+    JDK auto-installation does not respect proxy settings
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-10634">issue 10634</a>)
   <li class=bug>
     Tools download does not respect proxy settings
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-5271">issue 5271</a>)

diff --git a/core/src/main/java/hudson/tools/JDKInstaller.java b/core/src/main/java/hudson/tools/JDKInstaller.java
@@ -23,6 +23,9 @@
  */
 package hudson.tools;
 
+import com.gargoylesoftware.htmlunit.BrowserVersion;
+import com.gargoylesoftware.htmlunit.DefaultCredentialsProvider;
+import com.gargoylesoftware.htmlunit.ProxyConfig;
 import com.gargoylesoftware.htmlunit.ElementNotFoundException;
 import com.gargoylesoftware.htmlunit.Page;
 import com.gargoylesoftware.htmlunit.WebClient;
@@ -31,6 +34,7 @@
 import hudson.AbortException;
 import hudson.Extension;
 import hudson.FilePath;
+import hudson.ProxyConfiguration;
 import hudson.Launcher;
 import hudson.Launcher.ProcStarter;
 import hudson.Util;
@@ -45,6 +49,7 @@
 import hudson.util.Secret;
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
+import org.apache.commons.httpclient.auth.CredentialsProvider;
 import org.apache.commons.io.IOUtils;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.HttpResponse;
@@ -344,6 +349,21 @@ public URL locate(TaskListener log, Platform platform, CPU cpu) throws IOExcepti
         URL src = new URL(primary.filepath);
 
         WebClient wc = new WebClient();
+        // honor jenkins proxy settings in WebClient
+        Jenkins h = Jenkins.getInstance();
+        ProxyConfiguration jpc = h!=null ? h.proxy : null;
+        if(jpc != null) {
+            ProxyConfig pc = new ProxyConfig();
+            pc.setProxyHost(jpc.name);
+            pc.setProxyPort(jpc.port);
+            wc.setProxyConfig(pc);
+            if(jpc.getUserName() != null) {
+                DefaultCredentialsProvider cp = new DefaultCredentialsProvider();
+                cp.addCredentials(jpc.getUserName(), jpc.getPassword(), jpc.name, jpc.port, null);
+                wc.setCredentialsProvider(cp);
+            }
+        }
+
         wc.setJavaScriptEnabled(false);
         wc.setCssEnabled(false);
         Page page = wc.getPage(src);