From 0c3ce8daae1d10705a8a1d616c8e3d27187b7572 Mon Sep 17 00:00:00 2001 From: Ioannis Kakavas Date: Wed, 2 Oct 2019 14:57:26 +0300 Subject: [PATCH] Fix ADRealmTests in FIPS 140 JVMs The changes introduced in #47179 made it so that we could try to build an SSLContext with verification mode set to None, which is not allowed in FIPS 140 JVMs. This commit address that --- .../xpack/security/authc/ldap/ActiveDirectoryRealmTests.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/ActiveDirectoryRealmTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/ActiveDirectoryRealmTests.java index 055b3b3d0cd64..4080b318a2eeb 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/ActiveDirectoryRealmTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/ActiveDirectoryRealmTests.java @@ -533,12 +533,12 @@ private Settings settings(RealmConfig.RealmIdentifier realmIdentifier, Settings .put(getFullSettingKey(realmIdentifier.getName(), ActiveDirectorySessionFactorySettings.AD_DOMAIN_NAME_SETTING), "ad.test.elasticsearch.com") .put(getFullSettingKey(realmIdentifier, DnRoleMapperSettings.USE_UNMAPPED_GROUPS_AS_ROLES_SETTING), true); - if (randomBoolean()) { + if (inFipsJvm()) { builder.put(getFullSettingKey(realmIdentifier, SSLConfigurationSettings.VERIFICATION_MODE_SETTING_REALM), VerificationMode.CERTIFICATE); } else { builder.put(getFullSettingKey(realmIdentifier, SSLConfigurationSettings.VERIFICATION_MODE_SETTING_REALM), - VerificationMode.NONE); + randomBoolean() ? VerificationMode.CERTIFICATE : VerificationMode.NONE); } return builder.put(extraSettings).build(); }