Skip to content

[Backport 3.3] Add security provider earlier in bootstrap process (#5749) #5756

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 5 commits into from
Oct 29, 2025
Merged

[Backport 3.3] Add security provider earlier in bootstrap process (#5749) #5756

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8df05d6
Add security provider earlier in bootstrap process (#5749)
terryquigleysas Oct 29, 2025
82d3af0
Merge branch '3.3' into backport-5749-to-3.3
DarshitChanpura Oct 29, 2025
b0745f8
Merge branch 'backport-5749-to-3.3' of https://github.com/cwperks/sec…
cwperks Oct 29, 2025
0f94231
Add SuppressWarnings
cwperks Oct 29, 2025
c8af863
disambiguate
cwperks Oct 29, 2025
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
15 changes: 0 additions & 15 deletions src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import java.security.AccessController;
import java.security.MessageDigest;
import java.security.PrivilegedAction;
import java.security.Security;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
Expand Down Expand Up @@ -65,7 +64,6 @@
import org.apache.logging.log4j.Logger;
import org.apache.lucene.search.QueryCachingPolicy;
import org.apache.lucene.search.Weight;
import org.bouncycastle.jcajce.provider.BouncyCastleFipsProvider;
import org.bouncycastle.util.encoders.Hex;

import org.opensearch.OpenSearchException;
Expand Down Expand Up @@ -429,8 +427,6 @@ public OpenSearchSecurityPlugin(final Settings settings, final Path configPath)
demoCertHashes.add("ba9c5a61065f7f6115188128ffbdaa18fca34562b78b811f082439e2bef1d282"); // esnode-key
demoCertHashes.add("bcd708e8dc707ae065f7ad8582979764b497f062e273d478054ab2f49c5469c6"); // root-ca

tryAddSecurityProvider();

final String advancedModulesEnabledKey = ConfigConstants.SECURITY_ADVANCED_MODULES_ENABLED;
if (settings.hasValue(advancedModulesEnabledKey)) {
deprecationLogger.deprecate("Setting {} is ignored.", advancedModulesEnabledKey);
Expand Down Expand Up @@ -2460,17 +2456,6 @@ public Optional<SecureSettingsFactory> getSecureSettingFactory(Settings settings
);
}

@SuppressWarnings("removal")
private void tryAddSecurityProvider() {
AccessController.doPrivileged((PrivilegedAction<Object>) () -> {
if (Security.getProvider("BCFIPS") == null) {
Security.addProvider(new BouncyCastleFipsProvider());
log.debug("Bouncy Castle FIPS Provider added");
}
return null;
});
}

// CS-SUPPRESS-SINGLE: RegexpSingleline get Resource Sharing Extensions
@Override
public void loadExtensions(ExtensionLoader loader) {
Expand Down
14 changes: 14 additions & 0 deletions src/main/java/org/opensearch/security/ssl/OpenSearchSecuritySSLPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.nio.file.Path;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.security.Security;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
Expand All @@ -34,6 +35,7 @@
import com.fasterxml.jackson.databind.InjectableValues;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.bouncycastle.jcajce.provider.BouncyCastleFipsProvider;

import org.opensearch.OpenSearchException;
import org.opensearch.SpecialPermission;
Expand Down Expand Up @@ -256,6 +258,8 @@ public Object run() {
log.error("SSL not activated for http and/or transport.");
}

tryAddSecurityProvider();

this.sslSettingsManager = new SslSettingsManager(new Environment(settings, configPath));
}

Expand Down Expand Up @@ -772,4 +776,14 @@ protected Settings migrateSettings(Settings settings) {
public ThreadPool getThreadPool() {
return this.threadPool;
}

private void tryAddSecurityProvider() {
AccessController.doPrivileged(() -> {
if (Security.getProvider("BCFIPS") == null) {
Security.addProvider(new BouncyCastleFipsProvider());
log.debug("Bouncy Castle FIPS Provider added");
}
return null;
});
}
}
Loading