BI-509 - npm extractor ignores http proxy (#282)

Author: yahavi

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

@@ -126,6 +126,10 @@ public int getConnectionRetries() {
         return connectionRetries;
     }
 
+    public ProxyConfiguration getProxyConfiguration() {
+        return this.proxyConfiguration;
+    }
+
     /**
      * Release all connection and cleanup resources.
      */

build-info-extractor-npm/src/main/java/org/jfrog/build/extractor/npm/extractor/NpmBuildInfoExtractor.java

@@ -8,6 +8,7 @@
 import org.jfrog.build.api.Module;
 import org.jfrog.build.api.builder.ModuleBuilder;
 import org.jfrog.build.api.util.Log;
+import org.jfrog.build.client.ProxyConfiguration;
 import org.jfrog.build.extractor.BuildInfoExtractor;
 import org.jfrog.build.extractor.clientConfiguration.ArtifactoryDependenciesClientBuilder;
 import org.jfrog.build.extractor.clientConfiguration.client.ArtifactoryDependenciesClient;
@@ -44,6 +45,7 @@ public class NpmBuildInfoExtractor implements BuildInfoExtractor<NpmProject> {
     private NpmDriver npmDriver;
     private String npmRegistry;
     private Properties npmAuth;
+    private String npmProxy;
     private Log logger;
 
     NpmBuildInfoExtractor(ArtifactoryDependenciesClientBuilder dependenciesClientBuilder, NpmDriver npmDriver, Log logger) {
@@ -71,6 +73,7 @@ private void preparePrerequisites(String resolutionRepository, Path workingDir)
         try (ArtifactoryDependenciesClient dependenciesClient = dependenciesClientBuilder.build()) {
             setNpmAuth(dependenciesClient);
             setRegistryUrl(dependenciesClient, resolutionRepository);
+            setNpmProxy(dependenciesClient);
         }
         readPackageInfoFromPackageJson(workingDir);
         backupProjectNpmrc(workingDir);
@@ -88,6 +91,20 @@ private void setRegistryUrl(ArtifactoryDependenciesClient dependenciesClient, St
         npmRegistry += "api/npm/" + resolutionRepository;
     }
 
+    private void setNpmProxy(ArtifactoryDependenciesClient dependenciesClient) {
+        ProxyConfiguration proxyConfiguration = dependenciesClient.getProxyConfiguration();
+        if (proxyConfiguration == null || StringUtils.isBlank(proxyConfiguration.host)) {
+            return;
+        }
+        npmProxy = "http://";
+        String username = proxyConfiguration.username;
+        String password = proxyConfiguration.password;
+        if (StringUtils.isNoneBlank(username) && StringUtils.isNotBlank(password)) {
+            npmProxy += username + ":" + password + "@";
+        }
+        npmProxy += proxyConfiguration.host + ":" + proxyConfiguration.port;
+    }
+
     private void readPackageInfoFromPackageJson(Path workingDir) throws IOException {
         try (FileInputStream fis = new FileInputStream(workingDir.resolve("package.json").toFile())) {
             npmPackageInfo.readPackageInfo(fis);
@@ -126,6 +143,11 @@ private void createTempNpmrc(Path workingDir, List<String> installationArgs) thr
         npmrcProperties.setProperty("registry", npmRegistry);
         npmrcProperties.remove("metrics-registry");
 
+        // Save npm proxy
+        if (StringUtils.isNotBlank(npmProxy)) {
+            npmrcProperties.setProperty("proxy", npmProxy);
+        }
+
         // Write npmrc file
         StringBuilder stringBuffer = new StringBuilder();
         npmrcProperties.forEach((key, value) -> stringBuffer.append(key).append("=").append(value).append("\n"));

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

@@ -96,6 +96,10 @@ public void setProxyConfiguration(ProxyConfiguration proxy) {
         httpClient.setProxyConfiguration(proxy.host, proxy.port, proxy.username, proxy.password);
     }
 
+    public ProxyConfiguration getProxyConfiguration() {
+        return httpClient.getProxyConfiguration();
+    }
+
     /**
      * Log setter for the PreemptiveHttpClient for jobs like the Jenkins Generic job that uses NullLog by default.
      *