Revert "Merge pull request #22393 from vespa-engine/revert-22386-jonmv/remove-last-controller-jersey-client"

This reverts commit 04898b34190a3e3bb9d3053e11eb892bc48ff842, reversing
changes made to 3a757528a0a978d44cb1bd9aae28b567c477d139.

1 files changed, 6 insertions, 3 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..8866d67fd60 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;
@@ -26,18 +28,19 @@ public class DefaultHttpClientBuilder {
 
     private DefaultHttpClientBuilder() { }
 
-    public static HttpClientBuilder create(SSLContext sslContext, String userAgent) {
-        return create(() -> sslContext, userAgent);
+    public static HttpClientBuilder create(Supplier<SSLContext> sslContext, String userAgent) {
+        return create(sslContext, new DefaultHostnameVerifier(), 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)