fix(provider): enforce X.509-SVID leaf profile validation#433
Open
maxlambrecht wants to merge 1 commit into
Open
fix(provider): enforce X.509-SVID leaf profile validation#433maxlambrecht wants to merge 1 commit into
maxlambrecht wants to merge 1 commit into
Conversation
maxlambrecht
force-pushed
the
fix/trust-manager-x509-svid-profile
branch
2 times, most recently
from
May 9, 2026 20:37
2ada65e to
5c5b85b
Compare
Signed-off-by: Max Lambrecht <[email protected]>
maxlambrecht
force-pushed
the
fix/trust-manager-x509-svid-profile
branch
from
July 18, 2026 20:37
5c5b85b to
c4cb49b
Compare
bcleenders
added a commit
to bcleenders/java-spiffe
that referenced
this pull request
Jul 22, 2026
`SpiffeTrustManager` invoked the `SpiffeIdVerifier` before any cryptographic validation. The callback received an unvalidated, attacker-supplied chain despite the verifier's [API spec calling it `verifiedChain`](https://github.com/spiffe/java-spiffe/blob/55200fc8e6b01f9da5951c379e4f4187d7f920b7/java-spiffe-provider/src/main/java/io/spiffe/provider/SpiffeIdVerifier.java#L13). Validate the chain against the trust bundle first and only then invoke the verifier. This matches go-spiffe, where [the `Authorizer` only receives chains returned by `x509svid.ParseAndVerify`](https://github.com/spiffe/go-spiffe/blob/v2.8.1/spiffetls/tlsconfig/config.go#L193-L201) (ParseAndVerify first checks the certificates, authorizer checks if the SPIFFE ID is authorized). Observable change: for a chain that is both untrusted and carries an unacceptable SPIFFE ID, the reported error is now the chain validation failure, rather than the verifier error. There is a small conflict on imports with spiffe#433 , so if you poke me after that one is merged, I'm happy to rebase.
bcleenders
added a commit
to bcleenders/java-spiffe
that referenced
this pull request
Jul 22, 2026
`SpiffeTrustManager` invoked the `SpiffeIdVerifier` before any cryptographic validation. The callback received an unvalidated, attacker-supplied chain despite the verifier's [API spec calling it `verifiedChain`](https://github.com/spiffe/java-spiffe/blob/55200fc8e6b01f9da5951c379e4f4187d7f920b7/java-spiffe-provider/src/main/java/io/spiffe/provider/SpiffeIdVerifier.java#L13). Validate the chain against the trust bundle first and only then invoke the verifier. This matches go-spiffe, where [the `Authorizer` only receives chains returned by `x509svid.ParseAndVerify`](https://github.com/spiffe/go-spiffe/blob/v2.8.1/spiffetls/tlsconfig/config.go#L193-L201) (`ParseAndVerify` first checks the certificates, afterwards `Authorizer` checks if the SPIFFE ID is authorized). Observable change: for a chain that is both untrusted and carries an unacceptable SPIFFE ID, the reported error is now the chain validation failure, rather than the verifier error. There is a small conflict on imports with spiffe#433 , so if you poke me after that one is merged, I'm happy to rebase.
bcleenders
added a commit
to bcleenders/java-spiffe
that referenced
this pull request
Jul 22, 2026
`SpiffeTrustManager` invoked the `SpiffeIdVerifier` before any cryptographic validation. The callback received an unvalidated, attacker-supplied chain despite the verifier's [API spec calling it `verifiedChain`](https://github.com/spiffe/java-spiffe/blob/55200fc8e6b01f9da5951c379e4f4187d7f920b7/java-spiffe-provider/src/main/java/io/spiffe/provider/SpiffeIdVerifier.java#L13). Validate the chain against the trust bundle first and only then invoke the verifier. This matches go-spiffe, where [the `Authorizer` only receives chains returned by `x509svid.ParseAndVerify`](https://github.com/spiffe/go-spiffe/blob/v2.8.1/spiffetls/tlsconfig/config.go#L193-L201) (`ParseAndVerify` first checks the certificates, afterwards `Authorizer` checks if the SPIFFE ID is authorized). Observable change: for a chain that is both untrusted and carries an unacceptable SPIFFE ID, the reported error is now the chain validation failure, rather than the verifier error. There is a small conflict on imports with spiffe#433 , so if you poke me after that one is merged, I'm happy to rebase. Signed-off-by: bcleenders <[email protected]>
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
1 participant
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.
What
Enforce X.509-SVID leaf profile validation when
SpiffeTrustManagervalidates TLS peer certificate chains.This extracts the existing
X509Svidleaf checks into a package-privateX509SvidProfilehelper and reuses it from bothX509Svidparsing andX509SvidValidator.verifyChain(...).Why
SpiffeTrustManagerpreviously extracted and authorized the SPIFFE ID and performed PKIX validation, but it did not reject peer leaf certificates that violated the X.509-SVID leaf profile.This closes that gap by rejecting peer leaf certificates with CA=true, missing
digitalSignature,keyCertSign,cRLSign, or more than one URI SAN, including one SPIFFE URI plus an additional non-SPIFFE URI.How tested
Ran:
./gradlew :java-spiffe-core:test --tests io.spiffe.svid.x509svid.X509SvidTest --tests io.spiffe.svid.x509svid.X509SvidValidatorTest :java-spiffe-provider:test --tests io.spiffe.provider.SpiffeTrustManagerTest