fix(cyclonedx): set original names for packages #4306
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
afdesk
changed the title
knqyf263
reviewed
May 11, 2023
pkg/sbom/cyclonedx/unmarshal.go
Outdated
Comment on lines
344
to
346
| if component.Name != "" { | ||
| pkg.Name = component.Name | ||
| } |
There was a problem hiding this comment.
We need a comment on why it is needed.
afdesk
changed the title
knqyf263
reviewed
May 22, 2023
pkg/sbom/cyclonedx/unmarshal.go
Outdated
| @@ -341,6 +341,11 @@ func toPackage(component cdx.Component) (bool, string, *ftypes.Package, error) { | |||
| } | |||
|
|
|||
| pkg := p.Package() | |||
| // Trivy's marshall loses case-sensitivity in PURL used in SBOM for Go, | |||
| // so we have to use an original package name | |||
| if p.PackageType() == ftypes.GoBinary { | |||
There was a problem hiding this comment.
I'm wondering if this problem is applied to other languages as well. What if removing the if-statement?
There was a problem hiding this comment.
you're right. there are uses ToLower for PyPI and npm, so it can arise such issue for them.
let's try to remove this if statement
afdesk
changed the title
knqyf263
approved these changes
May 23, 2023
4 tasks
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
When Trivy creates
sbom-ref, it converts a name to low-case for several packages (Go - https://github.com/aquasecurity/trivy/blob/main/pkg/purl/purl.go#L285, npm, PyPI). It's done according to the spec:But when Trivy does unmarshall from
sbom-refit loses case-sensitivity.So we have to set an original name for a Go package name (
Nameis a mandatory field for the components).Related issues
Checklist