Repository navigation
Conversation
Contributor
PR Code Analyzer ❗AI-powered 'Code-Diff-Analyzer' found issues on commit ff7a6f9. ⛔ Hard block: Issues at High severity or above will block this PR from merging. 'Diff too large, requires skip by maintainers after manual review' Pull Requests Author(s): Please update your Pull Request according to the report above. Repository Maintainer(s): You can Thanks. |
Introduces gradle/fips.gradle as the single place where FIPS mode is decided and applied to the build's test surface: which test classes exist in each mode and the JVM arguments test workers need to actually be in FIPS mode. Mode is driven by the OPENSEARCH_FIPS_MODE environment variable, surfaced to production code through the new FipsMode enum. BC FIPS artifacts move to compileOnly in both modes (they are provided by OpenSearch core), bctls-fips is added, and the securityadmin standalone bundles now ship the BC FIPS jars in deps/. Because java_test.security registers BouncyCastleFipsProvider in every test JVM -- including non-FIPS runs -- any suite that touches JCA now leaves a "BC FIPS Entropy Daemon" thread behind, which RandomizedRunner reports as a leak. BCFipsEntropyDaemonFilter covers it; the framework's BouncyCastleThreadFilter does not. It is applied to the suites that trip over it here, and reused by later FIPS work. No FIPS variant test classes exist yet, so this otherwise lands inert: the default build is unchanged and fips.gradle currently selects nothing. Signed-off-by: Iwan Igonin <iigonin@sternad.de> Co-authored-by: Benny Goerzig <benny.goerzig@sap.com> Co-authored-by: Karsten Schnitter <k.schnitter@sap.com> Co-authored-by: Kai Sternad <k.sternad@sternad.de>
Replaces the isPkcs11()-style branching in the SSL configuration layer with sealed pem/jdk/pkcs11 records for both key stores and trust stores, and moves PKCS#11 dispatch into those records. Store passwords are wrapped in a StorePassword type so they are redacted in toString() rather than leaking into logs. A PKCS#11 store lives on the token rather than on disk, so the path becomes optional throughout: KeyStoreUtils loads such stores with a null stream, and error messages name the token instead of a file. PemKeyReader learns the PKCS11 store type and validates that a PKCS#11 provider is actually registered. Trust store settings that a PKCS#11 configuration ignores now produce a warning instead of being silently dropped. Signed-off-by: Iwan Igonin <iigonin@sternad.de> Co-authored-by: Benny Goerzig <benny.goerzig@sap.com> Co-authored-by: Karsten Schnitter <k.schnitter@sap.com> Co-authored-by: Kai Sternad <k.sternad@sternad.de>
…ader JNDI's LDAP provider never passes the target hostname to the SSLSocketFactory it instantiates (bcgit/bc-java#460), so an ldaps connection could not present an SNI extension and servers doing name-based virtual hosting returned the wrong certificate. SNISettingTLSSocketFactory carries the hostname through a ThreadLocal for the duration of the connect and sets it on the socket's SSL parameters; SniAwareConnection and HostnameAwareConnectionFactory drive it for the pooled and unpooled paths. The Java9CL classloader that worked around the provider's inability to see ldaptive's socket factory was private to LDAPAuthorizationBackend, so a reconnect from the ldap2 backend raised ClassNotFoundException. It is extracted as SocketFactoryClassLoader and shared by both backends. LDAPAuthorizationBackend also builds its PEM credentials through a keystore rather than createX509CredentialConfig, and stops setting the global com.sun.jndi.ldap.object.disableEndpointIdentification system property, which disabled hostname verification process-wide as a side effect of one connection. Signed-off-by: Iwan Igonin <iigonin@sternad.de> Co-authored-by: Benny Goerzig <benny.goerzig@sap.com> Co-authored-by: Karsten Schnitter <k.schnitter@sap.com> Co-authored-by: Kai Sternad <k.sternad@sternad.de>
…ypto The on-behalf-of signing/encryption secret could previously only be supplied as a base64 string in the cluster configuration. KeyUtils.loadKeyFromKeystore adds a keystore-backed alternative, configured through <prefix>_keystore_path / _keystore_type / _keystore_alias / _keystore_password / _keystore_key_password, with relative paths resolved against the node config directory. PemKeyReader.loadSecretKeyFromKeystore does the actual lookup and rejects entries that are not SecretKeys. EncryptionDecryptionUtil now derives its key lazily and fails closed, enforces a minimum input-keying-material length, and zeroizes key material after use. Its toString is redacted so the secret cannot reach a log through an accidental interpolation. BREAKING: the AES-GCM encryption format has changed, so on-behalf-of tokens issued by an earlier version can no longer be decrypted and must be reissued. Signed-off-by: Iwan Igonin <iigonin@sternad.de> Co-authored-by: Benny Goerzig <benny.goerzig@sap.com> Co-authored-by: Karsten Schnitter <k.schnitter@sap.com> Co-authored-by: Kai Sternad <k.sternad@sternad.de>
…e CLI Completes FIPS support on top of the build mode added earlier. Password hashing is restricted to PBKDF2 with a minimum password length, since shorter passwords cannot be hashed under the approved KDF; the REST API default is raised to match so the API cannot accept a password the hasher then rejects. validateFipsMode collects every configuration violation and reports them together, and now also verifies the BC provider is actually in approved-only mode. TLS drops TLSv1.1 and defaults stores to BCFKS in FIPS mode. PemKeyReader reads private keys through BC rather than the JCE PBE path removed by approved-only mode, and learns to detect JCEKS. UserService and the demo configuration tooling use FIPS-approved randomness, the securityadmin launchers source core's opensearch-env so the CLI runs with the FIPS java.security and approved-only flag while keeping the caller's working directory, and the Kerberos JAAS helper stops depending on non-approved primitives. Test support: the *FipsTests / *FipsIT variants that gradle/fips.gradle selects, FipsHashAdapter for rewriting fixture hashes, and the harness changes needed to run the suites under BC FIPS. HTTP/3 is refused in FIPS mode because the bundled BoringSSL is not built from the FIPS-validated branch. Signed-off-by: Iwan Igonin <iigonin@sternad.de> Co-authored-by: Benny Goerzig <benny.goerzig@sap.com> Co-authored-by: Karsten Schnitter <k.schnitter@sap.com> Co-authored-by: Kai Sternad <k.sternad@sternad.de>
iigonin
force-pushed
the
fips-split/5-fips-enforcement
branch
from
September 16, 2026 16:29
f7781cd to
ff7a6f9
Compare
2 of 5 tasks
beanuwave
marked this pull request as ready for review
September 17, 2026 07:28
beanuwave
requested review from
DarshitChanpura,
Rishav9852Kumar,
RyanL1997,
cwperks,
derek-ho,
finnegancarroll,
nibix,
reta,
shikharj05 and
willyborankin
as code owners
September 17, 2026 07:28
3 of 5 tasks
5 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Category: Enhancement, Bug fix
Completes FIPS support on top of the mode added in #6394. This is where the plugin actually becomes FIPS-capable.
Key changes
Keystores / TLS
PemKeyReaderrewritten onto BouncyCastle (PEMParser/JcaPEMKeyConverter/ PKCS8 decryptor) instead of raw JCE; adds BCFKS and store-type auto-detection.SSLConfigConstants: both defaults become FIPS-conditional - default store type is forced to BCFKS in FIPS, andALLOWED_SSL_PROTOCOLSdrops TLSv1.1 in FIPS.mainself-registered it at plugin load (OpenSearchSecuritySSLPlugin.tryAddSecurityProvider()->Security.addProvider(new BouncyCastleFipsProvider())); that method is removed. Providers now come solely from the activejava.securityfile (JCA lazy-loads them), so FIPS vs non-FIPS is a launch-time provider swap (BCJSSE vs SunJSSE) with no code branch - the security files are a core/distribution concern. Consequence: BCFKS stores on a non-FIPS node (e.g. OBO tokens: load the encryption key from a keystore and harden the crypto #6397's OBO Scenario C) now need BCFIPS registered as a provider on the non-FIPS node; the jars ship with core, but only core's lazyPemUtilsinitializer registers it. The plugin's tests always ship their ownjava_test.securitywith BCFIPS, so they do not catch a gap here - the release depends on core carrying that change (see Core / distribution follow-ups).Auth hardening (found mid-audit)
HTTPSpnegoAuthenticator: no longer mutates globalSystem.setPropertydebug flags; stops logging the acceptor principal; properLoginContext.logout()and decoded-header zeroing infinally.InternalAuthenticationBackend+PasswordHasher.getDummyHash(): the not-found timing path now uses the configured hasher, closing a user-enumeration side-channel under PBKDF2.PasswordValidator.FIPS_MIN_PASSWORD_LENGTH(14) anchors both ends: FIPS raises an unsetrestapi.password_min_lengthto 14, and startup rejects a lower explicit value - otherwise the REST API accepts passwords the hasher then refuses.validateFipsModecollects every violation and reports them together, and additionally verifies the BC provider is genuinely in approved-only mode.Randomness.createSecure()replacesnew SecureRandom()for api-tokens and user passwords (OBO encryption already uses it since OBO tokens: load the encryption key from a keystore and harden the crypto #6397) - it resolves to the approved SP 800-90A[4] DRBG in FIPS.UserServicegenerates 20-27 chars in FIPS (>=119 bits over the 62-char alphabet), 8-15 otherwise, withchar[]zeroed infinally.CLI
SecurityAdminaccepts BCFKS/PKCS11, with a PKCS#11 PIN prompt.buildPkcs11SslContextroutes PKCS#11 keys through SunJSSE client-side, the same reasoning as the server TLS layer in Model key and trust store configurations as records and support PKCS#11 #6395.opensearch-env, so the CLI runs with the bundled JDK, the Java version check and - underOPENSEARCH_FIPS_MODE=true- the FIPSjava.securityandapproved_onlyflag. They keep Copy scripts from tools to bin/ directory in assembly and make scripts agnostic to directory #6023's installation-independent home discovery and return to the caller's working directory, so documented relative-cd/-cacertpaths keep resolving.Test support
*FipsTests/*FipsITvariants thatgradle/fips.gradleselects (the first two arrive with OBO tokens: load the encryption key from a keystore and harden the crypto #6397).FipsHashAdapterrewrites static BCrypt fixtures and their short demo passwords to PBKDF2, padded past the 14-char floor (a no-op outside FIPS).Reviewer call-outs
securityadminnow runs through core's launcher environment - this targets the in-distribution path. The standalone bundle has not been self-launching since upstream Copy scripts from tools to bin/ directory in assembly and make scripts agnostic to directory #6023 removed thedeps/-relative classpath, so this PR does not change that; it is also not wired intoassemble(since Remove standalone admin tools zip file #1628, 2022).SunJGSSis deliberately retained for Kerberos/SPNEGO.Testing
In FIPS mode the build swaps in the FIPS
java.security(BCFIPS-only providers), enables-Dorg.bouncycastle.fips.approved_only=true, and points the JVM at the BCFKS truststore. FIPS-incompatible baselines (BCrypt, Argon2, SAML, SSLv3, JKS/PKCS12, weak/short passwords) are replaced by their*FipsTests/*FipsITvariants, following core's fork-the-suite convention.For a running cluster, select the FIPS-approved hasher in
opensearch.yml:The demo hashes in
config/opensearch-security/internal_users.ymlare BCrypt and will not verify under PBKDF2 - regenerate each test account's hash (e.g. withtools/hash.sh) before applying the security config.The manual walkthroughs below are the FIPS runs of the non-FIPS walkthroughs in #6395, #6396 and #6397 - only the FIPS deltas are spelled out; shared steps reference those PRs. Run the node with
OPENSEARCH_FIPS_MODE=true(the launcher loadsfips_java.security-> BCJSSE).Manual test: securityadmin.sh with BCFKS + PKCS#11 keystores (SoftHSM), FIPS
Extends #6395's node-side PKCS#11 test: the trust store becomes BCFKS, SunPKCS11 is registered in
fips_java.security, andsecurityadminauthenticates with a PKCS#11 client key (new in this PR). All paths are relative to$OPENSEARCH_HOME.Manual test: LDAP authentication over LDAPS, FIPS
Re-run #6396's LDAPS walkthrough (baseline, Scenario 1 hostname verification, Scenario 2 mTLS) for both backends with the node started under
OPENSEARCH_FIPS_MODE=true. Config, certs and expected outcomes are identical; what differs:enabled_ssl_protocols[TLSv1.3, TLSv1.2, TLSv1.1][TLSv1.3, TLSv1.2]Provider-specific log lines under BCJSSE (the ldaptive / plugin lines are unchanged):
Additional FIPS check (protocol floor, default
ldapbackend with trace logging on): the node logsenabled ssl/tls protocols for ldaps [TLSv1.3, TLSv1.2], where the non-FIPS run in #6396 logs[TLSv1.3, TLSv1.2, TLSv1.1]. Only the default narrows - an explicitenabled_ssl_protocolsis passed through unfiltered.Manual test: OnBehalfOf (OBO) token, FIPS
Re-run #6397's OBO walkthrough with the node under
OPENSEARCH_FIPS_MODE=true. Deltas:encryption_keymust now decode to >= 32 bytes (the FIPS IKM floor).FIPS-only negative check: Scenario A with a too-short
encryption_key(e.g.ZW5jcnlwdGlvbktleQ==, 13 bytes) is declined withConfigured encryption_key decodes to 13 bytes of key material, but FIPS mode requires at least 32 bytes.- the same key #6397 shows is accepted in non-FIPS.Manual test: OnBehalfOf (OBO) tokens across a rolling upgrade (3.8 -> 3.9), FIPS
Re-run #6397's rolling-upgrade walkthrough (phases 0-3, same stop / start / verify commands) on a cluster that runs on BC FIPS from the start, 3.8 nodes included - BC FIPS permits the ECB primitive, so a pre-3.9 FIPS cluster did issue AES/ECB tokens. Both cores switch through
OPENSEARCH_FIPS_MODE=truealone (bin/opensearch-envloadsconfig/fips_java.securityand sets-Dorg.bouncycastle.fips.approved_only=true).Setup deltas: start from a fresh cluster - the non-FIPS security index holds BCrypt hashes, and 3.9 refuses FIPS mode unless the hasher is PBKDF2. Before the first FIPS start, on every node:
plugins.security.password.hashing.algorithm: pbkdf2inopensearch.ymland a PBKDF2 admin hash ininternal_users.yml; a >= 14-char password on the node keystore, set withopensearch-keystore passwdoutside FIPS (with an empty password BC FIPS cannot open it:password must be at least 112 bits); and a JVM-wide BCFKS trust store viaopensearch-fips-demo-installer generated -n -p <password>(core refuses to start without-Djavax.net.ssl.trustStoreType=BCFKS). Then recreate role andobouser.Every start of #6397's walkthrough then runs with both variables exported:
What differs from #6397:
200+ role; format: legacy200+ role, and a WARN instead of the INFO, once per 3.9 node401- phases 1 and 2 therefore show 7/9200+ role; format check on a 3.9 node: AES-GCM from phase 1 on200+ role on every nodeThe
401is not a role problem: 3.8'sdecrypt()throws, its authenticator logs that only at DEBUG (Invalid or expired JWT token.) and returns no credentials, so the request falls through to HTTP Basic. That is the one-directional gap of #6397's call-out - for the length of the upgrade every token a 3.9 node issues is rejected by every 3.8 node. Either route token issuance to not-yet-upgraded nodes for that period, or accept 401 until the client lands on an upgraded node or asks for a new token.Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.