diff options
author | jonmv <venstad@gmail.com> | 2022-05-02 13:56:29 +0200 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2022-05-02 13:56:29 +0200 |
commit | 0b950e98b688edb6d67773c8ff536ba8db4c35d9 (patch) | |
tree | b76ffcd64ca12f959fb01e2dc5524658ddd4ff62 /http-utils/src | |
parent | 94589122f8da483788d1a69d3f0e2f919fb226ee (diff) |
Another utility method
Diffstat (limited to 'http-utils/src')
-rw-r--r-- | http-utils/src/main/java/ai/vespa/util/http/hc5/DefaultHttpClientBuilder.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/http-utils/src/main/java/ai/vespa/util/http/hc5/DefaultHttpClientBuilder.java b/http-utils/src/main/java/ai/vespa/util/http/hc5/DefaultHttpClientBuilder.java index 8ad9d63cd1a..6adbcbf068c 100644 --- a/http-utils/src/main/java/ai/vespa/util/http/hc5/DefaultHttpClientBuilder.java +++ b/http-utils/src/main/java/ai/vespa/util/http/hc5/DefaultHttpClientBuilder.java @@ -4,11 +4,13 @@ import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; import org.apache.hc.client5.http.impl.classic.HttpClients; import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder; +import org.apache.hc.client5.http.ssl.DefaultHostnameVerifier; import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactoryBuilder; import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.HttpHeaders; import org.apache.hc.core5.util.Timeout; +import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLContext; import java.time.Duration; import java.util.Map; @@ -27,17 +29,22 @@ public class DefaultHttpClientBuilder { private DefaultHttpClientBuilder() { } public static HttpClientBuilder create(SSLContext sslContext, String userAgent) { - return create(() -> sslContext, userAgent); + return create(() -> sslContext, new DefaultHostnameVerifier(), userAgent); + } + + public static HttpClientBuilder create(SSLContext sslContext, HostnameVerifier verifier, String userAgent) { + return create(() -> sslContext, verifier, userAgent); } /** Creates an HTTP client builder with the given SSL context, and using the provided timeouts for requests where config is not overridden. */ - public static HttpClientBuilder create(Supplier<SSLContext> sslContext, String userAgent) { + public static HttpClientBuilder create(Supplier<SSLContext> sslContext, HostnameVerifier verifier, String userAgent) { return HttpClientBuilder.create() .setConnectionManager(PoolingHttpClientConnectionManagerBuilder .create() .setSSLSocketFactory(SSLConnectionSocketFactoryBuilder .create() .setSslContext(sslContext.get()) + .setHostnameVerifier(verifier) .build()) .build()) .setUserAgent(userAgent) |