Backport xpkg verification fix to release-2.3 - #1038
Merged
Conversation
The CachedClient.Get path was: 1. fetcher.Head(parsedResolvedRef) -> resolves tag -> digest D 2. validator.Validate(ref=D, vc) -> cosign verifies D 3. fetcher.Fetch(parsedResolvedRef) -> remote.Image(tag) 4. img.Manifest() (called by ExtractPackageYAML) -> GET tag again Steps 1 and 4 hit the registry independently. A registry that serves different content between the two requests can have step 2 verify a benign signed digest while step 4 returns an unsigned malicious manifest, and the consumer (Crossplane) installs the malicious package despite the ImageConfig signature verification succeeding. Pin the Fetch (and the validator call) to digestRef so the digest we verify is the digest we pull. Signed-off-by: tonghuaroot <tonghuaroot@gmail.com> (cherry picked from commit 4250323)
jbw976
approved these changes
Jun 16, 2026
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
3 participants
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 of your changes
Manual backport of the fix for GHSA-mf7q-r4rv-jv94 to the v2.3 release branch.
I have:
./nix.sh flake checkto ensure this PR is ready for review.- [ ] Added or updated unit tests.~- [ ] Linked a PR or a docs tracking issue to document this change.~n
- [ ] Addedbackport release-x.ylabels to auto-backport this PR.