From 70dcb9244b64251fd4b4dae71b47f9452a5e39bd Mon Sep 17 00:00:00 2001 From: Rich Piazza Date: Mon, 2 Dec 2024 17:59:51 -0500 Subject: [PATCH] rename artifact.json, remove unevaluatedProperties from impact schema --- .../artifact-805/artifact.json | 32 ------------------ ...-7cc33dd6-f6a1-489b-98ea-522d351d71b9.json | 33 ++++--------------- 2 files changed, 7 insertions(+), 58 deletions(-) delete mode 100644 extension-definition-specifications/artifact-805/artifact.json diff --git a/extension-definition-specifications/artifact-805/artifact.json b/extension-definition-specifications/artifact-805/artifact.json deleted file mode 100644 index cc88da26b78..00000000000 --- a/extension-definition-specifications/artifact-805/artifact.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://raw.githubusercontent.com/oasis-open/cti-stix-common-objects/main/extension-definition-specifications/artifact-805/artifact.json", - "title": "malware-sample-artifact-extension", - "description": "An extension of the Artifact object to allow capture of malware samples.", - "type": "object", - "properties": { - "extensions": { - "type": "object", - "properties": { - "extension-definition--8053ffa0-dec7-4aef-870e-a56d0082cf69": { - "type": "object", - "properties": {"extension_type": { - "type": "string", - "description": "Defined by STIX 2.1 extension definition rules from 'extension-type-enum'.", - "enum": ["toplevel-property-extension"] - }}, - "required": ["extension_type"] - }, - "required": ["extension-definition--8053ffa0-dec7-4aef-870e-a56d0082cf69"] - } - }, - "is_safe": { - "type": "boolean", - "description": "Indicates whether the artifact is safe, i.e., can be opened or processed without risking harm or infection. The default value is false." - } - }, - "required": [ - "extensions", - "is_safe" - ] -} diff --git a/extension-definition-specifications/incident-ef7/impact/extension-definition--7cc33dd6-f6a1-489b-98ea-522d351d71b9.json b/extension-definition-specifications/incident-ef7/impact/extension-definition--7cc33dd6-f6a1-489b-98ea-522d351d71b9.json index 40a4f7b1ed2..34a63351b63 100644 --- a/extension-definition-specifications/incident-ef7/impact/extension-definition--7cc33dd6-f6a1-489b-98ea-522d351d71b9.json +++ b/extension-definition-specifications/incident-ef7/impact/extension-definition--7cc33dd6-f6a1-489b-98ea-522d351d71b9.json @@ -8,7 +8,6 @@ "impact_category", "extensions" ], - "unevaluatedProperties": false, "allOf": [ { "$ref": "#/definitions/STIX_Uncommon" @@ -98,14 +97,15 @@ }, "extensions": { "type": "object", - "description": "STIX extensions.", + "description": "STIX extensions.", "additionalProperties": true, - "minProperties": 2, + "$comment": "re-consider min_properties: 2 if undetermined is removed", "required": ["extension-definition--7cc33dd6-f6a1-489b-98ea-522d351d71b9"], "properties": { "extension-definition--7cc33dd6-f6a1-489b-98ea-522d351d71b9": { - "type": "object", - "additionalProperties": false, + "required": ["extension_type"], + "additionalProperties": false, + "type": "object", "properties": { "extension_type": { "type": "string", @@ -124,26 +124,7 @@ } } }, - "confidentiality-ext": { - "additionalProperties": false, - "anyOf": [ - { - "required": [ - "information_type", - "loss_type" - ] - }, - { - "required": [ - "loss_type" - ], - "properties": { - "loss_type": { - "const": "none" - } - } - } - ], + "confidentiality-ext": { "properties": { "information_type": { "type": "string", @@ -489,4 +470,4 @@ } } } -} \ No newline at end of file +}