Skip to content

Commit ca99af7

Browse files
authored
BI-568 - Allow setting the SSL Context in the base client (#461)
1 parent 5eea35b commit ca99af7

File tree

3 files changed

+21
-0
lines changed

3 files changed

+21
-0
lines changed

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

+7
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.jfrog.build.api.util.Log;
3535
import org.jfrog.build.util.URI;
3636

37+
import javax.net.ssl.SSLContext;
3738
import java.io.IOException;
3839
import java.io.InputStream;
3940
import java.nio.charset.StandardCharsets;
@@ -65,6 +66,7 @@ public class ArtifactoryHttpClient implements AutoCloseable {
6566
private int connectionRetries = DEFAULT_CONNECTION_RETRY;
6667
private ProxyConfiguration proxyConfiguration;
6768
private boolean insecureTls = false;
69+
private SSLContext sslContext;
6870

6971
private PreemptiveHttpClient deployClient;
7072

@@ -137,6 +139,10 @@ public void setInsecureTls(boolean insecureTls) {
137139
this.insecureTls = insecureTls;
138140
}
139141

142+
public void setSslContext(SSLContext sslContext) {
143+
this.sslContext = sslContext;
144+
}
145+
140146
public int getConnectionRetries() {
141147
return connectionRetries;
142148
}
@@ -165,6 +171,7 @@ public PreemptiveHttpClient getHttpClient(int connectionTimeout) {
165171
.setConnectionRetries(connectionRetries)
166172
.setInsecureTls(insecureTls)
167173
.setTimeout(connectionTimeout)
174+
.setSslContext(sslContext)
168175
.setLog(log);
169176
if (proxyConfiguration != null) {
170177
clientBuilder.setProxyConfiguration(proxyConfiguration);

Diff for: build-info-extractor/src/main/java/org/jfrog/build/extractor/clientConfiguration/ArtifactoryClientBuilderBase.java

+9
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.jfrog.build.client.ProxyConfiguration;
66
import org.jfrog.build.extractor.clientConfiguration.client.ArtifactoryBaseClient;
77

8+
import javax.net.ssl.SSLContext;
89
import java.io.Serializable;
910

1011
/**
@@ -18,6 +19,7 @@ public abstract class ArtifactoryClientBuilderBase<T extends ArtifactoryClientBu
1819
protected int connectionTimeout = -1;
1920
protected int connectionRetry = -1;
2021
protected String artifactoryUrl;
22+
protected SSLContext sslContext;
2123
protected String username;
2224
protected String password;
2325
protected String accessToken;
@@ -43,6 +45,11 @@ public T setArtifactoryUrl(String artifactoryUrl) {
4345
return self();
4446
}
4547

48+
public T setSslContext(SSLContext sslContext) {
49+
this.sslContext = sslContext;
50+
return self();
51+
}
52+
4653
public T setUsername(String username) {
4754
this.username = username;
4855
return self();
@@ -106,6 +113,8 @@ protected ArtifactoryBaseClient build(ArtifactoryBaseClient client) {
106113
proxyConfiguration.password);
107114
}
108115

116+
client.setSslContext(sslContext);
117+
109118
if (connectionTimeout != -1) {
110119
client.setConnectionTimeout(connectionTimeout);
111120
}

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

+5
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.jfrog.build.client.ArtifactoryVersion;
1313
import org.jfrog.build.client.ProxyConfiguration;
1414

15+
import javax.net.ssl.SSLContext;
1516
import java.io.IOException;
1617

1718
/**
@@ -120,6 +121,10 @@ public void setInsecureTls(boolean insecureTls) {
120121
httpClient.setInsecureTls(insecureTls);
121122
}
122123

124+
public void setSslContext(SSLContext sslContext) {
125+
httpClient.setSslContext(sslContext);
126+
}
127+
123128
public String getArtifactoryUrl() {
124129
return artifactoryUrl;
125130
}

0 commit comments

Comments
 (0)