fix(sbom): export bom-ref when converting a package to a component #7340
+571
−15
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| { | ||
| "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", | ||
| "bomFormat": "CycloneDX", | ||
| "specVersion": "1.6", | ||
| "serialNumber": "urn:uuid:b61985f0-720e-4ece-81cc-71f49db503b5", | ||
| "version": 1, | ||
| "metadata": { | ||
| "timestamp": "2024-08-01T19:19:56+00:00", | ||
| "tools": { | ||
| "components": [ | ||
| { | ||
| "type": "application", | ||
| "group": "aquasecurity", | ||
| "name": "trivy", | ||
| "version": "dev" | ||
| } | ||
| ] | ||
| }, | ||
| "component": { | ||
| "bom-ref": "d5461c73-cabf-4634-a4ef-489698717e3d", | ||
| "type": "application", | ||
| "name": ".", | ||
| "properties": [ | ||
| { | ||
| "name": "aquasecurity:trivy:SchemaVersion", | ||
| "value": "2" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "components": [ | ||
| { | ||
| "bom-ref": "469bcf7c-b085-40cf-8932-d581cb91f11b", | ||
| "type": "application", | ||
| "name": "poetry.lock", | ||
| "properties": [ | ||
| { | ||
| "name": "aquasecurity:trivy:Class", | ||
| "value": "lang-pkgs" | ||
| }, | ||
| { | ||
| "name": "aquasecurity:trivy:Type", | ||
| "value": "poetry" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "bom-ref": "pkg:pypi/pywin32@227", | ||
| "type": "library", | ||
| "name": "pywin32", | ||
| "version": "227", | ||
| "purl": "pkg:pypi/pywin32@227", | ||
| "licenses": [ | ||
| { | ||
| "expression": "MIT" | ||
| } | ||
| ], | ||
| "properties": [ | ||
| { | ||
| "name": "aquasecurity:trivy:PkgID", | ||
| "value": "pywin32@227" | ||
| }, | ||
| { | ||
| "name": "aquasecurity:trivy:PkgType", | ||
| "value": "poetry" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "bom-ref": "de3ojve0eoj0j0je", | ||
| "type": "library", | ||
| "name": "pywin32", | ||
| "version": "227", | ||
| "purl": "pkg:pypi/pywin32@227", | ||
| "licenses": [ | ||
| { | ||
| "expression": "MIT" | ||
| } | ||
| ], | ||
| "properties": [ | ||
| { | ||
| "name": "aquasecurity:trivy:PkgID", | ||
| "value": "pywin32@227" | ||
| }, | ||
| { | ||
| "name": "aquasecurity:trivy:PkgType", | ||
| "value": "poetry" | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "dependencies": [ | ||
| { | ||
| "ref": "469bcf7c-b085-40cf-8932-d581cb91f11b", | ||
| "dependsOn": [ | ||
| "pkg:pypi/pywin32@227", | ||
| "de3ojve0eoj0j0je" | ||
| ] | ||
| }, | ||
| { | ||
| "ref": "d5461c73-cabf-4634-a4ef-489698717e3d", | ||
| "dependsOn": [ | ||
| "469bcf7c-b085-40cf-8932-d581cb91f11b" | ||
| ] | ||
| }, | ||
| { | ||
| "ref": "pkg:pypi/pywin32@227", | ||
| "dependsOn": [] | ||
| }, | ||
| { | ||
| "ref": "de3ojve0eoj0j0je", | ||
| "dependsOn": [] | ||
| } | ||
| ], | ||
| "vulnerabilities": [] | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| { | ||
| "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", | ||
| "bomFormat": "CycloneDX", | ||
| "specVersion": "1.6", | ||
| "serialNumber": "urn:uuid:3ff14136-e09f-4df9-80ea-000000000008", | ||
| "version": 1, | ||
| "metadata": { | ||
| "timestamp": "2021-08-25T12:20:30+00:00", | ||
| "tools": { | ||
| "components": [ | ||
| { | ||
| "type": "application", | ||
| "group": "aquasecurity", | ||
| "name": "trivy", | ||
| "version": "dev" | ||
| } | ||
| ] | ||
| }, | ||
| "component": { | ||
| "bom-ref": "d5461c73-cabf-4634-a4ef-489698717e3d", | ||
| "type": "application", | ||
| "name": ".", | ||
| "purl": "pkg:/", | ||
| "properties": [ | ||
| { | ||
| "name": "aquasecurity:trivy:SchemaVersion", | ||
| "value": "2" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "components": [ | ||
| { | ||
| "bom-ref": "3ff14136-e09f-4df9-80ea-000000000005", | ||
| "type": "application", | ||
| "name": "poetry.lock", | ||
| "properties": [ | ||
| { | ||
| "name": "aquasecurity:trivy:Class", | ||
| "value": "lang-pkgs" | ||
| }, | ||
| { | ||
| "name": "aquasecurity:trivy:Type", | ||
| "value": "poetry" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "bom-ref": "de3ojve0eoj0j0je", | ||
| "type": "library", | ||
| "name": "pywin32", | ||
| "version": "227", | ||
| "licenses": [ | ||
| { | ||
| "license": { | ||
| "name": "MIT" | ||
| } | ||
| } | ||
| ], | ||
| "purl": "pkg:pypi/pywin32@227", | ||
| "properties": [ | ||
| { | ||
| "name": "aquasecurity:trivy:PkgID", | ||
| "value": "pywin32@227" | ||
| }, | ||
| { | ||
| "name": "aquasecurity:trivy:PkgType", | ||
| "value": "poetry" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "bom-ref": "pkg:pypi/pywin32@227", | ||
| "type": "library", | ||
| "name": "pywin32", | ||
| "version": "227", | ||
| "licenses": [ | ||
| { | ||
| "license": { | ||
| "name": "MIT" | ||
| } | ||
| } | ||
| ], | ||
| "purl": "pkg:pypi/pywin32@227", | ||
| "properties": [ | ||
| { | ||
| "name": "aquasecurity:trivy:PkgID", | ||
| "value": "pywin32@227" | ||
| }, | ||
| { | ||
| "name": "aquasecurity:trivy:PkgType", | ||
| "value": "poetry" | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "dependencies": [ | ||
| { | ||
| "ref": "3ff14136-e09f-4df9-80ea-000000000005", | ||
| "dependsOn": [ | ||
| "de3ojve0eoj0j0je", | ||
| "pkg:pypi/pywin32@227" | ||
| ] | ||
| }, | ||
| { | ||
| "ref": "d5461c73-cabf-4634-a4ef-489698717e3d", | ||
| "dependsOn": [ | ||
| "3ff14136-e09f-4df9-80ea-000000000005" | ||
| ] | ||
| }, | ||
| { | ||
| "ref": "de3ojve0eoj0j0je", | ||
| "dependsOn": [] | ||
| }, | ||
| { | ||
| "ref": "pkg:pypi/pywin32@227", | ||
| "dependsOn": [] | ||
| } | ||
| ], | ||
| "vulnerabilities": [] | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1462,7 +1462,7 @@ func TestMarshaler_MarshalReport(t *testing.T) { | |
| Name: "com.fasterxml.jackson.core:jackson-databind", | ||
| Version: "2.13.4.1", | ||
| Identifier: ftypes.PkgIdentifier{ | ||
| BOMRef: "pkg:maven/com.fasterxml.jackson.core/[email protected]", | ||
| UID: "9A5066570222D04C", | ||
| PURL: &packageurl.PackageURL{ | ||
| Type: packageurl.TypeMaven, | ||
|
|
@@ -1480,7 +1480,7 @@ func TestMarshaler_MarshalReport(t *testing.T) { | |
| PkgName: "com.fasterxml.jackson.core:jackson-databind", | ||
| PkgPath: "jackson-databind-2.13.4.1.jar", | ||
| PkgIdentifier: ftypes.PkgIdentifier{ | ||
| BOMRef: "pkg:maven/com.fasterxml.jackson.core/[email protected]", | ||
| UID: "9A5066570222D04C", | ||
| PURL: &packageurl.PackageURL{ | ||
| Type: packageurl.TypeMaven, | ||
|
|
||
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we re-use the existing json,
fluentd-multiple-lockfiles-cyclonedx.json? You can change this file to use UUID in BOM-Ref.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the testcase is updated
fluentd-multiple-lockfiles-cyclonedx.json.I wanted to use
fluentd-multiple-lockfiles.cdx.json.goldenalso, but this cdx result is a large, because it's result forfluentd-multiple-lockfiles.tar.gz.fluentd-multiple-lockfiles-cyclonedx.jsonis shorter.so I've created a new golden file.