Merge pull request #705 from Dohbedoh/JENKINS-70163

[JENKINS-70163] Do not cache resolved proxy address in Connector clients

Author: rsandell

pom.xml

@@ -67,6 +67,8 @@
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>okhttp-api</artifactId>
+      <!--Remove once this version is in the bom-->
+      <version>4.10.0-136.v1d8ce1b_1db_72</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>

src/main/java/org/jenkinsci/plugins/github_branch_source/Connector.java

@@ -54,9 +54,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.Proxy;
-import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -75,7 +72,6 @@
 import java.util.logging.Logger;
 import jenkins.model.Jenkins;
 import jenkins.scm.api.SCMSourceOwner;
-import jenkins.util.JenkinsJVM;
 import jenkins.util.SystemProperties;
 import okhttp3.Cache;
 import okhttp3.OkHttpClient;
@@ -445,22 +441,12 @@ static GitHubBuilder createGitHubBuilder(@NonNull String apiUrl) throws IOExcept
     @NonNull
     private static GitHubBuilder createGitHubBuilder(@NonNull String apiUrl, @CheckForNull Cache cache)
             throws IOException {
-        String host;
-        try {
-            host = new URL(apiUrl).getHost();
-        } catch (MalformedURLException e) {
-            throw new IOException("Invalid GitHub API URL: " + apiUrl, e);
-        }
-
         GitHubBuilder gb = new GitHubBuilder();
         gb.withEndpoint(apiUrl);
         gb.withRateLimitChecker(new ApiRateLimitChecker.RateLimitCheckerAdapter());
         gb.withRateLimitHandler(CUSTOMIZED);
 
         OkHttpClient.Builder clientBuilder = baseClient.newBuilder();
-        if (JenkinsJVM.isJenkinsJVM()) {
-            clientBuilder.proxy(getProxy(host));
-        }
         if (cache != null) {
             clientBuilder.cache(cache);
         }
@@ -530,22 +516,6 @@ static List<DomainRequirement> githubDomainRequirements(String apiUri) {
                 .build();
     }
 
-    /**
-     * Uses proxy if configured on pluginManager/advanced page
-     *
-     * @param host GitHub's hostname to build proxy to
-     * @return proxy to use it in connector. Should not be null as it can lead to unexpected behaviour
-     */
-    @NonNull
-    private static Proxy getProxy(@NonNull String host) {
-        Jenkins jenkins = Jenkins.getInstanceOrNull();
-        if (jenkins == null || jenkins.proxy == null) {
-            return Proxy.NO_PROXY;
-        } else {
-            return jenkins.proxy.createProxy(host);
-        }
-    }
-
     /** Fail immediately and throw a customized exception. */
     public static final RateLimitHandler CUSTOMIZED = new RateLimitHandler() {