Add https_proxy and no_proxy configurations to the Maven repository resolution (#725)

Author: Or-Geva

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

@@ -103,9 +103,11 @@ public PreemptiveHttpClientBuilder setProxyConfiguration(ProxyConfiguration prox
         }
         return this;
     }
+
     public ProxyConfiguration getProxyConfiguration(){
         return proxyConfiguration;
     }
+
     public PreemptiveHttpClientBuilder setConnectionRetries(int connectionRetries) {
         this.connectionRetries = connectionRetries;
         return this;

Diff for: build-info-extractor-maven3/src/main/java/org/jfrog/build/extractor/maven/ArtifactoryManagerBuilder.java

@@ -4,6 +4,8 @@
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.logging.Logger;
+import org.jfrog.build.extractor.Proxy;
+import org.jfrog.build.extractor.ProxySelector;
 import org.jfrog.build.extractor.clientConfiguration.ArtifactoryClientConfiguration;
 import org.jfrog.build.extractor.clientConfiguration.ClientConfigurationFields;
 import org.jfrog.build.extractor.clientConfiguration.client.artifactory.ArtifactoryManager;
@@ -25,7 +27,7 @@ public class ArtifactoryManagerBuilder {
     public ArtifactoryManager resolveProperties(ArtifactoryClientConfiguration clientConf) {
         ArtifactoryManager artifactoryManager = resolveClientProps(clientConf);
         resolveTimeout(clientConf, artifactoryManager);
-        resolveProxy(clientConf.proxy, artifactoryManager);
+        resolveProxy(clientConf, artifactoryManager);
         resolveRetriesParams(clientConf, artifactoryManager);
         resolveInsecureTls(clientConf, artifactoryManager);
         return artifactoryManager;
@@ -72,23 +74,21 @@ private void resolveInsecureTls(ArtifactoryClientConfiguration clientConf, Artif
         artifactoryManager.setInsecureTls(clientConf.getInsecureTls());
     }
 
-    private void resolveProxy(ArtifactoryClientConfiguration.ProxyHandler proxyConf,
-                              ArtifactoryManager artifactoryManager) {
-        String proxyHost = proxyConf.getHost();
-
-        if (StringUtils.isNotBlank(proxyHost)) {
-            logResolvedProperty(ClientConfigurationFields.HOST, proxyHost);
-            if (proxyConf.getPort() == null) {
-                return;
-            }
-            String proxyUsername = proxyConf.getUsername();
-            if (StringUtils.isNotBlank(proxyUsername)) {
-                logResolvedProperty(ClientConfigurationFields.USERNAME, proxyUsername);
-                artifactoryManager.setProxyConfiguration(proxyHost, proxyConf.getPort(), proxyUsername,
-                        proxyConf.getPassword());
-            } else {
-                artifactoryManager.setProxyConfiguration(proxyHost, proxyConf.getPort());
-            }
+    private void resolveProxy(ArtifactoryClientConfiguration clientConf, ArtifactoryManager artifactoryManager) {
+        ProxySelector proxySelector = new ProxySelector(
+                clientConf.proxy.getHost(),
+                clientConf.proxy.getPort(),
+                clientConf.proxy.getUsername(),
+                clientConf.proxy.getPassword(),
+                clientConf.httpsProxy.getHost(),
+                clientConf.httpsProxy.getPort(),
+                clientConf.httpsProxy.getUsername(),
+                clientConf.httpsProxy.getPassword(),
+                clientConf.proxy.getNoProxy()
+        );
+        Proxy proxy = proxySelector.getProxy(clientConf.publisher.getContextUrl());
+        if (proxy != null) {
+            artifactoryManager.setProxyConfiguration(proxy.getHost(), proxy.getPort(), proxy.getUsername(), proxy.getPassword());
         }
     }
 

Diff for: build-info-extractor-maven3/src/main/java/org/jfrog/build/extractor/maven/ArtifactoryProjectBuilder.java

@@ -1,18 +1,15 @@
 package org.jfrog.build.extractor.maven;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
-import org.apache.maven.artifact.repository.MavenArtifactRepository;
-import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
 import org.apache.maven.project.DefaultProjectBuilder;
 import org.apache.maven.project.ProjectBuildingException;
 import org.apache.maven.project.ProjectBuildingRequest;
 import org.apache.maven.project.ProjectBuildingResult;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
+import org.jfrog.build.extractor.ProxySelector;
+import org.jfrog.build.extractor.maven.resolver.ArtifactoryPluginResolution;
 import org.jfrog.build.extractor.maven.resolver.ResolutionHelper;
-import org.sonatype.aether.repository.RepositoryPolicy;
 
 import javax.inject.Named;
 import java.io.File;
@@ -52,53 +49,16 @@ public List<ProjectBuildingResult> build(List<File> pomFiles, boolean recursive,
 
     private List<ArtifactRepository> getRepositories() {
         List<ArtifactRepository> repositories = new ArrayList<>();
+        ProxySelector proxySelector = new ProxySelector(resolutionHelper.getHttpProxyHost(), resolutionHelper.getHttpProxyPort(), resolutionHelper.getHttpProxyUsername(), resolutionHelper.getHttpProxyPassword(), resolutionHelper.getHttpsProxyHost(), resolutionHelper.getHttpsProxyPort(), resolutionHelper.getHttpsProxyUsername(), resolutionHelper.getHttpsProxyPassword(), resolutionHelper.getNoProxy());
 
-        String releaseRepoUrl = resolutionHelper.getRepoReleaseUrl();
-        String snapshotRepoUrl = resolutionHelper.getRepoSnapshotUrl();
-
-        org.apache.maven.artifact.repository.Authentication authentication = null;
-        if (StringUtils.isNotBlank(resolutionHelper.getRepoUsername())) {
-            authentication = new org.apache.maven.artifact.repository.Authentication(resolutionHelper.getRepoUsername(), resolutionHelper.getRepoPassword());
-        }
-        org.apache.maven.repository.Proxy proxy = null;
-        if (StringUtils.isNotBlank(resolutionHelper.getProxyHost())) {
-            proxy = new org.apache.maven.repository.Proxy();
-            proxy.setHost(resolutionHelper.getProxyHost());
-            proxy.setPort(resolutionHelper.getProxyPort());
-            proxy.setUserName(resolutionHelper.getProxyUsername());
-            proxy.setPassword(resolutionHelper.getProxyPassword());
+        ArtifactoryPluginResolution artifactoryResolution = new ArtifactoryPluginResolution(resolutionHelper.getRepoReleaseUrl(), resolutionHelper.getRepoSnapshotUrl(), resolutionHelper.getRepoUsername(), resolutionHelper.getRepoPassword(), proxySelector, resolutionHelper.getLogger());
+        ArtifactRepository snapshotRepository = artifactoryResolution.createSnapshotRepository();
+        if (snapshotRepository != null) {
+            repositories.add(snapshotRepository);
         }
-
-        if (StringUtils.isNotBlank(snapshotRepoUrl)) {
-            ArtifactRepositoryPolicy snapshotPolicy = new ArtifactRepositoryPolicy(true, RepositoryPolicy.UPDATE_POLICY_DAILY, RepositoryPolicy.CHECKSUM_POLICY_WARN);
-            ArtifactRepositoryPolicy releasePolicy = new ArtifactRepositoryPolicy(false, RepositoryPolicy.UPDATE_POLICY_DAILY, RepositoryPolicy.CHECKSUM_POLICY_WARN);
-            MavenArtifactRepository repository = new MavenArtifactRepository("artifactory-snapshot", snapshotRepoUrl, new DefaultRepositoryLayout(), snapshotPolicy, releasePolicy);
-
-            if (authentication != null) {
-                repository.setAuthentication(authentication);
-            }
-            if (proxy != null) {
-                repository.setProxy(proxy);
-            }
-
-            repositories.add(repository);
-        }
-        if (StringUtils.isNotBlank(releaseRepoUrl)) {
-            boolean snapshotPolicyEnabled = StringUtils.isBlank(snapshotRepoUrl);
-            String repositoryId = snapshotPolicyEnabled ? "artifactory-release-snapshot" : "artifactory-release";
-
-            ArtifactRepositoryPolicy snapshotPolicy = new ArtifactRepositoryPolicy(snapshotPolicyEnabled, RepositoryPolicy.UPDATE_POLICY_DAILY, RepositoryPolicy.CHECKSUM_POLICY_WARN);
-            ArtifactRepositoryPolicy releasePolicy = new ArtifactRepositoryPolicy(true, RepositoryPolicy.UPDATE_POLICY_DAILY, RepositoryPolicy.CHECKSUM_POLICY_WARN);
-            MavenArtifactRepository repository = new MavenArtifactRepository(repositoryId, releaseRepoUrl, new DefaultRepositoryLayout(), snapshotPolicy, releasePolicy);
-
-            if (authentication != null) {
-                repository.setAuthentication(authentication);
-            }
-            if (proxy != null) {
-                repository.setProxy(proxy);
-            }
-
-            repositories.add(repository);
+        ArtifactRepository releaseRepository = artifactoryResolution.createReleaseRepository();
+        if (releaseRepository != null) {
+            repositories.add(releaseRepository);
         }
         return repositories;
     }