fix: identify CycloneDX JSON without $schema #2303
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: Keith Zantow <[email protected]>
kzantow
changed the title
willmurphyscode
approved these changes
Nov 8, 2023
wagoodman
reviewed
Nov 8, 2023
| @@ -75,7 +74,7 @@ func (d decoder) Identify(reader io.ReadSeeker) (sbom.FormatID, string) { | |||
| return "", "" | |||
| } | |||
|
|
|||
| id, version := getFormatInfo(doc.JSONSchema, doc.BOMFormat, doc.SpecVersion) | |||
There was a problem hiding this comment.
$schema is not valid for CycloneDX 1.2, at least: https://github.com/CycloneDX/specification/blob/1.2/schema/bom-1.2.schema.json
GijsCalis
pushed a commit
to GijsCalis/syft
that referenced
this pull request
Feb 19, 2024
Signed-off-by: Keith Zantow <[email protected]>
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 PR corrects an issue that identifying CycloneDX JSON documents was being too strict, requiring the
$schemafield be present. Whether this is required or not, Syft can be a bit more lax about parsing CycloneDX JSON and just look for thebomFormatandspecVersionfields.Fixes #2299