From 27d6bdb78c79306d99d390c3a1d9fe35985d2ef6 Mon Sep 17 00:00:00 2001 From: Andres Cienfuegos Date: Fri, 25 Feb 2022 01:51:49 +0100 Subject: [PATCH] feature: access deprecated attribute from all MITRE ATT&CK objects --- pyattck/enterprise/attckobject.py | 1 + pyattck/enterprise/technique.py | 1 - pyattck/ics/attckobject.py | 1 + pyattck/ics/technique.py | 1 - pyattck/mobile/mobileattckobject.py | 1 + pyattck/mobile/technique.py | 2 -- 6 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pyattck/enterprise/attckobject.py b/pyattck/enterprise/attckobject.py index a69d5e28..50730e19 100644 --- a/pyattck/enterprise/attckobject.py +++ b/pyattck/enterprise/attckobject.py @@ -35,6 +35,7 @@ def __init__(self, **kwargs): self.modified = self._set_attribute(kwargs, 'modified') self.stix = self._set_attribute(kwargs, 'id') self.type = self._set_attribute(kwargs, 'type') + self.deprecated = self._set_attribute(kwargs, 'x_mitre_deprecated') def __str__(self): """ diff --git a/pyattck/enterprise/technique.py b/pyattck/enterprise/technique.py index b72a9ba1..eeaa21aa 100644 --- a/pyattck/enterprise/technique.py +++ b/pyattck/enterprise/technique.py @@ -114,7 +114,6 @@ def __init__(self, attck_obj = None, **kwargs): self.wiki = self._set_wiki(kwargs) self.contributors = self._set_list_items(kwargs, 'x_mitre_contributors') self.revoked = self._set_attribute(kwargs, 'revoked') - self.deprecated = self._set_attribute(kwargs, 'x_mitre_deprecated') self.subtechnique = False if self._set_attribute(kwargs, 'x_mitre_is_subtechnique') is None else True self.__subtechniques = [] self.command_list = self.__get_filtered_dataset('command_list') diff --git a/pyattck/ics/attckobject.py b/pyattck/ics/attckobject.py index c9d66a43..4c359bec 100644 --- a/pyattck/ics/attckobject.py +++ b/pyattck/ics/attckobject.py @@ -35,6 +35,7 @@ def __init__(self, **kwargs): self.modified = self._set_attribute(kwargs, 'modified') self.stix = self._set_attribute(kwargs, 'id') self.type = self._set_attribute(kwargs, 'type') + self.deprecated = self._set_attribute(kwargs, 'x_mitre_deprecated') def __str__(self): """ diff --git a/pyattck/ics/technique.py b/pyattck/ics/technique.py index aa59f547..d91dfdd1 100644 --- a/pyattck/ics/technique.py +++ b/pyattck/ics/technique.py @@ -117,7 +117,6 @@ def __init__(self, attck_obj = None, _enterprise_attck_obj=None, **kwargs): self.wiki = self._set_wiki(kwargs) self.contributors = self._set_list_items(kwargs, 'x_mitre_contributors') self.revoked = self._set_attribute(kwargs, 'revoked') - self.deprecated = self._set_attribute(kwargs, 'x_mitre_deprecated') self.subtechnique = False if self._set_attribute(kwargs, 'x_mitre_is_subtechnique') is None else True self.command_list = self.__get_filtered_dataset('command_list') self.commands = self.__get_filtered_dataset('commands') diff --git a/pyattck/mobile/mobileattckobject.py b/pyattck/mobile/mobileattckobject.py index b1677b6a..5d1f4de1 100644 --- a/pyattck/mobile/mobileattckobject.py +++ b/pyattck/mobile/mobileattckobject.py @@ -35,6 +35,7 @@ def __init__(self, **kwargs): self.modified = self._set_attribute(kwargs, 'modified') self.stix = self._set_attribute(kwargs, 'id') self.type = self._set_attribute(kwargs, 'type') + self.deprecated = self._set_attribute(kwargs, 'x_mitre_deprecated') def __str__(self): return_dict = {} diff --git a/pyattck/mobile/technique.py b/pyattck/mobile/technique.py index 8fb7e10b..af03a9c3 100644 --- a/pyattck/mobile/technique.py +++ b/pyattck/mobile/technique.py @@ -79,14 +79,12 @@ def __init__(self, mobile_attck_obj = None, **kwargs): self.old_attack_id = self._set_attribute(kwargs, 'x_mitre_old_attack_id') self.platforms = self._set_list_items(kwargs, 'x_mitre_platforms') self.version = self._set_attribute(kwargs, 'x_mitre_version') - self.depricated = self._set_attribute(kwargs, 'x_mitre_deprecated') self.created_by_ref = self._set_attribute(kwargs, 'created_by_ref') self.contributor = self._set_list_items(kwargs, 'x_mitre_contributors') self.tactic_type = self._set_list_items(kwargs, 'x_mitre_tactic_type') self.external_reference = self._set_reference(kwargs) self.possible_detections = self._set_attribute(kwargs, 'x_mitre_detection') self.revoked = self._set_attribute(kwargs, 'revoked') - self.deprecated = self._set_attribute(kwargs, 'x_mitre_deprecated') self.wiki = self._set_wiki(kwargs) self.stix = self._set_attribute(kwargs, 'id') self.command_list = self.__get_filtered_dataset('command_list')