Skip to content

Commit c51dba1

Browse files
Remove engine from settings provider. Fetch raw params instead.
Signed-off-by: Finn Carroll <[email protected]>
1 parent ab544ce commit c51dba1

File tree

1 file changed

+38
-3
lines changed

1 file changed

+38
-3
lines changed

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

+38-3
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,44 @@ public Optional<SSLEngine> buildSecureHttpServerEngine(Settings settings, HttpSe
198198
public Optional<SecureAuxTransportSettingsProvider> getSecureAuxTransportSettingsProvider(Settings settings) {
199199
return Optional.of(new SecureAuxTransportSettingsProvider() {
200200
@Override
201-
public Optional<SSLEngine> buildSecureAuxServerEngine() {
202-
return sslSettingsManager.sslContextHandler(CertType.AUX).map(SslContextHandler::createSSLEngine);
203-
};
201+
public Optional<SecureAuxTransportSettingsProvider.SecureAuxTransportParameters> parameters() {
202+
return Optional.of(new SecureAuxTransportSettingsProvider.SecureAuxTransportParameters() {
203+
204+
@Override
205+
public Optional<String> sslProvider() {
206+
return sslSettingsManager.sslConfiguration(CertType.AUX).map(config -> config.sslParameters().provider().name());
207+
}
208+
209+
@Override
210+
public Optional<String> clientAuth() {
211+
return sslSettingsManager.sslConfiguration(CertType.AUX).map(config -> config.sslParameters().clientAuth().name());
212+
}
213+
214+
@Override
215+
public Collection<String> protocols() {
216+
return sslSettingsManager.sslConfiguration(CertType.AUX)
217+
.map(config -> config.sslParameters().allowedProtocols())
218+
.orElse(Collections.emptyList());
219+
}
220+
221+
@Override
222+
public Collection<String> cipherSuites() {
223+
return sslSettingsManager.sslConfiguration(CertType.AUX)
224+
.map(config -> config.sslParameters().allowedCiphers())
225+
.orElse(Collections.emptyList());
226+
}
227+
228+
@Override
229+
public Optional<KeyManagerFactory> keyManagerFactory() {
230+
return sslSettingsManager.sslConfiguration(CertType.AUX).map(SslConfiguration::keyStoreFactory);
231+
}
232+
233+
@Override
234+
public Optional<TrustManagerFactory> trustManagerFactory() {
235+
return sslSettingsManager.sslConfiguration(CertType.AUX).map(SslConfiguration::trustStoreFactory);
236+
}
237+
});
238+
}
204239
});
205240
}
206241
}

0 commit comments

Comments
 (0)