Skip to content

Commit e4d5942

Browse files
tschmidtb51tschmidtb51
authored
Merge pull request #1016 from oasis-tcs/editor-revision-2025-05-28
Editor revision for TC meeting 2025-05-28
2 parents 6b5e99b + d57ad49 commit e4d5942

File tree

794 files changed

+8485
-2895
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

794 files changed

+8485
-2895
lines changed

‎.github/workflows/csaf_2.1_filenames.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
run: ./csaf_2.1/test/filenames/run_tests.sh ./csaf_2.1/examples/csaf/csaf_*/*.json
2727
- name: Test filenames of CSAF test files in validator/data/mandatory
2828
run: ./csaf_2.1/test/filenames/run_tests.sh ./csaf_2.1/test/validator/data/mandatory/*.json
29-
- name: Test filenames of CSAF test files in validator/data/optional
30-
run: ./csaf_2.1/test/filenames/run_tests.sh ./csaf_2.1/test/validator/data/optional/*.json
29+
- name: Test filenames of CSAF test files in validator/data/recommended
30+
run: ./csaf_2.1/test/filenames/run_tests.sh ./csaf_2.1/test/validator/data/recommended/*.json
3131
- name: Test filenames of CSAF test files in validator/data/informative
3232
run: ./csaf_2.1/test/filenames/run_tests.sh ./csaf_2.1/test/validator/data/informative/*.json

‎.github/workflows/csaf_2.1_validator.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ jobs:
2929
run: python3 -c "from importlib.metadata import version; print(version('jsonschema'))"
3030
- name: Test validator/data/mandatory against schema
3131
run: ./csaf_2.1/test/validator/run_tests.sh mandatory
32-
- name: Test validator/data/optional against schema
33-
run: ./csaf_2.1/test/validator/run_tests.sh optional
32+
- name: Test validator/data/recommended against schema
33+
run: ./csaf_2.1/test/validator/run_tests.sh recommended
3434
- name: Test validator/data/informative against schema
3535
run: ./csaf_2.1/test/validator/run_tests.sh informative
3636

‎csaf_2.1/examples/ROLIE/example-01-feed-tlp-white.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"src": "https://psirt.domain.tld/advisories/csaf/2024/esa-2024-001.json"
4444
},
4545
"format": {
46-
"schema": "https://docs.oasis-open.org/csaf/csaf/v2.1/csaf_json_schema.json",
46+
"schema": "https://docs.oasis-open.org/csaf/csaf/v2.1/schema/csaf.json",
4747
"version": "2.1"
4848
}
4949
}

‎csaf_2.1/examples/aggregator/example-01-aggregator.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://docs.oasis-open.org/csaf/csaf/v2.1/aggregator_json_schema.json",
2+
"$schema": "https://docs.oasis-open.org/csaf/csaf/v2.1/schema/aggregator.json",
33
"aggregator": {
44
"category": "lister",
55
"contact_details": "Example CSAF Lister can be reached at contact_us@lister.example, or via our website at https://lister.example/security/csaf/aggregator/contact.",
@@ -18,6 +18,7 @@
1818
"name": "Example Company ProductCERT",
1919
"namespace": "https://psirt.example.com"
2020
},
21+
"role": "csaf_provider",
2122
"url": "https://www.example.com/.well-known/csaf/provider-metadata.json"
2223
}
2324
},
@@ -29,6 +30,7 @@
2930
"name": "Example Coordinator CERT",
3031
"namespace": "https://cert.example"
3132
},
33+
"role": "csaf_trusted_provider",
3234
"url": "https://cert.example/advisories/csaf/provider-metadata.json"
3335
}
3436
}

‎csaf_2.1/examples/aggregator/example-02-aggregator.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://docs.oasis-open.org/csaf/csaf/v2.1/aggregator_json_schema.json",
2+
"$schema": "https://docs.oasis-open.org/csaf/csaf/v2.1/schema/aggregator.json",
33
"aggregator": {
44
"category": "aggregator",
55
"contact_details": "Example Aggregator can be reached at contact_us@aggregator.example, or via our website at https://aggregator.example/security/csaf/aggregator/contact.",
@@ -18,6 +18,7 @@
1818
"name": "Example Company ProductCERT",
1919
"namespace": "https://psirt.example.com"
2020
},
21+
"role": "csaf_provider",
2122
"url": "https://www.example.com/.well-known/csaf/provider-metadata.json"
2223
},
2324
"mirrors": [
@@ -32,6 +33,7 @@
3233
"name": "Example Coordinator CERT",
3334
"namespace": "https://cert.example"
3435
},
36+
"role": "csaf_trusted_provider",
3537
"url": "https://cert.example/advisories/csaf/provider-metadata.json"
3638
},
3739
"mirrors": [

‎csaf_2.1/examples/aggregator/example-03-aggregator.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://docs.oasis-open.org/csaf/csaf/v2.1/aggregator_json_schema.json",
2+
"$schema": "https://docs.oasis-open.org/csaf/csaf/v2.1/schema/aggregator.json",
33
"aggregator": {
44
"category": "aggregator",
55
"contact_details": "Example Aggregator can be reached at contact_us@aggregator.example, or via our website at https://aggregator.example/security/csaf/aggregator/contact.",
@@ -18,6 +18,7 @@
1818
"name": "Example Company ProductCERT",
1919
"namespace": "https://psirt.example.com"
2020
},
21+
"role": "csaf_provider",
2122
"url": "https://www.example.com/.well-known/csaf/provider-metadata.json"
2223
},
2324
"mirrors": [
@@ -32,6 +33,7 @@
3233
"name": "Example Coordinator CERT",
3334
"namespace": "https://cert.example"
3435
},
36+
"role": "csaf_trusted_provider",
3537
"url": "https://cert.example/advisories/csaf/provider-metadata.json"
3638
},
3739
"mirrors": [
@@ -48,6 +50,7 @@
4850
"name": "Example Cooperation ProductCERT",
4951
"namespace": "https://psirt.example.net"
5052
},
53+
"role": "csaf_publisher",
5154
"url": "https://www.example.net/.well-known/csaf/provider-metadata.json"
5255
},
5356
"mirrors": [

‎csaf_2.1/examples/csaf/bsi-2022-0001.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://docs.oasis-open.org/csaf/csaf/v2.1/csaf_json_schema.json",
2+
"$schema": "https://docs.oasis-open.org/csaf/csaf/v2.1/schema/csaf.json",
33
"document": {
44
"aggregate_severity": {
55
"text": "Moderate"

‎csaf_2.1/examples/csaf/cisco-sa-20180328-smi2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://docs.oasis-open.org/csaf/csaf/v2.1/csaf_json_schema.json",
2+
"$schema": "https://docs.oasis-open.org/csaf/csaf/v2.1/schema/csaf.json",
33
"document": {
44
"title": "Cisco IOS and IOS XE Software Smart Install Remote Code Execution Vulnerability",
55
"category": "Cisco Security Advisory",

‎csaf_2.1/examples/csaf/csaf_vex/2022-evd-uc-01-a-001.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://docs.oasis-open.org/csaf/csaf/v2.1/csaf_json_schema.json",
2+
"$schema": "https://docs.oasis-open.org/csaf/csaf/v2.1/schema/csaf.json",
33
"document": {
44
"category": "csaf_vex",
55
"csaf_version": "2.1",

‎csaf_2.1/examples/csaf/csaf_vex/2022-evd-uc-01-f-001.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://docs.oasis-open.org/csaf/csaf/v2.1/csaf_json_schema.json",
2+
"$schema": "https://docs.oasis-open.org/csaf/csaf/v2.1/schema/csaf.json",
33
"document": {
44
"category": "csaf_vex",
55
"csaf_version": "2.1",

0 commit comments

Comments
 (0)