@@ -91,6 +91,7 @@ public void testReloadingKeyStore() throws Exception {
91
91
final Settings settings = Settings .builder ()
92
92
.put ("path.home" , createTempDir ())
93
93
.put ("xpack.security.transport.ssl.keystore.path" , keystorePath )
94
+ .put ("xpack.security.transport.ssl.supported_protocols" , "TLSv1.2" )
94
95
.setSecureSettings (secureSettings )
95
96
.build ();
96
97
final Environment env = randomBoolean () ? null : TestEnvironment .newEnvironment (settings );
@@ -149,6 +150,7 @@ public void testPEMKeyConfigReloading() throws Exception {
149
150
.put ("xpack.security.transport.ssl.key" , keyPath )
150
151
.put ("xpack.security.transport.ssl.certificate" , certPath )
151
152
.putList ("xpack.security.transport.ssl.certificate_authorities" , certPath .toString ())
153
+ .put ("xpack.security.transport.ssl.supported_protocols" , "TLSv1.2" )
152
154
.setSecureSettings (secureSettings )
153
155
.build ();
154
156
final Environment env = randomBoolean () ? null :
@@ -193,7 +195,6 @@ public void testPEMKeyConfigReloading() throws Exception {
193
195
* Tests the reloading of SSLContext when the trust store is modified. The same store is used as a TrustStore (for the
194
196
* reloadable SSLContext used in the HTTPClient) and as a KeyStore for the MockWebServer
195
197
*/
196
- @ AwaitsFix (bugUrl = "https://github.com/elastic/elasticsearch/issues/38247" )
197
198
public void testReloadingTrustStore () throws Exception {
198
199
assumeFalse ("Can't run in a FIPS JVM" , inFipsJvm ());
199
200
Path tempDir = createTempDir ();
@@ -206,6 +207,7 @@ public void testReloadingTrustStore() throws Exception {
206
207
secureSettings .setString ("xpack.security.transport.ssl.truststore.secure_password" , "testnode" );
207
208
Settings settings = Settings .builder ()
208
209
.put ("xpack.security.transport.ssl.truststore.path" , trustStorePath )
210
+ .put ("xpack.security.transport.ssl.supported_protocols" , "TLSv1.2" )
209
211
.put ("path.home" , createTempDir ())
210
212
.setSecureSettings (secureSettings )
211
213
.build ();
@@ -241,10 +243,10 @@ public void testReloadingTrustStore() throws Exception {
241
243
validateSSLConfigurationIsReloaded (settings , env , trustMaterialPreChecks , modifier , trustMaterialPostChecks );
242
244
}
243
245
}
246
+
244
247
/**
245
248
* Test the reloading of SSLContext whose trust config is backed by PEM certificate files.
246
249
*/
247
- @ AwaitsFix (bugUrl = "https://github.com/elastic/elasticsearch/issues/38247" )
248
250
public void testReloadingPEMTrustConfig () throws Exception {
249
251
Path tempDir = createTempDir ();
250
252
Path serverCertPath = tempDir .resolve ("testnode.crt" );
@@ -257,6 +259,7 @@ public void testReloadingPEMTrustConfig() throws Exception {
257
259
Files .copy (getDataPath ("/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode_updated.crt" ), updatedCert );
258
260
Settings settings = Settings .builder ()
259
261
.putList ("xpack.security.transport.ssl.certificate_authorities" , serverCertPath .toString ())
262
+ .put ("xpack.security.transport.ssl.supported_protocols" , "TLSv1.2" )
260
263
.put ("path.home" , createTempDir ())
261
264
.build ();
262
265
Environment env = randomBoolean () ? null : TestEnvironment .newEnvironment (settings );
@@ -305,6 +308,7 @@ public void testReloadingKeyStoreException() throws Exception {
305
308
secureSettings .setString ("xpack.security.transport.ssl.keystore.secure_password" , "testnode" );
306
309
Settings settings = Settings .builder ()
307
310
.put ("xpack.security.transport.ssl.keystore.path" , keystorePath )
311
+ .put ("xpack.security.transport.ssl.supported_protocols" , "TLSv1.2" )
308
312
.setSecureSettings (secureSettings )
309
313
.put ("path.home" , createTempDir ())
310
314
.build ();
@@ -346,6 +350,7 @@ public void testReloadingPEMKeyConfigException() throws Exception {
346
350
.put ("xpack.security.transport.ssl.key" , keyPath )
347
351
.put ("xpack.security.transport.ssl.certificate" , certPath )
348
352
.putList ("xpack.security.transport.ssl.certificate_authorities" , certPath .toString (), clientCertPath .toString ())
353
+ .put ("xpack.security.transport.ssl.supported_protocols" , "TLSv1.2" )
349
354
.put ("path.home" , createTempDir ())
350
355
.setSecureSettings (secureSettings )
351
356
.build ();
@@ -381,6 +386,7 @@ public void testTrustStoreReloadException() throws Exception {
381
386
secureSettings .setString ("xpack.security.transport.ssl.truststore.secure_password" , "testnode" );
382
387
Settings settings = Settings .builder ()
383
388
.put ("xpack.security.transport.ssl.truststore.path" , trustStorePath )
389
+ .put ("xpack.security.transport.ssl.supported_protocols" , "TLSv1.2" )
384
390
.put ("path.home" , createTempDir ())
385
391
.setSecureSettings (secureSettings )
386
392
.build ();
@@ -414,6 +420,7 @@ public void testPEMTrustReloadException() throws Exception {
414
420
Files .copy (getDataPath ("/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient.crt" ), clientCertPath );
415
421
Settings settings = Settings .builder ()
416
422
.putList ("xpack.security.transport.ssl.certificate_authorities" , clientCertPath .toString ())
423
+ .put ("xpack.security.transport.ssl.supported_protocols" , "TLSv1.2" )
417
424
.put ("path.home" , createTempDir ())
418
425
.build ();
419
426
Environment env = randomBoolean () ? null : TestEnvironment .newEnvironment (settings );
0 commit comments