Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: support CycloneDX 1.6.1 #742

Merged
merged 2 commits into from
Nov 18, 2024
Merged

feat: support CycloneDX 1.6.1 #742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55b59c2
feat: schema1.6.1
jkowalleck Nov 18, 2024
33b3741
tests: schema1.6.1
jkowalleck Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cyclonedx/schema/_res/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ some schema for offline use as download via [script](../../../tools/schema-downl
original sources: <https://github.com/CycloneDX/specification/tree/master/schema>

Currently using version
[5f3ee8066491d31ec6a6d02968243d9688d7e49c](https://github.com/CycloneDX/specification/commit/5f3ee8066491d31ec6a6d02968243d9688d7e49c)
[8a27bfd1be5be0dcb2c208a34d2f4fa0b6d75bd7](https://github.com/CycloneDX/specification/commit/8a27bfd1be5be0dcb2c208a34d2f4fa0b6d75bd7)

| file | note |
|------|------|
Expand Down
154 changes: 90 additions & 64 deletions cyclonedx/schema/_res/bom-1.6.SNAPSHOT.schema.json
View file
Open in desktop

Large diffs are not rendered by default.

324 changes: 233 additions & 91 deletions cyclonedx/schema/_res/bom-1.6.SNAPSHOT.xsd
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions tests/_data/schemaTestData/1.6/invalid-bomformat-1.6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
"bomFormat": "AnotherFormat",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
Expand Down
7 changes: 1 addition & 6 deletions tests/_data/schemaTestData/1.6/invalid-component-ref-1.6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
Expand All @@ -10,12 +11,6 @@
"name": "acme-library",
"version": "1.0.0"
},
{
"type": "library",
"bom-ref": "123",
"name": "acme-library",
"version": "1.0.0"
},
{
"type": "library",
"bom-ref": "",
Expand Down
4 changes: 4 additions & 0 deletions tests/_data/schemaTestData/1.6/invalid-component-ref-1.6.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
<name>acme-library</name>
<version>1.0.0</version>
</component>
<component type="library" bom-ref="123">
<name>acme-library2</name>
<version>1.0.0</version>
</component>
<component type="library" bom-ref="">
<!-- empty value in attribute `bom-ref` -->
<name>acme-library</name>
Expand Down
1 change: 1 addition & 0 deletions tests/_data/schemaTestData/1.6/invalid-component-swid-1.6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
Expand Down
1 change: 1 addition & 0 deletions tests/_data/schemaTestData/1.6/invalid-component-type-1.6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
Expand Down
1 change: 1 addition & 0 deletions tests/_data/schemaTestData/1.6/invalid-dependency-1.6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
Expand Down
1 change: 1 addition & 0 deletions tests/_data/schemaTestData/1.6/invalid-empty-component-1.6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
Expand Down
1 change: 1 addition & 0 deletions tests/_data/schemaTestData/1.6/invalid-hash-alg-1.6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
Expand Down
1 change: 1 addition & 0 deletions tests/_data/schemaTestData/1.6/invalid-hash-md5-1.6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
Expand Down
1 change: 1 addition & 0 deletions tests/_data/schemaTestData/1.6/invalid-hash-sha1-1.6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
Expand Down
1 change: 1 addition & 0 deletions tests/_data/schemaTestData/1.6/invalid-hash-sha256-1.6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
Expand Down
1 change: 1 addition & 0 deletions tests/_data/schemaTestData/1.6/invalid-hash-sha512-1.6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
Expand Down
1 change: 1 addition & 0 deletions tests/_data/schemaTestData/1.6/invalid-issue-type-1.6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
Expand Down
1 change: 1 addition & 0 deletions tests/_data/schemaTestData/1.6/invalid-license-choice-1.6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
Expand Down
1 change: 1 addition & 0 deletions tests/_data/schemaTestData/1.6/invalid-license-encoding-1.6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
Expand Down
1 change: 1 addition & 0 deletions tests/_data/schemaTestData/1.6/invalid-license-id-1.6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
Expand Down
2 changes: 2 additions & 0 deletions tests/_data/schemaTestData/1.6/invalid-license-missing-id-and-name-1.6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
{
"type": "library",
"name": "license-with-no-id-nor-name",
"version": "23",
"description": "testcase for issue#288",
Expand Down
1 change: 1 addition & 0 deletions tests/_data/schemaTestData/1.6/invalid-metadata-license-1.6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
Expand Down
1 change: 1 addition & 0 deletions tests/_data/schemaTestData/1.6/invalid-metadata-timestamp-1.6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
Expand Down
1 change: 1 addition & 0 deletions tests/_data/schemaTestData/1.6/invalid-missing-component-type-1.6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
Expand Down
1 change: 1 addition & 0 deletions tests/_data/schemaTestData/1.6/invalid-patch-type-1.6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
Expand Down
1 change: 1 addition & 0 deletions tests/_data/schemaTestData/1.6/invalid-properties-1.6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.6",
"serialNumber": "urn:uuid:bcb403ae-91fa-436e-bc93-84d1078cdeed",
Expand Down
1 change: 1 addition & 0 deletions tests/_data/schemaTestData/1.6/invalid-scope-1.6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
Expand Down
1 change: 1 addition & 0 deletions tests/_data/schemaTestData/1.6/invalid-serialnumber-1.6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f",
Expand Down
1 change: 1 addition & 0 deletions tests/_data/schemaTestData/1.6/invalid-service-data-1.6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
Expand Down
8 changes: 8 additions & 0 deletions tests/_data/schemaTestData/1.6/valid-annotation-1.6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
Expand Down Expand Up @@ -76,6 +77,13 @@
"name": "Partner Org",
"url": [
"https://partner.org"
],
"contact" : [
{
"name": "Support",
"email": "[email protected]",
"phone": "800-555-1212"
}
]
},
"group": "org.partner",
Expand Down
14 changes: 7 additions & 7 deletions tests/_data/schemaTestData/1.6/valid-annotation-1.6.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</contact>
</organization>
</annotator>
<timestamp>2020-04-07T07:01:00Z</timestamp>
<timestamp>2022-01-01T00:00:00Z</timestamp>
<text>This is a sample annotation made by an organization</text>
</annotation>
<annotation bom-ref="annotation-2">
Expand All @@ -35,8 +35,8 @@
<phone>800-555-1212</phone>
</individual>
</annotator>
<timestamp>2020-04-07T07:01:00Z</timestamp>
<text>This is a sample annotation made by an person</text>
<timestamp>2022-01-01T00:00:00Z</timestamp>
<text>This is a sample annotation made by a person</text>
</annotation>
<annotation bom-ref="annotation-3">
<subjects>
Expand All @@ -48,7 +48,7 @@
<version>9.1.2</version>
</component>
</annotator>
<timestamp>2020-04-07T07:01:00Z</timestamp>
<timestamp>2022-01-01T00:00:00Z</timestamp>
<text>This is a sample annotation made by a component</text>
</annotation>
<annotation bom-ref="annotation-4">
Expand All @@ -62,7 +62,7 @@
<url>https://partner.org</url>
<contact>
<name>Support</name>
<email>support@partner</email>
<email>support@partner.org</email>
<phone>800-555-1212</phone>
</contact>
</provider>
Expand All @@ -76,11 +76,11 @@
<authenticated>true</authenticated>
<x-trust-boundary>true</x-trust-boundary>
<data>
<classification flow="bi-directional">pubic</classification>
<classification flow="bi-directional">public</classification>
</data>
</service>
</annotator>
<timestamp>2020-04-07T07:01:00Z</timestamp>
<timestamp>2022-01-01T00:00:00Z</timestamp>
<text>This is a sample annotation made by a service</text>
</annotation>
</annotations>
Expand Down
1 change: 1 addition & 0 deletions tests/_data/schemaTestData/1.6/valid-assembly-1.6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
Expand Down
1 change: 1 addition & 0 deletions tests/_data/schemaTestData/1.6/valid-attestation-1.6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
Expand Down
8 changes: 4 additions & 4 deletions tests/_data/schemaTestData/1.6/valid-attestation-1.6.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<declarations>
<assessors>
<assessor bom-ref="assessor-1">
<thirdParty>false</thirdParty>
<thirdParty>true</thirdParty>
<organization>
<name>Acme Inc</name>
<name>Assessors Inc</name>
</organization>
</assessor>
</assessors>
Expand All @@ -25,7 +25,7 @@
<score>0.8</score>
<rationale>Conformance rationale here</rationale>
<mitigationStrategies>
<mitigationStrategy>mitigations-1</mitigationStrategy>
<mitigationStrategy>mitigationStrategy-1</mitigationStrategy>
</mitigationStrategies>
</conformance>
<confidence>
Expand Down Expand Up @@ -110,7 +110,7 @@
<contents>
<attachment content-type="text/plain">Mitigation strategy here</attachment>
</contents>
<classification>Public</classification>
<classification>Company Confidential</classification>
<sensitiveData>Describe sensitive data here</sensitiveData>
</data>
<created>2023-04-25T00:00:00+00:00</created>
Expand Down
146 changes: 122 additions & 24 deletions tests/_data/schemaTestData/1.6/valid-bom-1.6.json
View file
Open in desktop

Large diffs are not rendered by default.

17 changes: 11 additions & 6 deletions tests/_data/schemaTestData/1.6/valid-bom-1.6.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
<metadata>
<timestamp>2020-04-07T07:01:00Z</timestamp>
<timestamp>2020-04-13T20:20:39+00:00</timestamp>
<tools>
<tool>
<vendor>Awesome Vendor</vendor>
Expand Down Expand Up @@ -46,7 +46,7 @@
</supplier>
</metadata>
<components>
<component type="application">
<component type="application" bom-ref="pkg:maven/com.acme/[email protected]?packaging=jar">
<author>Joane Doe et al.</author>
<publisher>Acme Inc</publisher>
<group>com.acme</group>
Expand Down Expand Up @@ -90,7 +90,7 @@
<uid>7638417db6d59f3c431d3e1f261cc637155684cd</uid>
<url>https://location/to/7638417db6d59f3c431d3e1f261cc637155684cd</url>
<author>
<timestamp>2018-11-07T22:01:45Z</timestamp>
<timestamp>2018-11-13T20:20:39+00:00</timestamp>
<name>John Doe</name>
<email>[email protected]</email>
</author>
Expand All @@ -105,9 +105,9 @@
<notes>Commentary here</notes>
</pedigree>
</component>
<component type="library">
<component type="library" bom-ref="pkg:maven/com.example/[email protected]?packaging=war">
<supplier>
<name>Example Inc.</name>
<name>Example, Inc.</name>
<url>https://example.com</url>
<url>https://example.net</url>
<contact>
Expand All @@ -121,7 +121,7 @@
</contact>
</supplier>
<manufacturer>
<name>Example-2, Inc.Example-2, Inc.</name>
<name>Example-2, Inc.</name>
<url>https://example.org</url>
<contact>
<email>[email protected]</email>
Expand Down Expand Up @@ -195,4 +195,9 @@
</externalReferences>
</component>
</components>
<dependencies>
<dependency ref="pkg:maven/com.acme/[email protected]?packaging=jar">
<dependency ref="pkg:maven/com.example/[email protected]?packaging=war"/>
</dependency>
</dependencies>
</bom>
30 changes: 30 additions & 0 deletions tests/_data/schemaTestData/1.6/valid-component-data-1.6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.6",
"serialNumber": "urn:uuid:1b1bff0e-fdb9-4088-8b9a-1a9f2d9006da",
"version": 1,
"components": [
{
"type": "data",
"name": "my-configs",
"version": "1337",
"data": [
{
"type": "configuration",
"name": "app.ini",
"contents": {
"url": "https://example.com/cfg/1337/app.ini"
}
},
{
"type": "other",
"name": ".env",
"contents": {
"url": "https://example.com/cfg/1337/env"
}
}
]
}
]
}
Loading