From f911434b1960416a2445b1afe76469f86e613890 Mon Sep 17 00:00:00 2001 From: Gage Hackford Date: Thu, 14 Mar 2024 17:36:50 -0400 Subject: [PATCH 1/6] updating schema to use allOf and to include PAP:CLEAR --- ...-f8d78575-edfd-406e-8e84-6162a8450f5b.json | 535 ++++++++++-------- 1 file changed, 300 insertions(+), 235 deletions(-) diff --git a/extension-definition-specifications/pap-marking-definition-f8d/extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b.json b/extension-definition-specifications/pap-marking-definition-f8d/extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b.json index 010cc37fbcd..cee4d24e75f 100644 --- a/extension-definition-specifications/pap-marking-definition-f8d/extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b.json +++ b/extension-definition-specifications/pap-marking-definition-f8d/extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b.json @@ -1,251 +1,316 @@ { - "$id": "https://raw.githubusercontent.com/oasis-open/cti-stix-common-objects/main/extension-definition-specifications/pap-marking-definition-f8d/extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b.json", - "$schema": "https://json-schema.org/draft/2020-12/schema", - "title": "pap-marking-definition-extension", - "description": "This marking extension was created to apply PAP data markings", - "type": "object", - "required": [ - "id", - "type", - "name", - "spec_version", - "created", - "extensions" - ], - "properties": { - "type": { - "type": "string", - "description": "The type of this object, which MUST be the literal `marking-definition`.", - "enum": [ - "marking-definition" - ] - }, - "spec_version": { - "type": "string", - "enum": [ - "2.1" - ], - "description": "The version of the STIX specification used to represent this object." - }, - "created": { - "$ref": "http://raw.githubusercontent.com/oasis-open/cti-stix2-json-schemas/stix2.1/schemas/common/timestamp.json", - "description": "The created property represents the time at which the first version of this Marking Definition object was created." - } + "$id": "https://raw.githubusercontent.com/oasis-open/cti-stix-common-objects/main/extension-definition-specifications/pap-marking-definition-f8d/extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b.json", + "$schema": "https://json-schema.org/draft/2020-12/schema", + "title": "pap-marking-definition-extension", + "description": "This marking extension was created to apply PAP data markings", + "type": "object", + "allOf": [ + { + "$ref": "http://raw.githubusercontent.com/oasis-open/cti-stix2-json-schemas/stix2.1/schemas/common/marking-definition.json" }, - "name": { - "type": "string", - "description": "A name used to identify the Marking Definition. The value of this property MUST be one of the following: PAP:WHITE, PAP:GREEN, PAP:AMBER, PAP:RED" + { + "required": [ + "id", + "type", + "name", + "spec_version", + "created", + "extensions" + ] }, - "oneOf": [ - { - "$ref": "#/definitions/pap_white" - }, - { - "$ref": "#/definitions/pap_green" - }, - { - "$ref": "#/definitions/pap_amber" - }, - { - "$ref": "#/definitions/pap_red" + { + "properties": { + "type": { + "type": "string", + "description": "The type of this object, which MUST be the literal `marking-definition`.", + "enum": [ + "marking-definition" + ] + }, + "spec_version": { + "type": "string", + "enum": [ + "2.1" + ], + "description": "The version of the STIX specification used to represent this object." + }, + "created": { + "$ref": "http://raw.githubusercontent.com/oasis-open/cti-stix2-json-schemas/stix2.1/schemas/common/timestamp.json", + "description": "The created property represents the time at which the first version of this Marking Definition object was created." + } } - ], - "defs": { - "pap_white": { - "description": "The marking-definition object representing Permissible Actions Protocol (PAP) White.", - "properties": { - "id": { - "type": "string", - "enum": [ - "marking-definition--a3bea94c-b469-41dc-9cfe-d6e7daba7730" - ] - }, - "name": { - "type": "string", - "enum": [ - "PAP:WHITE" - ] - }, - "extensions": { - "type": "object", - "properties": { - "extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b": { - "type": "object", - "properties": { - "extension_type": { - "type": "string", - "description": "Defined by STIX 2.1 extension definition rules from 'extension-type-enum'.", - "enum": [ - "property-extension" - ] - }, - "pap": { - "type": "string", - "enum": [ - "white" - ] - } - }, - "required": [ - "extension_type", - "pap" - ], - "additionalProperties": false - } - }, - "required": [ - "extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b" - ], - "additionalProperties": false - } + }, + { + "name": { + "type": "string", + "description": "A name used to identify the Marking Definition. The value of this property MUST be one of the following: PAP:WHITE, PAP:GREEN, PAP:AMBER, PAP:RED, PAP:CLEAR" + } + }, + { + "oneOf": [ + { + "$ref": "#/definitions/pap_white" + }, + { + "$ref": "#/definitions/pap_green" + }, + { + "$ref": "#/definitions/pap_amber" + }, + { + "$ref": "#/definitions/pap_red" + }, + { + "$ref": "#/definitions/pap_clear" } - }, - "pap_green": { - "description": "The marking-definition object representing Permissible Actions Protocol (PAP) Green.", - "properties": { - "id": { - "type": "string", - "enum": [ - "marking-definition--c43594d1-4b11-4c59-93ab-1c9b14d53ce9" - ] - }, - "name": { - "type": "string", - "enum": [ - "PAP:GREEN" - ] - }, - "extensions": { - "type": "object", - "properties": { - "extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b": { - "type": "object", - "properties": { - "extension_type": { - "type": "string", - "description": "Defined by STIX 2.1 extension definition rules from 'extension-type-enum'.", - "enum": [ - "property-extension" - ] - }, - "pap": { - "type": "string", - "enum": [ - "green" - ] - } + ] + } + ], + "defs": { + "pap_white": { + "description": "The marking-definition object representing Permissible Actions Protocol (PAP) White.", + "properties": { + "id": { + "type": "string", + "enum": [ + "marking-definition--a3bea94c-b469-41dc-9cfe-d6e7daba7730" + ] + }, + "name": { + "type": "string", + "enum": [ + "PAP:WHITE" + ] + }, + "extensions": { + "type": "object", + "properties": { + "extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b": { + "type": "object", + "properties": { + "extension_type": { + "type": "string", + "description": "Defined by STIX 2.1 extension definition rules from 'extension-type-enum'.", + "enum": [ + "property-extension" + ] }, - "required": [ - "extension_type", - "pap" - ], - "additionalProperties": false - } - }, - "required": [ - "extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b" - ], - "additionalProperties": false - } - } - }, - "pap_amber": { - "description": "The marking-definition object representing Permissible Protocol (PAP) Amber.", - "properties": { - "id": { - "type": "string", - "enum": [ - "marking-definition--60f8932b-e51e-4458-b265-a2e8be9a80ab" - ] - }, - "name": { - "type": "string", - "enum": [ - "PAP:AMBER" - ] + "pap": { + "type": "string", + "enum": [ + "white" + ] + } + }, + "required": [ + "extension_type", + "pap" + ], + "additionalProperties": false + } }, - "extensions": { - "type": "object", - "properties": { - "extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b": { - "type": "object", - "properties": { - "extension_type": { - "type": "string", - "description": "Defined by STIX 2.1 extension definition rules from 'extension-type-enum'.", - "enum": [ - "property-extension" - ] - }, - "pap": { - "type": "string", - "enum": [ - "amber" - ] - } + "required": [ + "extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b" + ], + "additionalProperties": false + } + } + }, + "pap_green": { + "description": "The marking-definition object representing Permissible Actions Protocol (PAP) Green.", + "properties": { + "id": { + "type": "string", + "enum": [ + "marking-definition--c43594d1-4b11-4c59-93ab-1c9b14d53ce9" + ] + }, + "name": { + "type": "string", + "enum": [ + "PAP:GREEN" + ] + }, + "extensions": { + "type": "object", + "properties": { + "extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b": { + "type": "object", + "properties": { + "extension_type": { + "type": "string", + "description": "Defined by STIX 2.1 extension definition rules from 'extension-type-enum'.", + "enum": [ + "property-extension" + ] }, - "required": [ - "extension_type", - "pap" - ], - "additionalProperties": false - } - }, - "required": [ - "extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b" - ], - "additionalProperties": false - } + "pap": { + "type": "string", + "enum": [ + "green" + ] + } + }, + "required": [ + "extension_type", + "pap" + ], + "additionalProperties": false + } + }, + "required": [ + "extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b" + ], + "additionalProperties": false } - }, - "pap_red": { - "description": "The marking-definition object representing Permissible Actions Protocol (PAP) Red.", - "properties": { - "id": { - "type": "string", - "enum": [ - "marking-definition--740d36e5-7714-4c30-961a-3ae632ceee0e" - ] + } + }, + "pap_amber": { + "description": "The marking-definition object representing Permissible Protocol (PAP) Amber.", + "properties": { + "id": { + "type": "string", + "enum": [ + "marking-definition--60f8932b-e51e-4458-b265-a2e8be9a80ab" + ] + }, + "name": { + "type": "string", + "enum": [ + "PAP:AMBER" + ] + }, + "extensions": { + "type": "object", + "properties": { + "extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b": { + "type": "object", + "properties": { + "extension_type": { + "type": "string", + "description": "Defined by STIX 2.1 extension definition rules from 'extension-type-enum'.", + "enum": [ + "property-extension" + ] + }, + "pap": { + "type": "string", + "enum": [ + "amber" + ] + } + }, + "required": [ + "extension_type", + "pap" + ], + "additionalProperties": false + } }, - "name": { - "type": "string", - "enum": [ - "PAP:RED" - ] + "required": [ + "extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b" + ], + "additionalProperties": false + } + } + }, + "pap_red": { + "description": "The marking-definition object representing Permissible Actions Protocol (PAP) Red.", + "properties": { + "id": { + "type": "string", + "enum": [ + "marking-definition--740d36e5-7714-4c30-961a-3ae632ceee0e" + ] + }, + "name": { + "type": "string", + "enum": [ + "PAP:RED" + ] + }, + "extensions": { + "type": "object", + "properties": { + "extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b": { + "type": "object", + "properties": { + "extension_type": { + "type": "string", + "description": "Defined by STIX 2.1 extension definition rules from 'extension-type-enum'.", + "enum": [ + "property-extension" + ] + }, + "pap": { + "type": "string", + "enum": [ + "red" + ] + } + }, + "required": [ + "extension_type", + "pap" + ], + "additionalProperties": false + } }, - "extensions": { - "type": "object", - "properties": { - "extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b": { - "type": "object", - "properties": { - "extension_type": { - "type": "string", - "description": "Defined by STIX 2.1 extension definition rules from 'extension-type-enum'.", - "enum": [ - "property-extension" - ] - }, - "pap": { - "type": "string", - "enum": [ - "red" - ] - } + "required": [ + "extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b" + ], + "additionalProperties": false + } + } + }, + "pap_clear": { + "description": "The marking-definition object representing Permissible Actions Protocol (PAP) Clear.", + "properties": { + "id": { + "type": "string", + "enum": [ + "marking-definition--ad15a0cd-55b6-4588-a14c-a66105329b92" + ] + }, + "name": { + "type": "string", + "enum": [ + "PAP:CLEAR" + ] + }, + "extensions": { + "type": "object", + "properties": { + "extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b": { + "type": "object", + "properties": { + "extension_type": { + "type": "string", + "description": "Defined by STIX 2.1 extension definition rules from 'extension-type-enum'.", + "enum": [ + "property-extension" + ] }, - "required": [ - "extension_type", - "pap" - ], - "additionalProperties": false - } - }, - "required": [ - "extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b" - ], - "additionalProperties": false - } + "pap": { + "type": "string", + "enum": [ + "clear" + ] + } + }, + "required": [ + "extension_type", + "pap" + ], + "additionalProperties": false + } + }, + "required": [ + "extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b" + ], + "additionalProperties": false } } } } +} \ No newline at end of file From dbda303fe767022725c1c599b6d71ec7b8e69a55 Mon Sep 17 00:00:00 2001 From: Gage Hackford Date: Thu, 14 Mar 2024 17:38:45 -0400 Subject: [PATCH 2/6] adding pap:clear example and updating adoc with pap:clear --- .../STIX-2.1-PAP-marking-definition.adoc | 12 ++++++++++-- .../examples/pap-clear.json | 13 +++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 extension-definition-specifications/pap-marking-definition-f8d/examples/pap-clear.json diff --git a/extension-definition-specifications/pap-marking-definition-f8d/STIX-2.1-PAP-marking-definition.adoc b/extension-definition-specifications/pap-marking-definition-f8d/STIX-2.1-PAP-marking-definition.adoc index 731e44d3136..9e960f1abd4 100644 --- a/extension-definition-specifications/pap-marking-definition-f8d/STIX-2.1-PAP-marking-definition.adoc +++ b/extension-definition-specifications/pap-marking-definition-f8d/STIX-2.1-PAP-marking-definition.adoc @@ -107,6 +107,8 @@ PAP:AMBER PAP:RED +PAP:CLEAR + |*extensions* (required) |[stixtype]#{dictionary_url}[dictionary]# |Specifies the PAP marking “color” as an extension dictionary. @@ -138,7 +140,8 @@ The value of this property *MUST* be [stixliteral]#property-extension# white, green, amber, -red +red, +clear |=== [[marking-definition]] @@ -169,7 +172,12 @@ a|red a| ---- include::examples/pap-red.json[] - +---- +a|clear +[source,json] +a| +---- +include::examples/pap-clear.json[] ---- |=== diff --git a/extension-definition-specifications/pap-marking-definition-f8d/examples/pap-clear.json b/extension-definition-specifications/pap-marking-definition-f8d/examples/pap-clear.json new file mode 100644 index 00000000000..f20b95479b5 --- /dev/null +++ b/extension-definition-specifications/pap-marking-definition-f8d/examples/pap-clear.json @@ -0,0 +1,13 @@ +{ + "type": "marking-definition", + "spec_version": "2.1", + "id": "marking-definition--ad15a0cd-55b6-4588-a14c-a66105329b92", + "created": "2022-10-01T00:00:00.000Z", + "name": "PAP:CLEAR", + "extensions": { + "extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b": { + "extension_type": "property-extension", + "pap": "clear" + } + } +} \ No newline at end of file From 4c0074d82d069075053ad2db05011143e725e658 Mon Sep 17 00:00:00 2001 From: Gage Hackford Date: Fri, 15 Mar 2024 12:35:48 -0400 Subject: [PATCH 3/6] updating definitions tag and moving name inside of properties --- ...nition--f8d78575-edfd-406e-8e84-6162a8450f5b.json | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/extension-definition-specifications/pap-marking-definition-f8d/extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b.json b/extension-definition-specifications/pap-marking-definition-f8d/extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b.json index cee4d24e75f..2183c703a5e 100644 --- a/extension-definition-specifications/pap-marking-definition-f8d/extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b.json +++ b/extension-definition-specifications/pap-marking-definition-f8d/extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b.json @@ -37,15 +37,13 @@ "created": { "$ref": "http://raw.githubusercontent.com/oasis-open/cti-stix2-json-schemas/stix2.1/schemas/common/timestamp.json", "description": "The created property represents the time at which the first version of this Marking Definition object was created." + }, + "name": { + "type": "string", + "description": "A name used to identify the Marking Definition. The value of this property MUST be one of the following: PAP:WHITE, PAP:GREEN, PAP:AMBER, PAP:RED, PAP:CLEAR" } } }, - { - "name": { - "type": "string", - "description": "A name used to identify the Marking Definition. The value of this property MUST be one of the following: PAP:WHITE, PAP:GREEN, PAP:AMBER, PAP:RED, PAP:CLEAR" - } - }, { "oneOf": [ { @@ -66,7 +64,7 @@ ] } ], - "defs": { + "$definitions": { "pap_white": { "description": "The marking-definition object representing Permissible Actions Protocol (PAP) White.", "properties": { From cf8804316546b866256bae3139265b4845b5dbd5 Mon Sep 17 00:00:00 2001 From: Gage Hackford Date: Mon, 18 Mar 2024 13:39:15 -0400 Subject: [PATCH 4/6] removing PAP spec word doc --- .../STIX-2.1-PAP-marking-definition.docx | Bin 27280 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 extension-definition-specifications/pap-marking-definition-f8d/STIX-2.1-PAP-marking-definition.docx diff --git a/extension-definition-specifications/pap-marking-definition-f8d/STIX-2.1-PAP-marking-definition.docx b/extension-definition-specifications/pap-marking-definition-f8d/STIX-2.1-PAP-marking-definition.docx deleted file mode 100644 index f1bf9d757de74a6b7b8ac7e3fb48c595090cc5dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 27280 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 From 7fe85c221ad940f11b8a8ee014120d0f28136c08 Mon Sep 17 00:00:00 2001 From: Gage Hackford Date: Mon, 18 Mar 2024 13:52:18 -0400 Subject: [PATCH 5/6] adding deprecated property restrictions to pap schema, changing definitions tag --- ...on--f8d78575-edfd-406e-8e84-6162a8450f5b.json | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/extension-definition-specifications/pap-marking-definition-f8d/extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b.json b/extension-definition-specifications/pap-marking-definition-f8d/extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b.json index 2183c703a5e..375afe939f8 100644 --- a/extension-definition-specifications/pap-marking-definition-f8d/extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b.json +++ b/extension-definition-specifications/pap-marking-definition-f8d/extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b.json @@ -8,6 +8,20 @@ { "$ref": "http://raw.githubusercontent.com/oasis-open/cti-stix2-json-schemas/stix2.1/schemas/common/marking-definition.json" }, + { + "not": { + "required": [ + "definition_type" + ] + } + }, + { + "not": { + "required": [ + "definition" + ] + } + }, { "required": [ "id", @@ -64,7 +78,7 @@ ] } ], - "$definitions": { + "definitions": { "pap_white": { "description": "The marking-definition object representing Permissible Actions Protocol (PAP) White.", "properties": { From 63df09c6b06ac2aa0019dd67d11255b89e106844 Mon Sep 17 00:00:00 2001 From: Gage Hackford Date: Mon, 18 Mar 2024 22:47:51 -0400 Subject: [PATCH 6/6] updating definitions tag --- ...ension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension-definition-specifications/pap-marking-definition-f8d/extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b.json b/extension-definition-specifications/pap-marking-definition-f8d/extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b.json index 375afe939f8..58ea5543b5f 100644 --- a/extension-definition-specifications/pap-marking-definition-f8d/extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b.json +++ b/extension-definition-specifications/pap-marking-definition-f8d/extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b.json @@ -78,7 +78,7 @@ ] } ], - "definitions": { + "$defs": { "pap_white": { "description": "The marking-definition object representing Permissible Actions Protocol (PAP) White.", "properties": {