Skip to content

Apply SslOptions from SslBundle to SslContextBuilder. #3861

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Apply SslOptions from SslBundle to SslContextBuilder. #3861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 11 additions & 5 deletions ...ver-webflux/src/main/java/org/springframework/cloud/gateway/config/GrpcSslConfigurer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

import org.springframework.boot.ssl.SslBundle;
import org.springframework.boot.ssl.SslBundles;
import org.springframework.boot.ssl.SslOptions;

/**
* @author Alberto C. Ríos
Expand All @@ -49,20 +50,25 @@ private SslContext getSslContext() throws SSLException {

final HttpClientProperties.Ssl ssl = getSslProperties();
boolean useInsecureTrustManager = ssl.isUseInsecureTrustManager();
SslBundle bundle = getBundle();
SslBundle sslBundle = getBundle();
if (useInsecureTrustManager) {
sslContextBuilder.trustManager(InsecureTrustManagerFactory.INSTANCE.getTrustManagers()[0]);
}

if (!useInsecureTrustManager && ssl.getTrustedX509Certificates().size() > 0) {
sslContextBuilder.trustManager(getTrustedX509CertificatesForTrustManager());
}
else if (bundle != null) {
sslContextBuilder.trustManager(bundle.getManagers().getTrustManagerFactory());
else if (sslBundle != null) {
sslContextBuilder.trustManager(sslBundle.getManagers().getTrustManagerFactory());
}

if (bundle != null) {
sslContextBuilder.keyManager(bundle.getManagers().getKeyManagerFactory());
if (sslBundle != null) {
sslContextBuilder.keyManager(sslBundle.getManagers().getKeyManagerFactory());
SslOptions sslOptions = sslBundle.getOptions();
if (sslOptions != null && sslOptions.isSpecified()) {
sslContextBuilder.ciphers(SslOptions.asSet(sslOptions.getCiphers()));
sslContextBuilder.protocols(sslOptions.getEnabledProtocols());
}
}
else {
sslContextBuilder.keyManager(getKeyManagerFactory());
Expand Down
19 changes: 13 additions & 6 deletions ...bflux/src/main/java/org/springframework/cloud/gateway/config/HttpClientSslConfigurer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import java.security.cert.X509Certificate;

import io.netty.handler.ssl.SslContextBuilder;
import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
import reactor.netty.http.Http11SslContextSpec;
import reactor.netty.http.Http2SslContextSpec;
Expand All @@ -26,6 +27,7 @@

import org.springframework.boot.ssl.SslBundle;
import org.springframework.boot.ssl.SslBundles;
import org.springframework.boot.ssl.SslOptions;
import org.springframework.boot.web.server.autoconfigure.ServerProperties;

public class HttpClientSslConfigurer extends AbstractSslConfigurer<HttpClient, HttpClient> {
Expand All @@ -52,24 +54,29 @@ public HttpClient configureSsl(HttpClient client) {
}

protected void configureSslContext(HttpClientProperties.Ssl ssl, SslProvider.SslContextSpec sslContextSpec) {
SslProvider.ProtocolSslContextSpec clientSslContext = (serverProperties.getHttp2().isEnabled())
SslProvider.GenericSslContextSpec<SslContextBuilder> clientSslContext = serverProperties.getHttp2().isEnabled()
? Http2SslContextSpec.forClient() : Http11SslContextSpec.forClient();
clientSslContext.configure(sslContextBuilder -> {
X509Certificate[] trustedX509Certificates = getTrustedX509CertificatesForTrustManager();
SslBundle bundle = getBundle();
SslBundle sslBundle = getBundle();
if (trustedX509Certificates.length > 0) {
setTrustManager(sslContextBuilder, trustedX509Certificates);
}
else if (ssl.isUseInsecureTrustManager()) {
setTrustManager(sslContextBuilder, InsecureTrustManagerFactory.INSTANCE);
}
else if (bundle != null) {
setTrustManager(sslContextBuilder, bundle.getManagers().getTrustManagerFactory());
else if (sslBundle != null) {
setTrustManager(sslContextBuilder, sslBundle.getManagers().getTrustManagerFactory());
}

try {
if (bundle != null) {
sslContextBuilder.keyManager(bundle.getManagers().getKeyManagerFactory());
if (sslBundle != null) {
sslContextBuilder.keyManager(sslBundle.getManagers().getKeyManagerFactory());
SslOptions sslOptions = sslBundle.getOptions();
if (sslOptions != null && sslOptions.isSpecified()) {
sslContextBuilder.ciphers(SslOptions.asSet(sslOptions.getCiphers()));
sslContextBuilder.protocols(sslOptions.getEnabledProtocols());
}
}
else {
sslContextBuilder.keyManager(getKeyManagerFactory());
Expand Down