MISP
/
PyMISP
mirror of https://github.com/MISP/PyMISP
2
0
Fork 0
Code Issues Releases Wiki Activity

chg: Cleanups

pull/470/head
Raphaël Vinot 2019-10-08 16:06:28 +02:00
parent f312f87072
commit 898bc96ea6
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pymisp/mispevent.py
View File

@ -113,7 +113,6 @@ class MISPAttribute(AbstractMISP):
if describe_types: if describe_types:
self.describe_types = describe_types self.describe_types = describe_types
self.__categories = self.describe_types['categories'] self.__categories = self.describe_types['categories']
self.__types = self.describe_types['types']
self.__category_type_mapping = self.describe_types['category_type_mappings'] self.__category_type_mapping = self.describe_types['category_type_mappings']
self.__sane_default = self.describe_types['sane_defaults'] self.__sane_default = self.describe_types['sane_defaults']
self.__strict = strict self.__strict = strict
@ -125,7 +124,7 @@ class MISPAttribute(AbstractMISP):
@property @property
def known_types(self): def known_types(self):
"""Returns a list of all the known MISP attributes types""" """Returns a list of all the known MISP attributes types"""
return self.__types return self.describe_types['types']
@property @property
def malware_binary(self): def malware_binary(self):
@ -421,20 +420,17 @@ class MISPEvent(AbstractMISP):
def __init__(self, describe_types=None, strict_validation=False, **kwargs): def __init__(self, describe_types=None, strict_validation=False, **kwargs):
super(MISPEvent, self).__init__(**kwargs) super(MISPEvent, self).__init__(**kwargs)
if strict_validation: if strict_validation:
schema_file = 'schema.json'
else:
schema_file = 'schema-lax.json'
if sys.version_info >= (3, 6): if sys.version_info >= (3, 6):
self.__json_schema = self._load_json(self.resources_path / 'schema.json') self.__json_schema = self._load_json(self.resources_path / schema_file)
else: else:
self.__json_schema = self._load_json(os.path.join(self.resources_path, 'schema.json')) self.__json_schema = self._load_json(os.path.join(self.resources_path, schema_file))
else:
if sys.version_info >= (3, 6):
self.__json_schema = self._load_json(self.resources_path / 'schema-lax.json')
else:
self.__json_schema = self._load_json(os.path.join(self.resources_path, 'schema-lax.json'))
if describe_types: if describe_types:
# This variable is used in add_attribute in order to avoid duplicating the structure # This variable is used in add_attribute in order to avoid duplicating the structure
self.describe_types = describe_types self.describe_types = describe_types
self.__types = self.describe_types['types']
self.Attribute = [] self.Attribute = []
self.Object = [] self.Object = []
self.RelatedEvent = [] self.RelatedEvent = []
@ -442,7 +438,7 @@ class MISPEvent(AbstractMISP):
@property @property
def known_types(self): def known_types(self):
return self.__types return self.describe_types['types']
@property @property
def org(self): def org(self):