backpopulate supplier & set filesAnalyzed=false #1137
Merged
Conversation
This file contains 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
xnox
force-pushed
the
backpopulate-supplier
branch
2 times, most recently
from
783ac88
to
1999ef5
Compare
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@chainguard.dev>
Image SBOM should contain supplier and originator for every package, when package SBOM does not have one, expect one based on the image layer supplier. Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@chainguard.dev>
xnox
force-pushed
the
backpopulate-supplier
branch
from
1999ef5
to
4777f3d
Compare
This way image SBOM is correct, without rebuilding package SBOMs. Note some packages have neither originator nor supplier, some have originator without supplier. Hence set originator first, then copy it to supplier. Also update golden test data for affected integration tests. Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@chainguard.dev>
xnox
force-pushed
the
backpopulate-supplier
branch
from
4777f3d
to
7df43d4
Compare
Current implementation strips filesAnalyzed from individual package SBOMs upon aggregation into image SBOM. When doing so, update package stanza to say filesAnalyzed=false, as indeed FileRefs are missing. Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@chainguard.dev>
xnox
force-pushed
the
backpopulate-supplier
branch
from
b9308a7
to
8231da0
Compare
xnox
changed the title
Current implementation strips filesAnalyzed from individual package SBOMs upon aggregation into image SBOM. When doing so, omit PackageVerificationCode as without files there cannot be verification code (it is defined as ordered hash of files). Also observe that newly generated packages without files do not have VerifcationCode. As a pleasant side-effect this removes SHA1 from arch-specific package manifest and makes it year 2030 safe. Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@chainguard.dev>
imjasonh
approved these changes
May 24, 2024
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.
spdx: rename expected.spdx.json ahead of more tests
spdx: Add test case of merging pkg SBOM without supplier
Image SBOM should contain supplier and originator for every package,
when package SBOM does not have one, expect one based on the image
layer supplier.
Signed-off-by: Dimitri John Ledkov dimitri.ledkov@chainguard.dev
spdx: backpopulate supplier & originator for packages
This way image SBOM is correct, without rebuilding package SBOMs.
Also update golden test data for affected integration tests.
Signed-off-by: Dimitri John Ledkov dimitri.ledkov@chainguard.dev
spdx: fixup filesAnalyzed setting
Current implementation strips filesAnalyzed from individual package
SBOMs upon aggregation into image SBOM. When doing so, update package
stanza to say filesAnalyzed=false, as indeed FileRefs are missing.
spdx: fixup PackageVerificationCode setting
Current implementation strips filesAnalyzed from individual package SBOMs
upon aggregation into image SBOM. When doing so, omit PackageVerificationCode
as without files there cannot be verification code (it is defined as ordered hash of files).
Also observe that newly generated packages without files do not have VerifcationCode.
As a pleasant side-effect this removes SHA1 from arch-specific package manifest and makes it year 2030 safe.