Skip to content

Commit f8cca8d

Browse files
ERROR - Need to move to SSLContext.
Signed-off-by: Finn Carroll <carrofin@amazon.com>
1 parent 62fd182 commit f8cca8d

File tree

1 file changed

+26
-1
lines changed

1 file changed

+26
-1
lines changed

src/main/java/org/opensearch/security/ssl/OpenSearchSecureSettingsFactory.java

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,15 @@
1616
import java.util.List;
1717
import java.util.Optional;
1818
import javax.net.ssl.KeyManagerFactory;
19+
import javax.net.ssl.SSLContext;
1920
import javax.net.ssl.SSLEngine;
2021
import javax.net.ssl.SSLException;
2122
import javax.net.ssl.TrustManagerFactory;
2223

2324
import org.opensearch.common.settings.Settings;
2425
import org.opensearch.http.HttpServerTransport;
2526
import org.opensearch.http.netty4.ssl.SecureNetty4HttpServerTransport;
27+
import org.opensearch.plugins.NetworkPlugin;
2628
import org.opensearch.plugins.SecureAuxTransportSettingsProvider;
2729
import org.opensearch.plugins.SecureHttpTransportSettingsProvider;
2830
import org.opensearch.plugins.SecureSettingsFactory;
@@ -34,6 +36,7 @@
3436
import org.opensearch.security.ssl.http.netty.Netty4HttpRequestHeaderVerifier;
3537
import org.opensearch.security.ssl.transport.SSLConfig;
3638
import org.opensearch.threadpool.ThreadPool;
39+
import org.opensearch.transport.AuxTransport;
3740
import org.opensearch.transport.Transport;
3841
import org.opensearch.transport.TransportAdapterProvider;
3942

@@ -189,6 +192,28 @@ public Optional<SSLEngine> buildSecureHttpServerEngine(Settings settings, HttpSe
189192

190193
@Override
191194
public Optional<SecureAuxTransportSettingsProvider> getSecureAuxTransportSettingsProvider(Settings settings) {
192-
return Optional.empty();
195+
return Optional.of(new SecureAuxTransportSettingsProvider() {
196+
197+
@Override
198+
public Optional<SSLContext> buildSecureAuxServerTransportContext(Settings settings, AuxTransport transport) throws SSLException {
199+
CertType auxTransportCertType = new CertType(transport.settingKey());
200+
return sslSettingsManager.sslContextHandler(auxTransportCertType).map(SslContextHandler::sslContext);
201+
}
202+
203+
@Override
204+
public Optional<SecureAuxTransportParameters> parameters() {
205+
return Optional.of(new SecureAuxTransportParameters() {
206+
@Override
207+
public Optional<String> clientAuth() {
208+
return Optional.empty();
209+
}
210+
211+
@Override
212+
public Collection<String> cipherSuites() {
213+
return List.of();
214+
}
215+
});
216+
}
217+
});
193218
}
194219
}

0 commit comments

Comments
 (0)