Skip to content

Commit 69a21cc

Browse files
authored
Gradle - Support insecure TLS (#610)
1 parent 3d304c8 commit 69a21cc

File tree

2 files changed

+16
-19
lines changed

2 files changed

+16
-19
lines changed

build-info-extractor-gradle/src/main/groovy/org/jfrog/gradle/plugin/artifactory/task/DeployTask.java

+12-19
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
import org.gradle.api.logging.Logging;
1313
import org.gradle.api.tasks.InputFiles;
1414
import org.gradle.api.tasks.TaskAction;
15-
import org.jfrog.build.extractor.ci.BuildInfo;
16-
import org.jfrog.build.extractor.ci.BuildInfoConfigProperties;
1715
import org.jfrog.build.client.ArtifactoryUploadResponse;
1816
import org.jfrog.build.extractor.BuildInfoExtractorUtils;
17+
import org.jfrog.build.extractor.ci.BuildInfo;
18+
import org.jfrog.build.extractor.ci.BuildInfoConfigProperties;
1919
import org.jfrog.build.extractor.clientConfiguration.ArtifactoryClientConfiguration;
2020
import org.jfrog.build.extractor.clientConfiguration.IncludeExcludePatterns;
2121
import org.jfrog.build.extractor.clientConfiguration.PatternMatcher;
@@ -24,26 +24,13 @@
2424
import org.jfrog.build.extractor.clientConfiguration.deploy.DeployableArtifactsUtils;
2525
import org.jfrog.build.extractor.retention.Utils;
2626
import org.jfrog.gradle.plugin.artifactory.ArtifactoryPluginUtil;
27-
import org.jfrog.gradle.plugin.artifactory.extractor.GradleArtifactoryClientConfigUpdater;
28-
import org.jfrog.gradle.plugin.artifactory.extractor.GradleBuildInfoExtractor;
29-
import org.jfrog.gradle.plugin.artifactory.extractor.GradleClientLogger;
30-
import org.jfrog.gradle.plugin.artifactory.extractor.GradleDeployDetails;
31-
import org.jfrog.gradle.plugin.artifactory.extractor.ModuleInfoFileProducer;
27+
import org.jfrog.gradle.plugin.artifactory.extractor.*;
3228

3329
import javax.annotation.Nonnull;
3430
import java.io.File;
3531
import java.io.IOException;
36-
import java.util.ArrayList;
37-
import java.util.HashMap;
38-
import java.util.LinkedHashSet;
39-
import java.util.List;
40-
import java.util.Map;
41-
import java.util.Set;
42-
import java.util.concurrent.CompletableFuture;
43-
import java.util.concurrent.ConcurrentHashMap;
44-
import java.util.concurrent.ExecutionException;
45-
import java.util.concurrent.ExecutorService;
46-
import java.util.concurrent.Executors;
32+
import java.util.*;
33+
import java.util.concurrent.*;
4734

4835
/**
4936
* @author Ruben Perez
@@ -195,6 +182,7 @@ private void deployArtifacts(ArtifactoryClientConfiguration accRoot, Map<String,
195182
configureProxy(accRoot, artifactoryManager);
196183
configConnectionTimeout(accRoot, artifactoryManager);
197184
configRetriesParams(accRoot, artifactoryManager);
185+
configInsecureTls(accRoot, artifactoryManager);
198186
deployArtifacts(artifactoryTask.deployDetails, artifactoryManager, patterns, logPrefix, publisher.getMinChecksumDeploySizeKb());
199187
}
200188
}
@@ -243,6 +231,11 @@ private void configRetriesParams(ArtifactoryClientConfiguration clientConf, Arti
243231
}
244232
}
245233

234+
private void configInsecureTls(ArtifactoryClientConfiguration clientConf, ArtifactoryManager artifactoryManager) {
235+
log.debug("Deploying artifacts using InsecureTls = " + clientConf.getInsecureTls());
236+
artifactoryManager.setInsecureTls(clientConf.getInsecureTls());
237+
}
238+
246239
private void exportBuildInfo(BuildInfo buildInfo, File toFile) throws IOException {
247240
log.debug("Exporting generated build info to '{}'", toFile.getAbsolutePath());
248241
BuildInfoExtractorUtils.saveBuildInfoToFile(buildInfo, toFile);
@@ -296,7 +289,7 @@ private void deployArtifacts(Set<GradleDeployDetails> allDeployDetails, Artifact
296289
ArtifactoryUploadResponse response = artifactoryManager.upload(deployDetails, logPrefix, minChecksumDeploySizeKb);
297290
detail.getDeployDetails().setDeploySucceeded(true);
298291
detail.getDeployDetails().setSha256(response.getChecksums().getSha256());
299-
} catch (IOException e){
292+
} catch (IOException e) {
300293
detail.getDeployDetails().setDeploySucceeded(false);
301294
detail.getDeployDetails().setSha256("");
302295
throw e;

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

+4
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,10 @@ public boolean getInsecureTls() {
249249
return root.getBooleanValue(PROP_INSECURE_TLS, false);
250250
}
251251

252+
public void setInsecureTls(boolean enabled) {
253+
root.setBooleanValue(PROP_INSECURE_TLS, enabled);
254+
}
255+
252256
public Integer getSocketTimeout() {
253257
return root.getIntegerValue(PROP_SO_TIMEOUT);
254258
}

0 commit comments

Comments
 (0)