Skip to content

Commit 1ee6393

Browse files
authored
[TEST]Split transport verification mode none tests (#32488)
This commit splits SecurityNetty4TransportTests in two methods one handling verification mode certificate and full and one handling verification mode none. This is done so that the second method can be muted in a FIPS 140 JVM where verification mode none cannot be used.
1 parent 018e77c commit 1ee6393

File tree

1 file changed

+19
-4
lines changed

1 file changed

+19
-4
lines changed

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/transport/netty4/SecurityNetty4TransportTests.java

+19-4
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,37 @@
2121

2222
public class SecurityNetty4TransportTests extends ESTestCase {
2323

24-
public void testGetTransportProfileConfigurations() {
24+
public void testGetSecureTransportProfileConfigurations() {
2525
final Settings settings = Settings.builder()
2626
.put("path.home", createTempDir())
2727
.put("xpack.security.transport.ssl.verification_mode", VerificationMode.CERTIFICATE.name())
2828
.put("transport.profiles.full.xpack.security.ssl.verification_mode", VerificationMode.FULL.name())
2929
.put("transport.profiles.cert.xpack.security.ssl.verification_mode", VerificationMode.CERTIFICATE.name())
30-
.put("transport.profiles.none.xpack.security.ssl.verification_mode", VerificationMode.NONE.name())
3130
.build();
3231
final Environment env = TestEnvironment.newEnvironment(settings);
3332
SSLService sslService = new SSLService(settings, env);
3433
final SSLConfiguration defaultConfig = sslService.getSSLConfiguration("xpack.security.transport.ssl");
3534
final Map<String, SSLConfiguration> profileConfigurations = getTransportProfileConfigurations(settings, sslService, defaultConfig);
36-
assertThat(profileConfigurations.size(), Matchers.equalTo(4));
37-
assertThat(profileConfigurations.keySet(), Matchers.containsInAnyOrder("full", "cert", "none", "default"));
35+
assertThat(profileConfigurations.size(), Matchers.equalTo(3));
36+
assertThat(profileConfigurations.keySet(), Matchers.containsInAnyOrder("full", "cert", "default"));
3837
assertThat(profileConfigurations.get("full").verificationMode(), Matchers.equalTo(VerificationMode.FULL));
3938
assertThat(profileConfigurations.get("cert").verificationMode(), Matchers.equalTo(VerificationMode.CERTIFICATE));
39+
assertThat(profileConfigurations.get("default"), Matchers.sameInstance(defaultConfig));
40+
}
41+
42+
public void testGetInsecureTransportProfileConfigurations() {
43+
assumeFalse("Can't run in a FIPS JVM with verification mode None", inFipsJvm());
44+
final Settings settings = Settings.builder()
45+
.put("path.home", createTempDir())
46+
.put("xpack.security.transport.ssl.verification_mode", VerificationMode.CERTIFICATE.name())
47+
.put("transport.profiles.none.xpack.security.ssl.verification_mode", VerificationMode.NONE.name())
48+
.build();
49+
final Environment env = TestEnvironment.newEnvironment(settings);
50+
SSLService sslService = new SSLService(settings, env);
51+
final SSLConfiguration defaultConfig = sslService.getSSLConfiguration("xpack.security.transport.ssl");
52+
final Map<String, SSLConfiguration> profileConfigurations = getTransportProfileConfigurations(settings, sslService, defaultConfig);
53+
assertThat(profileConfigurations.size(), Matchers.equalTo(2));
54+
assertThat(profileConfigurations.keySet(), Matchers.containsInAnyOrder("none", "default"));
4055
assertThat(profileConfigurations.get("none").verificationMode(), Matchers.equalTo(VerificationMode.NONE));
4156
assertThat(profileConfigurations.get("default"), Matchers.sameInstance(defaultConfig));
4257
}

0 commit comments

Comments
 (0)