Skip to content

transport-netty4 module set TLS SNI when server_name is provided #20321

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

Merged
reta merged 7 commits into from
Jan 6, 2026
Merged

transport-netty4 module set TLS SNI when server_name is provided #20321

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6775bdb
transport-netty4 module set TLS SNI when server_name is provided
orages Dec 24, 2025
457db05
add buildSecureClientTransportEngine hook with serverName to handle SNI
orages Jan 2, 2026
5aea68d
delegate SNI configuration to the secureTransportSettingsProvider
orages Jan 2, 2026
848871a
update CHANGELOG.md
orages Jan 2, 2026
13d3a22
fix Changelog.md
orages Jan 2, 2026
755a500
Merge branch 'main' into 17316-cross-cluster-search-in-proxy-mode-not…
orages Jan 5, 2026
edb90c1
fix format
orages Jan 6, 2026
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
31 changes: 30 additions & 1 deletion ...sport-netty4/src/main/java/org/opensearch/transport/netty4/ssl/SecureNetty4Transport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,18 @@
import org.opensearch.transport.netty4.Netty4Transport;
import org.opensearch.transport.netty4.ssl.SecureConnectionTestUtil.SSLConnectionTestResult;

import javax.net.ssl.SNIHostName;
import javax.net.ssl.SNIServerName;
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLParameters;

import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.List;

import io.netty.channel.Channel;
import io.netty.channel.ChannelHandler;
Expand Down Expand Up @@ -181,6 +186,7 @@ protected static class ClientSSLHandler extends ChannelOutboundHandlerAdapter {
private final SecureTransportSettingsProvider secureTransportSettingsProvider;
private final boolean hostnameVerificationEnabled;
private final boolean hostnameVerificationResovleHostName;
private final String serverName;

private ClientSSLHandler(
final Settings settings,
Expand All @@ -192,6 +198,21 @@ private ClientSSLHandler(
this.secureTransportSettingsProvider = secureTransportSettingsProvider;
this.hostnameVerificationEnabled = hostnameVerificationEnabled;
this.hostnameVerificationResovleHostName = hostnameVerificationResovleHostName;
this.serverName = null;
}

private ClientSSLHandler(
final Settings settings,
final SecureTransportSettingsProvider secureTransportSettingsProvider,
final boolean hostnameVerificationEnabled,
final boolean hostnameVerificationResovleHostName,
final String serverName
) {
this.settings = settings;
this.secureTransportSettingsProvider = secureTransportSettingsProvider;
this.hostnameVerificationEnabled = hostnameVerificationEnabled;
this.hostnameVerificationResovleHostName = hostnameVerificationResovleHostName;
this.serverName = serverName;
}

@Override
Expand Down Expand Up @@ -243,6 +264,13 @@ public void connect(ChannelHandlerContext ctx, SocketAddress remoteAddress, Sock
} catch (final SSLException e) {
throw ExceptionsHelper.convertToOpenSearchException(e);
}
if (serverName != null) {
SSLParameters params = sslEngine.getSSLParameters();
List<SNIServerName> serverNames = new ArrayList<>(1);
serverNames.add(new SNIHostName(serverName));
params.setServerNames(serverNames);
sslEngine.setSSLParameters(params);
}

final SslHandler sslHandler = new SslHandler(sslEngine);
ctx.pipeline().replace(this, "ssl_client", sslHandler);
Expand Down Expand Up @@ -299,7 +327,8 @@ protected void initChannel(Channel ch) throws Exception {
settings,
secureTransportSettingsProvider,
hostnameVerificationEnabled,
hostnameVerificationResolveHostName
hostnameVerificationResolveHostName,
node.getAttributes().get("server_name")
)
);
} else {
Expand Down
Loading