✨ Added SSL Support for Spring RestClient RestClient

Author: rmcdouga

spring/fluentforms-spring-boot-autoconfigure/src/main/java/com/_4point/aem/fluentforms/spring/FluentFormsAutoConfiguration.java

@@ -1,18 +1,22 @@
 package com._4point.aem.fluentforms.spring;
 
 import java.io.InputStream;
+import java.util.function.Consumer;
 import java.util.function.Function;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.web.client.RestClientSsl;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.ssl.NoSuchSslBundleException;
 import org.springframework.boot.ssl.SslBundles;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.web.client.RestClient;
 
 import com._4point.aem.docservices.rest_services.client.af.AdaptiveFormsService;
 import com._4point.aem.docservices.rest_services.client.assembler.RestServicesDocAssemblerServiceAdapter;
@@ -79,11 +83,22 @@ private <T extends Builder> T setAemFields(T builder, AemConfiguration aemConfig
 	@ConditionalOnProperty(prefix="fluentforms", name="restclient", havingValue="springrestclient", matchIfMissing=false )
 	@ConditionalOnMissingBean
 	@Bean
-	public RestClientFactory springRestClientFactory(AemConfiguration aemConfig, @Autowired(required = false) SslBundles sslBundles) {
-		// TODO: Figure out how to configure Spring RestClient with SSL bundle (if required - it may not be)
-		return SpringRestClientRestClient.factory(); // Create a RestClientFactory using Spring RestClient implementation
+	public RestClientFactory springRestClientFactory(AemConfiguration aemConfig, RestClient.Builder restClientBuilder, RestClientSsl restClientSsl) {
+		return SpringRestClientRestClient.factory(aemConfig.useSsl() ? restClientBuilder.apply(getSslBundle(aemConfig.sslBundle(), restClientSsl))
+																	 : restClientBuilder
+												); // Create a RestClientFactory using Spring RestClient implementation
 	}
 
+
+	private Consumer<org.springframework.web.client.RestClient.Builder> getSslBundle(String sslBundleName, RestClientSsl restClientSsl) {
+		try {
+			return restClientSsl.fromBundle(sslBundleName);
+		} catch (NoSuchSslBundleException e) {
+			// Default to normal SSL context (which includes the default trust store)
+			return b->{}; // No-op;
+		}
+	}
+	
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(org.glassfish.jersey.client.JerseyClient.class)
 	public static class JerseyRestClientConfiguration {

spring/fluentforms-spring-boot-autoconfigure/src/main/java/com/_4point/aem/fluentforms/spring/JerseyClientFactory.java

@@ -35,6 +35,7 @@ public static Client createClient(SslBundles sslBundles, String bundleName) {
 				return ClientBuilder.newBuilder().sslContext(sslContext).build();
 			} catch (NoSuchSslBundleException e)  {
 				// Eat the exception and fall through to the default client
+				// Default the SSL context (which includes the default trust store)
 			}
 		}
 		logger.info("Creating default client");

spring/fluentforms-spring-boot-autoconfigure/src/main/java/com/_4point/aem/fluentforms/spring/rest_services/client/SpringRestClientRestClient.java

@@ -34,10 +34,6 @@ public class SpringRestClientRestClient implements RestClient {
 	private final String target;
 	private final Supplier<String> correlationIdFn;
 
-	private SpringRestClientRestClient(AemConfig aemConfig, String target, Supplier<String> correlationIdFn) {
-		this(createSpringRestClient(aemConfig, target), getTarget(aemConfig, target), correlationIdFn);
-	}
-
 	private SpringRestClientRestClient(org.springframework.web.client.RestClient springRestClient, String target,	Supplier<String> correlationIdFn) {
 		this.springRestClient = springRestClient;
 		this.target = target;
@@ -65,16 +61,24 @@ public RestClient.GetRequest.Builder getRequestBuilder(String additionalPath) {
 	}
 
 	public static RestClientFactory factory() {
-		return (aemConfig, target, correlationIdFn)->new SpringRestClientRestClient(aemConfig, target, correlationIdFn);
+		return factory(org.springframework.web.client.RestClient.builder());
+	}
+
+	public static RestClientFactory factory(org.springframework.web.client.RestClient.Builder builder) {
+		return (aemConfig, target, correlationIdFn) -> 
+					new SpringRestClientRestClient(createSpringRestClient(aemConfig, target, builder), target, correlationIdFn);
 	}
 
-	private static org.springframework.web.client.RestClient createSpringRestClient(AemConfig aemConfig, String target) {
+	private static org.springframework.web.client.RestClient createSpringRestClient(
+			AemConfig aemConfig, 
+			String target, 
+			org.springframework.web.client.RestClient.Builder builder
+			) {
 		ClientHttpRequestInterceptor basicAuth = new BasicAuthenticationInterceptor(aemConfig.user(), aemConfig.password());
-		
-		return org.springframework.web.client.RestClient.builder()
-														.baseUrl(getTarget(aemConfig, target))
-														.requestInterceptor(basicAuth)
-														.build();
+
+		return builder.baseUrl(getTarget(aemConfig, target))
+					  .requestInterceptor(basicAuth)
+					  .build();
 	}
 
 	private static String getTarget(AemConfig aemConfig, String additionalPath) {

spring/fluentforms-spring-boot-autoconfigure/src/test/java/com/_4point/aem/fluentforms/spring/FluentFormsAutoConfigurationTest.java

@@ -175,6 +175,42 @@ void testRestClientFactory(@Autowired RestClientFactory factory, @Autowired AemC
 		}
 	}
 
+	@SpringBootTest(classes = {com._4point.aem.fluentforms.spring.FluentFormsAutoConfigurationTest.TestApplication.class, FluentFormsAutoConfiguration.class}, 
+			properties = {
+					"fluentforms.aem.servername=localhost", 
+					"fluentforms.aem.port=4502", 
+					"fluentforms.aem.user=admin",		 
+					"fluentforms.aem.password=admin",
+					"fluentforms.aem.usessl=true",
+					"fluentforms.restclient=springrestclient"	// Configure for Spring RestClient
+					})
+	public static class SpringRestClient_SslNoBundleTest {
+		
+		@Test
+		void testRestClientFactory(@Autowired RestClientFactory factory, @Autowired AemConfiguration config) {
+			RestClient client = factory.apply(toAemConfig(config) , "testRestClientFactory", ()->"correlationId");
+			assertTrue(client instanceof SpringRestClientRestClient, "RestClientFactory should return a SpringRestClientRestClient when configured to do so");
+		}
+	}
+
+	@SpringBootTest(classes = {com._4point.aem.fluentforms.spring.FluentFormsAutoConfigurationTest.TestApplication.class, FluentFormsAutoConfiguration.class}, 
+			properties = {
+					"fluentforms.aem.servername=localhost", 
+					"fluentforms.aem.port=4502", 
+					"fluentforms.aem.user=admin",		 
+					"fluentforms.aem.password=admin",
+					"fluentforms.aem.usessl=true",
+					"fluentforms.restclient=jersey"	// Configure for Jersey RestClient
+					})
+	public static class JserseyRestClient_SslBundleTest {
+		
+		@Test
+		void testRestClientFactory(@Autowired RestClientFactory factory, @Autowired AemConfiguration config) {
+			RestClient client = factory.apply(toAemConfig(config) , "testRestClientFactory", ()->"correlationId");
+			assertTrue(client instanceof JerseyRestClient, "RestClientFactory should return a JerseyRestClient when configured to do so");
+		}
+	}
+
 	private static AemConfig toAemConfig(AemConfiguration config) {
 		return new AemConfig() {