Skip to content

Mute enrollment tests in FIPS 140-2 mode #74538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 24, 2021
Merged

Mute enrollment tests in FIPS 140-2 mode #74538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions .../elasticsearch/xpack/security/action/enrollment/TransportKibanaEnrollmentActionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.elasticsearch.xpack.core.ssl.SSLConfiguration;
import org.elasticsearch.xpack.core.ssl.SSLService;
import org.junit.Before;
import org.junit.BeforeClass;

import java.nio.file.Files;
import java.nio.file.Path;
Expand All @@ -50,19 +51,23 @@ public class TransportKibanaEnrollmentActionTests extends ESTestCase {
private List<ChangePasswordRequest> changePasswordRequests;
private TransportKibanaEnrollmentAction action;
private Client client;
private Path httpCaPath;

@BeforeClass
public static void muteInFips(){
assumeFalse("Enrollment is not supported in FIPS 140-2 as we are using PKCS#12 keystores", inFipsJvm());
}

@Before @SuppressWarnings("unchecked") public void setup() throws Exception {
changePasswordRequests = new ArrayList<>();
final Environment env = mock(Environment.class);
final Path tempDir = createTempDir();
httpCaPath = tempDir.resolve("httpCa.p12");
final Path httpCaPath = tempDir.resolve("httpCa.p12");
Files.copy(getDataPath("/org/elasticsearch/xpack/security/action/enrollment/httpCa.p12"), httpCaPath);
when(env.configFile()).thenReturn(tempDir);
final MockSecureSettings secureSettings = new MockSecureSettings();
secureSettings.setString("keystore.secure_password", "password");
final Settings settings = Settings.builder()
.put("keystore.path", "httpCa.p12")
.put("keystore.path", httpCaPath)
.setSecureSettings(secureSettings)
.build();
when(env.settings()).thenReturn(settings);
Expand Down
6 changes: 6 additions & 0 deletions ...src/test/java/org/elasticsearch/xpack/security/enrollment/CreateEnrollmentTokenTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.elasticsearch.xpack.security.tool.HttpResponse;
import org.hamcrest.Matchers;
import org.junit.Before;
import org.junit.BeforeClass;

import java.io.IOException;
import java.net.HttpURLConnection;
Expand All @@ -50,6 +51,11 @@
public class CreateEnrollmentTokenTests extends ESTestCase {
private Environment environment;

@BeforeClass
public static void muteInFips(){
assumeFalse("Enrollment is not supported in FIPS 140-2 as we are using PKCS#12 keystores", inFipsJvm());
}

@Before
public void setupMocks() throws Exception {
final Path tempDir = createTempDir();
Expand Down