BI-549 - PreemptiveHttpClient is missing credentials when initialized with proxy

Author: RobiNino

build-info-client/src/main/java/org/jfrog/build/client/PreemptiveHttpClient.java

@@ -52,13 +52,12 @@ public class PreemptiveHttpClient implements AutoCloseable {
      * Used for storing the original host name, before a redirect to a new URL, on the request context.
      */
     private static final String ORIGINAL_HOST_CONTEXT_PARAM = "original.host.context.param";
-
-    private PoolingHttpClientConnectionManager connectionManager;
-    private BasicCredentialsProvider basicCredentialsProvider;
-    private String accessToken;
-    private AuthCache authCache;
-    private CloseableHttpClient httpClient;
-    private int connectionRetries;
+    BasicCredentialsProvider basicCredentialsProvider;
+    private final PoolingHttpClientConnectionManager connectionManager;
+    private final String accessToken;
+    private final AuthCache authCache;
+    private final CloseableHttpClient httpClient;
+    private final int connectionRetries;
     private Log log;
 
     public PreemptiveHttpClient(PoolingHttpClientConnectionManager connectionManager, BasicCredentialsProvider credentialsProvider, String accessToken, AuthCache authCache, HttpClientBuilder clientBuilder, int connectionRetries, Log log) {
@@ -230,7 +229,7 @@ public boolean retryRequest(IOException exception, int executionCount, HttpConte
 
     private class PreemptiveRedirectStrategy extends DefaultRedirectStrategy {
 
-        private Set<String> redirectableMethods = CommonUtils.newHashSet(
+        private final Set<String> redirectableMethods = CommonUtils.newHashSet(
                 HttpGet.METHOD_NAME.toLowerCase(),
                 HttpPost.METHOD_NAME.toLowerCase(),
                 HttpHead.METHOD_NAME.toLowerCase(),

build-info-client/src/main/java/org/jfrog/build/client/PreemptiveHttpClientBuilder.java

@@ -142,7 +142,6 @@ protected void createCredentialsAndAuthCache() {
             authCache = new BasicAuthCache();
             // Generate BASIC scheme object and add it to the local auth cache
             authCache.put(proxy, new BasicScheme());
-            return;
         }
 
         if (StringUtils.isEmpty(accessToken)) {

build-info-client/src/test/java/org/jfrog/build/client/PreemptiveHttpClientBuilderTest.java

@@ -0,0 +1,53 @@
+package org.jfrog.build.client;
+
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.Credentials;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.jfrog.build.api.util.NullLog;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+
+@Test
+public class PreemptiveHttpClientBuilderTest {
+    public void testCredentialsMaintainedWithProxy() {
+        String rtUser = "rt-user";
+        String rtPassword = "rt-password";
+
+        String proxyHost = "127.0.0.1";
+        int proxyPort = 8000;
+        String proxyUser = "proxy-user";
+        String proxyPassword = "proxy-password";
+
+        PreemptiveHttpClientBuilder clientBuilder = new PreemptiveHttpClientBuilder()
+                .setConnectionRetries(3)
+                .setInsecureTls(false)
+                .setTimeout(300)
+                .setLog(new NullLog())
+                .setProxyConfiguration(createProxyConfiguration(proxyHost, proxyPort, proxyUser, proxyPassword))
+                .setUserName(rtUser)
+                .setPassword(rtPassword);
+        PreemptiveHttpClient deployClient = clientBuilder.build();
+
+        // Assert both Artifactory and proxy credentials exist in the credentials provider.
+        BasicCredentialsProvider credentialsProvider = deployClient.basicCredentialsProvider;
+        Credentials rtCredentials = credentialsProvider.getCredentials(new AuthScope(AuthScope.ANY_HOST, AuthScope.ANY_PORT));
+        assertNotNull(rtCredentials);
+        assertEquals(rtCredentials, new UsernamePasswordCredentials(rtUser, rtPassword));
+
+        Credentials portCredentials = credentialsProvider.getCredentials(new AuthScope(proxyHost, proxyPort));
+        assertNotNull(portCredentials);
+        assertEquals(portCredentials, new UsernamePasswordCredentials(proxyUser, proxyPassword));
+    }
+
+    private ProxyConfiguration createProxyConfiguration(String host, int port, String proxyUser, String proxyPassword) {
+        ProxyConfiguration proxyConfiguration = new ProxyConfiguration();
+        proxyConfiguration.host = host;
+        proxyConfiguration.port = port;
+        proxyConfiguration.username = proxyUser;
+        proxyConfiguration.password = proxyPassword;
+        return proxyConfiguration;
+    }
+}

build-info-extractor/src/main/java/org/jfrog/build/extractor/clientConfiguration/client/ArtifactoryBuildInfoClient.java

@@ -395,7 +395,7 @@ public ArtifactoryVersion verifyCompatibleArtifactoryVersion() throws VersionExc
         try {
             version = httpClient.getVersion();
         } catch (IOException e) {
-            throw new VersionException("Error occurred while requesting version information: " + e.getMessage(), e,
+            throw new VersionException("Error occurred while requesting version information: " + e, e,
                     VersionCompatibilityType.NOT_FOUND);
         }
         if (version.isNotFound()) {