Skip to content

SSL configuration overwrites other WebClient customization #35914

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

Closed
wants to merge 2 commits into from
Closed

SSL configuration overwrites other WebClient customization #35914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
837bd75
Apply SslConfigurer on previously configured HttpClient
fcappi Jun 15, 2023
d4d4c75
Add tests to validate client mapper when using sslBundle
fcappi Jun 16, 2023
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
14 changes: 7 additions & 7 deletions ...rk/boot/autoconfigure/web/reactive/function/client/ReactorClientHttpConnectorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ class ReactorClientHttpConnectorFactory implements ClientHttpConnectorFactory<Re

@Override
public ReactorClientHttpConnector createClientHttpConnector(SslBundle sslBundle) {
ReactorNettyHttpClientMapper mapper = this.mappers.get()
.reduce((before, after) -> (client) -> after.configure(before.configure(client)))
.orElse((client) -> client);
if (sslBundle != null) {
mapper = new SslConfigurer(sslBundle)::configure;
}
return new ReactorClientHttpConnector(this.reactorResourceFactory, mapper::configure);
final ReactorNettyHttpClientMapper mapper =
Stream.concat(
this.mappers.get(),
Stream.ofNullable(sslBundle != null ? (ReactorNettyHttpClientMapper) new SslConfigurer(sslBundle)::configure : null))
.reduce((before, after) -> (client) -> after.configure(before.configure(client)))
.orElse((client) -> client);

return new ReactorClientHttpConnector(this.reactorResourceFactory, mapper::configure);
}

/**
Expand Down
9 changes: 8 additions & 1 deletion ...oconfigure/web/reactive/function/client/ClientHttpConnectorFactoryConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
import org.junit.jupiter.api.Test;

import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.ssl.SslBundle;
import org.springframework.boot.ssl.SslBundleKey;
import org.springframework.boot.ssl.jks.JksSslStoreBundle;
import org.springframework.boot.ssl.jks.JksSslStoreDetails;
import org.springframework.boot.test.context.FilteredClassLoader;
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
import org.springframework.context.annotation.Bean;
Expand Down Expand Up @@ -80,11 +84,14 @@ private JettyClientHttpConnectorFactory getJettyClientHttpConnectorFactory(

@Test
void shouldApplyHttpClientMapper() {
JksSslStoreDetails storeDetails = JksSslStoreDetails.forLocation("classpath:test.jks");
JksSslStoreBundle stores = new JksSslStoreBundle(storeDetails, storeDetails);
SslBundle sslBundle = SslBundle.of(stores, SslBundleKey.of("password"));
new ReactiveWebApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(ClientHttpConnectorFactoryConfiguration.ReactorNetty.class))
.withUserConfiguration(CustomHttpClientMapper.class)
.run((context) -> {
context.getBean(ReactorClientHttpConnectorFactory.class).createClientHttpConnector();
context.getBean(ReactorClientHttpConnectorFactory.class).createClientHttpConnector(sslBundle);
assertThat(CustomHttpClientMapper.called).isTrue();
});
}
Expand Down