Gradle - Support insecure TLS (#610)

jfrog · Jan 31, 2022 · 69a21cc · 69a21cc
1 parent 3d304c8
commit 69a21cc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 19 deletions.
diff --git a/...extractor-gradle/src/main/groovy/org/jfrog/gradle/plugin/artifactory/task/DeployTask.java b/...extractor-gradle/src/main/groovy/org/jfrog/gradle/plugin/artifactory/task/DeployTask.java
@@ -12,10 +12,10 @@
 import org.gradle.api.logging.Logging;
 import org.gradle.api.tasks.InputFiles;
 import org.gradle.api.tasks.TaskAction;
-import org.jfrog.build.extractor.ci.BuildInfo;
-import org.jfrog.build.extractor.ci.BuildInfoConfigProperties;
 import org.jfrog.build.client.ArtifactoryUploadResponse;
 import org.jfrog.build.extractor.BuildInfoExtractorUtils;
+import org.jfrog.build.extractor.ci.BuildInfo;
+import org.jfrog.build.extractor.ci.BuildInfoConfigProperties;
 import org.jfrog.build.extractor.clientConfiguration.ArtifactoryClientConfiguration;
 import org.jfrog.build.extractor.clientConfiguration.IncludeExcludePatterns;
 import org.jfrog.build.extractor.clientConfiguration.PatternMatcher;
@@ -24,26 +24,13 @@
 import org.jfrog.build.extractor.clientConfiguration.deploy.DeployableArtifactsUtils;
 import org.jfrog.build.extractor.retention.Utils;
 import org.jfrog.gradle.plugin.artifactory.ArtifactoryPluginUtil;
-import org.jfrog.gradle.plugin.artifactory.extractor.GradleArtifactoryClientConfigUpdater;
-import org.jfrog.gradle.plugin.artifactory.extractor.GradleBuildInfoExtractor;
-import org.jfrog.gradle.plugin.artifactory.extractor.GradleClientLogger;
-import org.jfrog.gradle.plugin.artifactory.extractor.GradleDeployDetails;
-import org.jfrog.gradle.plugin.artifactory.extractor.ModuleInfoFileProducer;
+import org.jfrog.gradle.plugin.artifactory.extractor.*;
 
 import javax.annotation.Nonnull;
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.util.*;
+import java.util.concurrent.*;
 
 /**
  * @author Ruben Perez
@@ -195,6 +182,7 @@ private void deployArtifacts(ArtifactoryClientConfiguration accRoot, Map<String,
                             configureProxy(accRoot, artifactoryManager);
                             configConnectionTimeout(accRoot, artifactoryManager);
                             configRetriesParams(accRoot, artifactoryManager);
+                            configInsecureTls(accRoot, artifactoryManager);
                             deployArtifacts(artifactoryTask.deployDetails, artifactoryManager, patterns, logPrefix, publisher.getMinChecksumDeploySizeKb());
                         }
                     }
@@ -243,6 +231,11 @@ private void configRetriesParams(ArtifactoryClientConfiguration clientConf, Arti
         }
     }
 
+    private void configInsecureTls(ArtifactoryClientConfiguration clientConf, ArtifactoryManager artifactoryManager) {
+        log.debug("Deploying artifacts using InsecureTls = " + clientConf.getInsecureTls());
+        artifactoryManager.setInsecureTls(clientConf.getInsecureTls());
+    }
+
     private void exportBuildInfo(BuildInfo buildInfo, File toFile) throws IOException {
         log.debug("Exporting generated build info to '{}'", toFile.getAbsolutePath());
         BuildInfoExtractorUtils.saveBuildInfoToFile(buildInfo, toFile);
@@ -296,7 +289,7 @@ private void deployArtifacts(Set<GradleDeployDetails> allDeployDetails, Artifact
                 ArtifactoryUploadResponse response = artifactoryManager.upload(deployDetails, logPrefix, minChecksumDeploySizeKb);
                 detail.getDeployDetails().setDeploySucceeded(true);
                 detail.getDeployDetails().setSha256(response.getChecksums().getSha256());
-            } catch (IOException e){
+            } catch (IOException e) {
                 detail.getDeployDetails().setDeploySucceeded(false);
                 detail.getDeployDetails().setSha256("");
                 throw e;

diff --git a/...in/java/org/jfrog/build/extractor/clientConfiguration/ArtifactoryClientConfiguration.java b/...in/java/org/jfrog/build/extractor/clientConfiguration/ArtifactoryClientConfiguration.java
@@ -249,6 +249,10 @@ public boolean getInsecureTls() {
         return root.getBooleanValue(PROP_INSECURE_TLS, false);
     }
 
+    public void setInsecureTls(boolean enabled) {
+        root.setBooleanValue(PROP_INSECURE_TLS, enabled);
+    }
+
     public Integer getSocketTimeout() {
         return root.getIntegerValue(PROP_SO_TIMEOUT);
     }