Allow custom SSLContext and user agent

1 files changed, 25 insertions, 2 deletions

diff --git a/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/JerseyJaxRsClientFactory.java b/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/JerseyJaxRsClientFactory.java
index 5fd72432702..deacfcdd494 100644
--- a/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/JerseyJaxRsClientFactory.java
+++ b/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/JerseyJaxRsClientFactory.java
@@ -6,10 +6,14 @@ import org.glassfish.jersey.client.ClientProperties;
 import org.glassfish.jersey.client.HttpUrlConnectorProvider;
 import org.glassfish.jersey.client.proxy.WebResourceFactory;
 
+import javax.net.ssl.SSLContext;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.ClientRequestFilter;
 import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.UriBuilder;
+import java.util.Collections;
 
 /**
  * @author bakksjo
@@ -20,14 +24,26 @@ public class JerseyJaxRsClientFactory implements JaxRsClientFactory {
 
     private final int connectTimeoutMs;
     private final int readTimeoutMs;
+    private final SSLContext sslContext;
+    private final String userAgent;
 
     public JerseyJaxRsClientFactory() {
         this(DEFAULT_CONNECT_TIMEOUT_MS, DEFAULT_READ_TIMEOUT_MS);
     }
 
+    public JerseyJaxRsClientFactory(SSLContext sslContext, String userAgent) {
+        this(DEFAULT_CONNECT_TIMEOUT_MS, DEFAULT_READ_TIMEOUT_MS, sslContext, userAgent);
+    }
+
     public JerseyJaxRsClientFactory(final int connectTimeoutMs, final int readTimeoutMs) {
+        this(connectTimeoutMs, readTimeoutMs, null, null);
+    }
+
+    public JerseyJaxRsClientFactory(int connectTimeoutMs, int readTimeoutMs, SSLContext sslContext, String userAgent) {
         this.connectTimeoutMs = connectTimeoutMs;
         this.readTimeoutMs = readTimeoutMs;
+        this.sslContext = sslContext;
+        this.userAgent = userAgent;
     }
 
     /**
@@ -38,13 +54,20 @@ public class JerseyJaxRsClientFactory implements JaxRsClientFactory {
     @Override
     public <T> T createClient(final Class<T> apiClass, final HostName hostName, final int port, final String pathPrefix, String scheme) {
         final UriBuilder uriBuilder = UriBuilder.fromPath(pathPrefix).host(hostName.s()).port(port).scheme(scheme);
-        final Client webClient = ClientBuilder.newClient()
+        ClientBuilder builder = ClientBuilder.newBuilder()
                 .property(ClientProperties.CONNECT_TIMEOUT, connectTimeoutMs)
                 .property(ClientProperties.READ_TIMEOUT, readTimeoutMs)
                 .property(ClientProperties.SUPPRESS_HTTP_COMPLIANCE_VALIDATION, true) // Allow empty PUT. TODO: Fix API.
                 .property(HttpUrlConnectorProvider.SET_METHOD_WORKAROUND, true) // Allow e.g. PATCH method.
                 .property(ClientProperties.FOLLOW_REDIRECTS, true);
-        final WebTarget target = webClient.target(uriBuilder);
+        if (sslContext != null) {
+            builder.sslContext(sslContext);
+        }
+        if (userAgent != null) {
+            builder.register((ClientRequestFilter) context ->
+                    context.getHeaders().put(HttpHeaders.USER_AGENT, Collections.singletonList(userAgent)));
+        }
+        final WebTarget target = builder.build().target(uriBuilder);
         // TODO: Check if this fills up non-heap memory with loaded classes.
         return WebResourceFactory.newResource(apiClass, target);
     }