Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use SystemSocketFactory instead of the default factory for SSL socket factory #2592

Merged
merged 3 commits into from
Jul 16, 2020
Merged

Use SystemSocketFactory instead of the default factory for SSL socket factory #2592

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2dd543d
Solving https:/GoogleContainerTools/jib/issues/2585
jacksierkstra Jul 16, 2020
ca8269d
Using ApacheHttpTransport.newDefaultHttpClientBuilder() instead of co…
jacksierkstra Jul 16, 2020
60fd859
Applied formatting.
jacksierkstra Jul 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion jib-core/src/main/java/com/google/cloud/tools/jib/http/FailoverHttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import java.util.function.Supplier;
import javax.net.ssl.SSLException;
import org.apache.http.conn.ssl.NoopHostnameVerifier;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.impl.client.HttpClientBuilder;

/**
Expand Down Expand Up @@ -97,7 +98,10 @@ private static HttpTransport getSecureHttpTransport() {
//
// A new ApacheHttpTransport needs to be created for each connection because otherwise HTTP
// connection persistence causes the connection to throw NoHttpResponseException.
return new ApacheHttpTransport();
HttpClientBuilder httpClientBuilder =
ApacheHttpTransport.newDefaultHttpClientBuilder()
.setSSLSocketFactory(SSLConnectionSocketFactory.getSystemSocketFactory());
return new ApacheHttpTransport(httpClientBuilder.build());
}

private static HttpTransport getInsecureHttpTransport() {
Expand Down