[FIXED JENKINS-24592] Support HTTP proxies

nosmo · Oct 10, 2014 · dff89fc · dff89fc
1 parent ff7fc29
commit dff89fc
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>github-api</artifactId>
-            <version>1.58</version>
+            <version>1.59</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>

diff --git a/src/main/java/org/jenkinsci/plugins/ghprb/GhprbGitHub.java b/src/main/java/org/jenkinsci/plugins/ghprb/GhprbGitHub.java
@@ -6,6 +6,7 @@
 import org.kohsuke.github.GHOrganization;
 import org.kohsuke.github.GHUser;
 import org.kohsuke.github.GitHub;
+import org.kohsuke.github.GitHubBuilder;
 
 /**
  * @author janinko
@@ -19,7 +20,11 @@ private void connect() throws IOException{
 		String serverAPIUrl = GhprbTrigger.getDscp().getServerAPIUrl();
 		if(accessToken != null && !accessToken.isEmpty()) {
 			try {
-				gh = GitHub.connectUsingOAuth(serverAPIUrl, accessToken);
+				gh = new GitHubBuilder()
+						.withEndpoint(serverAPIUrl)
+						.withOAuthToken(accessToken)
+						.withConnector(new HttpConnectorWithJenkinsProxy())
+						.build();
 			} catch(IOException e) {
 				logger.log(Level.SEVERE, "Can''t connect to {0} using oauth", serverAPIUrl);
 				throw e;
@@ -28,7 +33,10 @@ private void connect() throws IOException{
 			if (serverAPIUrl.contains("api/v3")) {
 				gh = GitHub.connectToEnterprise(serverAPIUrl, GhprbTrigger.getDscp().getUsername(), GhprbTrigger.getDscp().getPassword());
 			} else {
-				gh = GitHub.connectUsingPassword(GhprbTrigger.getDscp().getUsername(), GhprbTrigger.getDscp().getPassword());
+				gh = new GitHubBuilder()
+						.withPassword(GhprbTrigger.getDscp().getUsername(), GhprbTrigger.getDscp().getPassword())
+						.withConnector(new HttpConnectorWithJenkinsProxy())
+						.build();
 			}
 		}
 	}

diff --git a/src/main/java/org/jenkinsci/plugins/ghprb/HttpConnectorWithJenkinsProxy.java b/src/main/java/org/jenkinsci/plugins/ghprb/HttpConnectorWithJenkinsProxy.java
@@ -0,0 +1,14 @@
+package org.jenkinsci.plugins.ghprb;
+
+import hudson.ProxyConfiguration;
+import org.kohsuke.github.HttpConnector;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+public class HttpConnectorWithJenkinsProxy implements HttpConnector{
+    public HttpURLConnection connect(URL url) throws IOException {
+        return (HttpURLConnection)ProxyConfiguration.open(url);
+    }
+}