Skip to content

[Backport 3.3] Fix the enforce_hostname_verification check for flight transport #19580

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
merged 1 commit into from
Oct 9, 2025
Merged

[Backport 3.3] Fix the enforce_hostname_verification check for flight transport #19580

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
2 changes: 1 addition & 1 deletion ...s/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/FlightService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ protected void doStart() {
allocator = AccessController.doPrivileged((PrivilegedAction<BufferAllocator>) () -> new RootAllocator(Integer.MAX_VALUE));
serverComponents.setAllocator(allocator);
SslContextProvider sslContextProvider = ServerConfig.isSslEnabled()
? new DefaultSslContextProvider(secureTransportSettingsProvider)
? new DefaultSslContextProvider(secureTransportSettingsProvider, serverComponents.clusterService.getSettings())
: null;
serverComponents.setSslContextProvider(sslContextProvider);
serverComponents.initComponents();
Expand Down
15 changes: 13 additions & 2 deletions ...pc/src/main/java/org/opensearch/arrow/flight/bootstrap/tls/DefaultSslContextProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

package org.opensearch.arrow.flight.bootstrap.tls;

import org.opensearch.common.network.NetworkModule;
import org.opensearch.common.settings.Settings;
import org.opensearch.plugins.SecureTransportSettingsProvider;

import javax.net.ssl.SSLException;
Expand All @@ -21,20 +23,24 @@
import io.netty.handler.ssl.SslContextBuilder;
import io.netty.handler.ssl.SslProvider;
import io.netty.handler.ssl.SupportedCipherSuiteFilter;
import io.netty.handler.ssl.util.InsecureTrustManagerFactory;

/**
* DefaultSslContextProvider is an implementation of the SslContextProvider interface that provides SSL contexts based on the provided SecureTransportSettingsProvider.
*/
public class DefaultSslContextProvider implements SslContextProvider {

private final SecureTransportSettingsProvider secureTransportSettingsProvider;
private final Settings settings;

/**
* Constructor for DefaultSslContextProvider.
* @param secureTransportSettingsProvider The SecureTransportSettingsProvider instance.
* @param settings The cluster settings.
*/
public DefaultSslContextProvider(SecureTransportSettingsProvider secureTransportSettingsProvider) {
public DefaultSslContextProvider(SecureTransportSettingsProvider secureTransportSettingsProvider, Settings settings) {
this.secureTransportSettingsProvider = secureTransportSettingsProvider;
this.settings = settings;
}

// TODO - handle certificates reload
Expand Down Expand Up @@ -79,6 +85,7 @@ public SslContext getServerSslContext() {
public SslContext getClientSslContext() {
try {
SecureTransportSettingsProvider.SecureTransportParameters parameters = secureTransportSettingsProvider.parameters(null).get();

return SslContextBuilder.forClient()
.sslProvider(SslProvider.valueOf(parameters.sslProvider().get().toUpperCase(Locale.ROOT)))
.protocols(parameters.protocols())
Expand All @@ -95,7 +102,11 @@ public SslContext getClientSslContext() {
.sessionCacheSize(0)
.sessionTimeout(0)
.keyManager(parameters.keyManagerFactory().get())
.trustManager(parameters.trustManagerFactory().get())
.trustManager(
NetworkModule.TRANSPORT_SSL_ENFORCE_HOSTNAME_VERIFICATION.get(settings)
? parameters.trustManagerFactory().get()
: InsecureTrustManagerFactory.INSTANCE
)
.build();
} catch (SSLException e) {
throw new RuntimeException(e);
Expand Down
2 changes: 1 addition & 1 deletion ...ow-flight-rpc/src/main/java/org/opensearch/arrow/flight/transport/FlightStreamPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ public Map<String, Supplier<Transport>> getSecureTransports(
flightService.setSecureTransportSettingsProvider(secureTransportSettingsProvider);
}
if (isStreamTransportEnabled && ServerConfig.isSslEnabled()) {
SslContextProvider sslContextProvider = new DefaultSslContextProvider(secureTransportSettingsProvider);
SslContextProvider sslContextProvider = new DefaultSslContextProvider(secureTransportSettingsProvider, settings);
return Collections.singletonMap(
"FLIGHT-SECURE",
() -> new FlightTransport(
Expand Down
Loading