Merge pull request #169 from oasis-open/fix-tlp-markings

Fix tlp markings checks
oasis-open · Apr 29, 2021 · c60af65 · c60af65
2 parents eef6310 + fe72801
commit c60af65
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 10 deletions.
diff --git a/stix2validator/errors.py b/stix2validator/errors.py
@@ -193,8 +193,12 @@ def pretty_error(error, verbose=False):
                     msg = "'artifact' object must contain either 'payload_bin' "\
                           "or 'url'"
             elif 'type' in error.instance and error.instance['type'] == 'marking-definition':
-                msg = "'definition' must contain a valid statement, TLP, or "\
-                      "custom marking definition"
+                if error.instance.get('definition_type', '') == 'tlp':
+                    msg = "TLP marking definitions must match one of those "\
+                          "defined in the STIX specification."
+                else:
+                    msg = "'definition' must contain a valid statement, TLP, or "\
+                          "custom marking definition"
             elif 'type' in error.instance and error.instance['type'] == 'file':
                 if (('is_encrypted' not in error.instance or
                         error.instance['is_encrypted'] is False) and

diff --git a/stix2validator/schemas-2.0 b/stix2validator/schemas-2.0
diff --git a/stix2validator/schemas-2.1 b/stix2validator/schemas-2.1
diff --git a/stix2validator/test/v20/marking_definition_tests.py b/stix2validator/test/v20/marking_definition_tests.py
@@ -78,9 +78,17 @@ def test_marking_definition_invalid_definition(self):
         self.assertFalseWithOptions(marking_definition)
 
     def test_granular_marking_id_selector(self):
-        marking_definition = copy.deepcopy(self.valid_marking_definition)
-        marking_definition['granular_markings'] = [{
+        marking_definition = {
+          "type": "marking-definition",
+          "id": "marking-definition--34098fce-860f-48ae-8e50-ebd3cc5e41da",
+          "created": "2016-08-01T00:00:00.000Z",
+          "definition_type": "statement",
+          "definition": {
+            "statement": "Copyright 2016, Example Corp"
+          },
+          "granular_markings": [{
             "marking_ref": "marking-definition--4478bf48-9af2-4afa-9fc5-7075f6af04af",
             "selectors": ["id"]
-        }]
+          }]
+        }
         self.assertTrueWithOptions(marking_definition)
diff --git a/stix2validator/test/v21/marking_definition_tests.py b/stix2validator/test/v21/marking_definition_tests.py
@@ -11,6 +11,7 @@
   "id": "marking-definition--34098fce-860f-48ae-8e50-ebd3cc5e41da",
   "created": "2017-01-20T00:00:00.000Z",
   "definition_type": "tlp",
+  "name": "TLP:GREEN",
   "definition": {
     "tlp": "green"
   }
@@ -79,11 +80,20 @@ def test_marking_definition_invalid_definition(self):
         self.assertFalseWithOptions(marking_definition)
 
     def test_granular_marking_id_selector(self):
-        marking_definition = copy.deepcopy(self.valid_marking_definition)
-        marking_definition['granular_markings'] = [{
+        marking_definition = {
+          "type": "marking-definition",
+          "spec_version": "2.1",
+          "id": "marking-definition--4a0042fe-8b88-40fe-9600-dfa128ce6fbd",
+          "created": "2016-08-01T00:00:00.000Z",
+          "definition_type": "statement",
+          "definition": {
+            "statement": "Copyright 2019, Example Corp"
+          },
+          "granular_markings": [{
             "marking_ref": "marking-definition--4478bf48-9af2-4afa-9fc5-7075f6af04af",
             "selectors": ["id"]
-        }]
+          }]
+        }
         self.assertTrueWithOptions(marking_definition)
 
     def test_marking_definition_missing_properties(self):
+57 −1		schemas/common/marking-definition.json
+1 −1		schemas/observables/process.json