Skip to content

Update logic in FipsBuildParams.isInFipsApprovedOnlyMode to check for env param instead of org.bouncycastle.fips.approved_only #21366

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
cwperks merged 1 commit into from
Apr 27, 2026
+27 −1
Merged

Update logic in FipsBuildParams.isInFipsApprovedOnlyMode to check for env param instead of org.bouncycastle.fips.approved_only #21366

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
4 changes: 3 additions & 1 deletion buildSrc/src/main/java/org/opensearch/gradle/info/FipsBuildParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
package org.opensearch.gradle.info;

import java.util.function.Function;
import java.util.function.Supplier;

public class FipsBuildParams {

Expand All @@ -18,6 +19,7 @@ public class FipsBuildParams {
public static final String DEFAULT_FIPS_MODE = "FIPS-140-3";

private static String fipsMode;
static Supplier<String> fipsModeEnvSupplier = () -> System.getenv("OPENSEARCH_FIPS_MODE");

public static void init(Function<String, Object> fipsValue) {
var fipsBuildParamForTests = Boolean.parseBoolean((String) fipsValue.apply(FIPS_BUILD_PARAM_FOR_TESTS));
Expand All @@ -37,7 +39,7 @@ public static boolean isInFipsMode() {
}

public static boolean isInFipsApprovedOnlyMode() {
return isInFipsMode() && "true".equals(System.getProperty("org.bouncycastle.fips.approved_only"));
return isInFipsMode() && "true".equalsIgnoreCase(fipsModeEnvSupplier.get());
}

public static String getFipsMode() {
Expand Down
24 changes: 24 additions & 0 deletions buildSrc/src/test/java/org/opensearch/gradle/info/FipsBuildParamsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,30 @@

public class FipsBuildParamsTests extends GradleUnitTestCase {

public void testIsInFipsApprovedOnlyMode() {
FipsBuildParams.init(cryptoEntryFnWithStringParam);

FipsBuildParams.fipsModeEnvSupplier = () -> "true";
assertTrue(FipsBuildParams.isInFipsApprovedOnlyMode());

FipsBuildParams.fipsModeEnvSupplier = () -> "TRUE";
assertTrue(FipsBuildParams.isInFipsApprovedOnlyMode());

FipsBuildParams.fipsModeEnvSupplier = () -> "false";
assertFalse(FipsBuildParams.isInFipsApprovedOnlyMode());

FipsBuildParams.fipsModeEnvSupplier = () -> null;
assertFalse(FipsBuildParams.isInFipsApprovedOnlyMode());

// Not in FIPS mode — should always be false regardless of env var
FipsBuildParams.init(param -> null);
FipsBuildParams.fipsModeEnvSupplier = () -> "true";
assertFalse(FipsBuildParams.isInFipsApprovedOnlyMode());

// Reset
FipsBuildParams.fipsModeEnvSupplier = () -> System.getenv("OPENSEARCH_FIPS_MODE");
}

public void testIsInFipsMode() {
FipsBuildParams.init(cryptoEntryFnWithStringParam);
assertTrue(FipsBuildParams.isInFipsMode());
Expand Down
Loading