diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-11.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-01.json similarity index 82% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-11.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-01.json index c4fdec312..a6a78c90c 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-11.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-01.json @@ -9,7 +9,7 @@ "name": "Public" }, "tlp": { - "label": "CLEAR" + "label": "RED" } }, "publisher": { @@ -17,10 +17,10 @@ "name": "OASIS CSAF TC", "namespace": "https://csaf.io" }, - "title": "Mandatory test: Missing Sharing Group Name (valid example 1)", + "title": "Mandatory test: Non-Public Sharing Group with Max UUID (failing example 1)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-42-11", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-38-01", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-02.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-02.json new file mode 100644 index 000000000..b653debce --- /dev/null +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-02.json @@ -0,0 +1,36 @@ +{ + "$schema": "https://docs.oasis-open.org/csaf/csaf/v2.1/csaf_json_schema.json", + "document": { + "category": "csaf_base", + "csaf_version": "2.1", + "distribution": { + "sharing_group": { + "id": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "name": "Public" + }, + "tlp": { + "label": "AMBER+STRICT" + } + }, + "publisher": { + "category": "other", + "name": "OASIS CSAF TC", + "namespace": "https://csaf.io" + }, + "title": "Mandatory test: Non-Public Sharing Group with Max UUID (failing example 2)", + "tracking": { + "current_release_date": "2024-01-24T10:00:00.000Z", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-38-02", + "initial_release_date": "2024-01-24T10:00:00.000Z", + "revision_history": [ + { + "date": "2024-01-24T10:00:00.000Z", + "number": "1", + "summary": "Initial version." + } + ], + "status": "final", + "version": "1" + } + } +} diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-03.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-03.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-03.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-03.json index fdc9774b0..56bf95437 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-03.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-03.json @@ -20,7 +20,7 @@ "title": "Mandatory test: Non-Public Sharing Group with Max UUID (failing example 3)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-39-03", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-38-03", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-04.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-04.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-04.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-04.json index 0fda4fdf2..f2151ea1e 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-04.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-04.json @@ -20,7 +20,7 @@ "title": "Mandatory test: Non-Public Sharing Group with Max UUID (failing example 4)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-39-04", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-38-04", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-11.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-11.json new file mode 100644 index 000000000..b3e21ee22 --- /dev/null +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-11.json @@ -0,0 +1,36 @@ +{ + "$schema": "https://docs.oasis-open.org/csaf/csaf/v2.1/csaf_json_schema.json", + "document": { + "category": "csaf_base", + "csaf_version": "2.1", + "distribution": { + "sharing_group": { + "id": "86c81730-1a06-478d-82d4-978e41eb332f", + "name": "Example Sharing Group 1" + }, + "tlp": { + "label": "RED" + } + }, + "publisher": { + "category": "other", + "name": "OASIS CSAF TC", + "namespace": "https://csaf.io" + }, + "title": "Mandatory test: Non-Public Sharing Group with Max UUID (valid example 1)", + "tracking": { + "current_release_date": "2024-01-24T10:00:00.000Z", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-38-11", + "initial_release_date": "2024-01-24T10:00:00.000Z", + "revision_history": [ + { + "date": "2024-01-24T10:00:00.000Z", + "number": "1", + "summary": "Initial version." + } + ], + "status": "final", + "version": "1" + } + } +} diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-12.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-12.json new file mode 100644 index 000000000..3afcd47bd --- /dev/null +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-12.json @@ -0,0 +1,35 @@ +{ + "$schema": "https://docs.oasis-open.org/csaf/csaf/v2.1/csaf_json_schema.json", + "document": { + "category": "csaf_base", + "csaf_version": "2.1", + "distribution": { + "sharing_group": { + "id": "5868d6be-b28a-404e-a245-0b5093b31b8b" + }, + "tlp": { + "label": "AMBER+STRICT" + } + }, + "publisher": { + "category": "other", + "name": "OASIS CSAF TC", + "namespace": "https://csaf.io" + }, + "title": "Mandatory test: Non-Public Sharing Group with Max UUID (valid example 2)", + "tracking": { + "current_release_date": "2024-01-24T10:00:00.000Z", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-38-12", + "initial_release_date": "2024-01-24T10:00:00.000Z", + "revision_history": [ + { + "date": "2024-01-24T10:00:00.000Z", + "number": "1", + "summary": "Initial version." + } + ], + "status": "final", + "version": "1" + } + } +} diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-13.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-13.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-13.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-13.json index 5de4604d1..0f020c83c 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-13.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-13.json @@ -20,7 +20,7 @@ "title": "Mandatory test: Non-Public Sharing Group with Max UUID (valid example 3)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-39-13", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-38-13", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-14.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-14.json similarity index 93% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-14.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-14.json index 3dad85df9..bd4f3b1d6 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-14.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-14.json @@ -16,7 +16,7 @@ "title": "Mandatory test: Non-Public Sharing Group with Max UUID (valid example 4)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-39-14", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-38-14", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-15.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-15.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-15.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-15.json index 074d3c37f..47a979198 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-15.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-15.json @@ -20,7 +20,7 @@ "title": "Mandatory test: Non-Public Sharing Group with Max UUID (valid example 5)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-39-15", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-38-15", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-01.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-01.json index 771130e98..d43907285 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-01.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-01.json @@ -5,11 +5,10 @@ "csaf_version": "2.1", "distribution": { "sharing_group": { - "id": "ffffffff-ffff-ffff-ffff-ffffffffffff", - "name": "Public" + "id": "5868d6be-b28a-404e-a245-0b5093b31b8b" }, "tlp": { - "label": "RED" + "label": "CLEAR" } }, "publisher": { @@ -17,7 +16,7 @@ "name": "OASIS CSAF TC", "namespace": "https://csaf.io" }, - "title": "Mandatory test: Non-Public Sharing Group with Max UUID (failing example 1)", + "title": "Mandatory test: Public Sharing Group with no Max UUID (failing example 1)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-39-01", diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-02.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-02.json index a717d6036..7c10469cd 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-02.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-02.json @@ -5,11 +5,11 @@ "csaf_version": "2.1", "distribution": { "sharing_group": { - "id": "ffffffff-ffff-ffff-ffff-ffffffffffff", - "name": "Public" + "id": "00000000-0000-0000-0000-000000000000", + "name": "No sharing allowed" }, "tlp": { - "label": "AMBER+STRICT" + "label": "CLEAR" } }, "publisher": { @@ -17,7 +17,7 @@ "name": "OASIS CSAF TC", "namespace": "https://csaf.io" }, - "title": "Mandatory test: Non-Public Sharing Group with Max UUID (failing example 2)", + "title": "Mandatory test: Public Sharing Group with no Max UUID (failing example 2)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-39-02", diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-11.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-11.json index 0a621afeb..65766abd9 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-11.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-11.json @@ -5,11 +5,11 @@ "csaf_version": "2.1", "distribution": { "sharing_group": { - "id": "86c81730-1a06-478d-82d4-978e41eb332f", - "name": "Example Sharing Group 1" + "id": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "name": "Public" }, "tlp": { - "label": "RED" + "label": "CLEAR" } }, "publisher": { @@ -17,7 +17,7 @@ "name": "OASIS CSAF TC", "namespace": "https://csaf.io" }, - "title": "Mandatory test: Non-Public Sharing Group with Max UUID (valid example 1)", + "title": "Mandatory test: Public Sharing Group with no Max UUID (valid example 1)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-39-11", diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-12.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-12.json index a88c2c2d2..db1f73d59 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-12.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-12.json @@ -5,10 +5,11 @@ "csaf_version": "2.1", "distribution": { "sharing_group": { - "id": "5868d6be-b28a-404e-a245-0b5093b31b8b" + "id": "00000000-0000-0000-0000-000000000000", + "name": "No sharing allowed" }, "tlp": { - "label": "AMBER+STRICT" + "label": "CLEAR" } }, "publisher": { @@ -16,7 +17,7 @@ "name": "OASIS CSAF TC", "namespace": "https://csaf.io" }, - "title": "Mandatory test: Non-Public Sharing Group with Max UUID (valid example 2)", + "title": "Mandatory test: Public Sharing Group with no Max UUID (valid example 2)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-39-12", @@ -28,7 +29,7 @@ "summary": "Initial version." } ], - "status": "final", + "status": "draft", "version": "1" } } diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-01.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-01.json index 2c880de0c..eba1bc0b3 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-01.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-01.json @@ -5,7 +5,8 @@ "csaf_version": "2.1", "distribution": { "sharing_group": { - "id": "5868d6be-b28a-404e-a245-0b5093b31b8b" + "id": "5868d6be-b28a-404e-a245-0b5093b31b8b", + "name": "Public" }, "tlp": { "label": "CLEAR" @@ -16,7 +17,7 @@ "name": "OASIS CSAF TC", "namespace": "https://csaf.io" }, - "title": "Mandatory test: Public Sharing Group with no Max UUID (failing example 1)", + "title": "Mandatory test: Invalid Sharing Group Name (failing example 1)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-40-01", diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-02.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-02.json index 927dc5c19..e96a3e9be 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-02.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-02.json @@ -5,11 +5,11 @@ "csaf_version": "2.1", "distribution": { "sharing_group": { - "id": "00000000-0000-0000-0000-000000000000", + "id": "5868d6be-b28a-404e-a245-0b5093b31b8b", "name": "No sharing allowed" }, "tlp": { - "label": "CLEAR" + "label": "RED" } }, "publisher": { @@ -17,7 +17,7 @@ "name": "OASIS CSAF TC", "namespace": "https://csaf.io" }, - "title": "Mandatory test: Public Sharing Group with no Max UUID (failing example 2)", + "title": "Mandatory test: Invalid Sharing Group Name (failing example 2)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-40-02", @@ -29,7 +29,7 @@ "summary": "Initial version." } ], - "status": "final", + "status": "draft", "version": "1" } } diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-11.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-11.json index 3a0e71eaa..6f1416409 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-11.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-11.json @@ -17,7 +17,7 @@ "name": "OASIS CSAF TC", "namespace": "https://csaf.io" }, - "title": "Mandatory test: Public Sharing Group with no Max UUID (valid example 1)", + "title": "Mandatory test: Invalid Sharing Group Name (valid example 1)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-40-11", diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-12.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-12.json index 8efdd4695..d6dab838c 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-12.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-12.json @@ -9,7 +9,7 @@ "name": "No sharing allowed" }, "tlp": { - "label": "CLEAR" + "label": "RED" } }, "publisher": { @@ -17,7 +17,7 @@ "name": "OASIS CSAF TC", "namespace": "https://csaf.io" }, - "title": "Mandatory test: Public Sharing Group with no Max UUID (valid example 2)", + "title": "Mandatory test: Invalid Sharing Group Name (valid example 2)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-40-12", diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-13.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-13.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-13.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-13.json index 4cd124091..576878cca 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-13.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-13.json @@ -19,7 +19,7 @@ "title": "Mandatory test: Invalid Sharing Group Name (valid example 3)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-41-13", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-40-13", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-14.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-14.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-14.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-14.json index b2384c54f..6ac651a65 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-14.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-14.json @@ -20,7 +20,7 @@ "title": "Mandatory test: Invalid Sharing Group Name (valid example 4)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-41-14", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-40-14", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-01.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-01.json index 6bddafe9e..49ea1473e 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-01.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-01.json @@ -5,8 +5,7 @@ "csaf_version": "2.1", "distribution": { "sharing_group": { - "id": "5868d6be-b28a-404e-a245-0b5093b31b8b", - "name": "Public" + "id": "ffffffff-ffff-ffff-ffff-ffffffffffff" }, "tlp": { "label": "CLEAR" @@ -17,7 +16,7 @@ "name": "OASIS CSAF TC", "namespace": "https://csaf.io" }, - "title": "Mandatory test: Invalid Sharing Group Name (failing example 1)", + "title": "Mandatory test: Missing Sharing Group Name (failing example 1)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-41-01", diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-02.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-02.json index d4b9cc245..0c50385cb 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-02.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-02.json @@ -5,8 +5,7 @@ "csaf_version": "2.1", "distribution": { "sharing_group": { - "id": "5868d6be-b28a-404e-a245-0b5093b31b8b", - "name": "No sharing allowed" + "id": "00000000-0000-0000-0000-000000000000" }, "tlp": { "label": "RED" @@ -17,7 +16,7 @@ "name": "OASIS CSAF TC", "namespace": "https://csaf.io" }, - "title": "Mandatory test: Invalid Sharing Group Name (failing example 2)", + "title": "Mandatory test: Missing Sharing Group Name (failing example 2)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-41-02", @@ -29,7 +28,7 @@ "summary": "Initial version." } ], - "status": "draft", + "status": "final", "version": "1" } } diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-03.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-03.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-03.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-03.json index b984b526a..f684e10d7 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-03.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-03.json @@ -20,7 +20,7 @@ "title": "Mandatory test: Missing Sharing Group Name (failing example 3)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-42-03", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-41-03", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-04.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-04.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-04.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-04.json index 8967cac76..6699e8e73 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-04.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-04.json @@ -20,7 +20,7 @@ "title": "Mandatory test: Missing Sharing Group Name (failing example 4)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-42-04", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-41-04", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-11.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-11.json index 29ef03c04..27aa1691f 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-11.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-11.json @@ -17,7 +17,7 @@ "name": "OASIS CSAF TC", "namespace": "https://csaf.io" }, - "title": "Mandatory test: Invalid Sharing Group Name (valid example 1)", + "title": "Mandatory test: Missing Sharing Group Name (valid example 1)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-41-11", diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-12.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-12.json index 3773793ad..5bddd0442 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-12.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-12.json @@ -17,7 +17,7 @@ "name": "OASIS CSAF TC", "namespace": "https://csaf.io" }, - "title": "Mandatory test: Invalid Sharing Group Name (valid example 2)", + "title": "Mandatory test: Missing Sharing Group Name (valid example 2)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-41-12", diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-01.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-01.json deleted file mode 100644 index 8a74b252a..000000000 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-01.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "$schema": "https://docs.oasis-open.org/csaf/csaf/v2.1/csaf_json_schema.json", - "document": { - "category": "csaf_base", - "csaf_version": "2.1", - "distribution": { - "sharing_group": { - "id": "ffffffff-ffff-ffff-ffff-ffffffffffff" - }, - "tlp": { - "label": "CLEAR" - } - }, - "publisher": { - "category": "other", - "name": "OASIS CSAF TC", - "namespace": "https://csaf.io" - }, - "title": "Mandatory test: Missing Sharing Group Name (failing example 1)", - "tracking": { - "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-42-01", - "initial_release_date": "2024-01-24T10:00:00.000Z", - "revision_history": [ - { - "date": "2024-01-24T10:00:00.000Z", - "number": "1", - "summary": "Initial version." - } - ], - "status": "final", - "version": "1" - } - } -} diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-02.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-02.json deleted file mode 100644 index d693fe4b6..000000000 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-02.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "$schema": "https://docs.oasis-open.org/csaf/csaf/v2.1/csaf_json_schema.json", - "document": { - "category": "csaf_base", - "csaf_version": "2.1", - "distribution": { - "sharing_group": { - "id": "00000000-0000-0000-0000-000000000000" - }, - "tlp": { - "label": "RED" - } - }, - "publisher": { - "category": "other", - "name": "OASIS CSAF TC", - "namespace": "https://csaf.io" - }, - "title": "Mandatory test: Missing Sharing Group Name (failing example 2)", - "tracking": { - "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-42-02", - "initial_release_date": "2024-01-24T10:00:00.000Z", - "revision_history": [ - { - "date": "2024-01-24T10:00:00.000Z", - "number": "1", - "summary": "Initial version." - } - ], - "status": "final", - "version": "1" - } - } -} diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-12.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-12.json deleted file mode 100644 index fc5929109..000000000 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-12.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "$schema": "https://docs.oasis-open.org/csaf/csaf/v2.1/csaf_json_schema.json", - "document": { - "category": "csaf_base", - "csaf_version": "2.1", - "distribution": { - "sharing_group": { - "id": "00000000-0000-0000-0000-000000000000", - "name": "No sharing allowed" - }, - "tlp": { - "label": "RED" - } - }, - "publisher": { - "category": "other", - "name": "OASIS CSAF TC", - "namespace": "https://csaf.io" - }, - "title": "Mandatory test: Missing Sharing Group Name (valid example 2)", - "tracking": { - "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-42-12", - "initial_release_date": "2024-01-24T10:00:00.000Z", - "revision_history": [ - { - "date": "2024-01-24T10:00:00.000Z", - "number": "1", - "summary": "Initial version." - } - ], - "status": "draft", - "version": "1" - } - } -} diff --git a/csaf_2.1/test/validator/data/testcases.json b/csaf_2.1/test/validator/data/testcases.json index 77bd0e40a..11d861926 100644 --- a/csaf_2.1/test/validator/data/testcases.json +++ b/csaf_2.1/test/validator/data/testcases.json @@ -1117,133 +1117,133 @@ ] }, { - "id": "6.1.39", + "id": "6.1.38", "group": "mandatory", "failures": [ { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-01.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-01.json", "valid": false }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-02.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-02.json", "valid": false }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-03.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-03.json", "valid": false }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-04.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-04.json", "valid": false } ], "valid": [ { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-11.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-11.json", "valid": true }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-12.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-12.json", "valid": true }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-13.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-13.json", "valid": true }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-14.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-14.json", "valid": true }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-15.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-15.json", "valid": true } ] }, { - "id": "6.1.40", + "id": "6.1.39", "group": "mandatory", "failures": [ { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-01.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-01.json", "valid": false }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-02.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-02.json", "valid": false } ], "valid": [ { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-11.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-11.json", "valid": true }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-12.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-12.json", "valid": true } ] }, { - "id": "6.1.41", + "id": "6.1.40", "group": "mandatory", "failures": [ { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-01.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-01.json", "valid": false }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-02.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-02.json", "valid": false } ], "valid": [ { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-11.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-11.json", "valid": true }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-12.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-12.json", "valid": true }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-13.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-13.json", "valid": true }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-14.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-14.json", "valid": true } ] }, { - "id": "6.1.42", + "id": "6.1.41", "group": "mandatory", "failures": [ { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-01.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-01.json", "valid": false }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-02.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-02.json", "valid": false }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-03.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-03.json", "valid": false }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-04.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-04.json", "valid": false } ], "valid": [ { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-11.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-11.json", "valid": true }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-12.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-12.json", "valid": true } ] diff --git a/csaf_2.1/test/validator/testcases_json_schema.json b/csaf_2.1/test/validator/testcases_json_schema.json index c6fbb97f9..c7a0b3f66 100644 --- a/csaf_2.1/test/validator/testcases_json_schema.json +++ b/csaf_2.1/test/validator/testcases_json_schema.json @@ -62,7 +62,7 @@ "title": "Number of the test", "description": "Contains the section number of the test in the specification.", "type": "string", - "pattern": "^6\\.(([1-3]\\.[1-9])|(1\\.10)|([12]\\.1[1-9])|(3\\.1[0-2])|([12]\\.2[0-6])|(2\\.27)|([12]\\.2[8-9])|(1\\.27\\.([1-9]|10|11))|(1\\.3[0-79])|(2\\.30)|(1\\.4[0-2]))$" + "pattern": "^6\\.(([1-3]\\.[1-9])|(1\\.10)|([12]\\.1[1-9])|(3\\.1[0-2])|([12]\\.2[0-6])|(2\\.27)|([12]\\.2[8-9])|(1\\.27\\.([1-9]|10|11))|(1\\.3[0-9])|(2\\.30)|(1\\.4[0-1]))$" }, "valid": { "title": "List of valid examples",