fix: allow valid cyclonedx input with no components #1873
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
Signed-off-by: James Neate <jamesmneate@gmail.com>
Signed-off-by: James Neate <jamesmneate@gmail.com>
kzantow
reviewed
Jun 12, 2023
Comment on lines
29
to
36
| if format == cyclonedx.BOMFileFormatXML { | ||
| if (!strings.Contains(bom.XMLNS, cycloneDXXmlSchema) || cyclonedx.BOM{} == *bom) { | ||
| return fmt.Errorf("not a valid CycloneDX document") | ||
| } | ||
| } else { | ||
| if (bom.Components == nil || cyclonedx.BOM{} == *bom) { | ||
| return fmt.Errorf("not a valid CycloneDX document") | ||
| } |
There was a problem hiding this comment.
Having nested if statements like this duplicates some of the logic and makes things a little harder to reason about. What about a change like this?
Suggested change
| if format == cyclonedx.BOMFileFormatXML { | |
| if (!strings.Contains(bom.XMLNS, cycloneDXXmlSchema) || cyclonedx.BOM{} == *bom) { | |
| return fmt.Errorf("not a valid CycloneDX document") | |
| } | |
| } else { | |
| if (bom.Components == nil || cyclonedx.BOM{} == *bom) { | |
| return fmt.Errorf("not a valid CycloneDX document") | |
| } | |
| xmlWithoutNS := format == cyclonedx.BOMFileFormatXML && !strings.Contains(bom.XMLNS, cycloneDXXmlSchema) | |
| if cyclonedx.BOM{} == *bom || bom.Components == nil || xmlWithoutNS { | |
| return fmt.Errorf("not a valid CycloneDX document") | |
| } |
Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>
kzantow
approved these changes
Jul 11, 2023
GijsCalis
pushed a commit
to GijsCalis/syft
that referenced
this pull request
Feb 19, 2024
fix: allow valid cyclonedx input with no components --------- Signed-off-by: James Neate <jamesmneate@gmail.com> Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com> Co-authored-by: Christopher Phillips <christopher.phillips@anchore.com>
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.
This resolves anchore/grype#1005
The cyclonedx-go library returns Nil when presented with:
But returns an empty slice when presented with:
"components": []The fix is to check if the format is XML, then inspect the XMLNS field and for other formats inspect the Components field