fix: lint errors, add x_mitre_deprecated to stix20/ custom objects

Author: elucchesileon

mitreattack/stix20/MitreAttackData.py

@@ -981,8 +981,8 @@ def get_attack_id(self, stix_id: str) -> str | None:
             The ATT&CK ID of the object, or None if not found.
         """
         obj = self.get_object_by_stix_id(stix_id)
-        external_references = obj.get("external_references")
-        if external_references:
+        external_references = self.get_field(obj, "external_references", [])
+        if external_references and len(external_references) > 0:
             attack_source = external_references[0]
             if attack_source.get("external_id") and attack_source.get("source_name") == "mitre-attack":
                 return attack_source["external_id"]
@@ -1018,8 +1018,8 @@ def get_name(self, stix_id: str) -> str | None:
         """
         obj = self.get_object_by_stix_id(stix_id)
         # name = MitreAttackData.get_field(obj, "name")
-        name = obj.get("name")
-        return name if name is not None else None
+        name = self.get_field(obj, "name")
+        return name
 
     ###################################
     # Relationship Section

mitreattack/stix20/custom_attack_objects.py

@@ -108,6 +108,7 @@ def StixObjectFactory(data: dict) -> Union[CustomStixObject, stix2.v20.sdo._Doma
         ("x_mitre_modified_by_ref", ReferenceProperty(valid_types="identity", spec_version="2.0")),
         ("x_mitre_version", StringProperty()),
         ("x_mitre_attack_spec_version", StringProperty()),
+        ("x-mitre-deprecated", BooleanProperty(default=lambda: False)),
         # Matrix Properties
         ("tactic_refs", ListProperty(ReferenceProperty(valid_types="x-mitre-tactic", spec_version="2.0"))),
     ],
@@ -141,6 +142,7 @@ class Matrix(CustomStixObject, object):
         ("x_mitre_modified_by_ref", ReferenceProperty(valid_types="identity", spec_version="2.0")),
         ("x_mitre_version", StringProperty()),
         ("x_mitre_attack_spec_version", StringProperty()),
+        ("x-mitre-deprecated", BooleanProperty(default=lambda: False)),
         # Tactic Properties
         ("x_mitre_shortname", StringProperty()),
     ],
@@ -186,6 +188,7 @@ def get_shortname(self) -> str:
         ("x_mitre_modified_by_ref", ReferenceProperty(valid_types="identity", spec_version="2.0")),
         ("x_mitre_version", StringProperty()),
         ("x_mitre_attack_spec_version", StringProperty()),
+        ("x-mitre-deprecated", BooleanProperty(default=lambda: False)),
         # Data Source Properties
         ("x_mitre_platforms", ListProperty(StringProperty())),
         ("x_mitre_collection_layers", ListProperty(StringProperty())),
@@ -220,6 +223,7 @@ class DataSource(CustomStixObject, object):
         ("x_mitre_modified_by_ref", ReferenceProperty(valid_types="identity", spec_version="2.0")),
         ("x_mitre_version", StringProperty()),
         ("x_mitre_attack_spec_version", StringProperty()),
+        ("x-mitre-deprecated", BooleanProperty(default=lambda: False)),
         # Data Component Properties
         ("x_mitre_data_source_ref", ReferenceProperty(valid_types="x-mitre-data-source", spec_version="2.0")),
         ("x_mitre_log_sources", ListProperty(DictionaryProperty())),
@@ -256,6 +260,7 @@ class DataComponent(CustomStixObject, object):
         ("x_mitre_attack_spec_version", StringProperty()),
         ("x_mitre_domains", ListProperty(StringProperty())),
         ("x_mitre_contributors", ListProperty(StringProperty())),
+        ("x-mitre-deprecated", BooleanProperty(default=lambda: False)),
         # Asset Properties
         ("sectors", ListProperty(StringProperty())),
         ("x_mitre_related_assets", ListProperty(DictionaryProperty())),