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

chg: Do not raise an exception when the object template is unknown. 

+ bump misp-object
pull/125/merge
Raphaël Vinot 2017-10-24 08:52:00 -04:00
parent 8f16f741cf
commit 85669abbcb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pymisp/data/misp-objects

@ -1 +1 @@
Subproject commit b801bc6603c9ba9f6bec5b5868ae26b89a11d862 Subproject commit bbf3e45649af5af50c98ad90a86916cf75e8c74d

8
pymisp/mispevent.py
View File

@ -603,7 +603,7 @@ class MISPObjectAttribute(MISPAttribute):
class MISPObject(AbstractMISP): class MISPObject(AbstractMISP):
def __init__(self, name, strict=True): def __init__(self, name, strict=False):
super(MISPObject, self).__init__() super(MISPObject, self).__init__()
self.__strict = strict self.__strict = strict
self.name = name self.name = name
@ -639,7 +639,7 @@ class MISPObject(AbstractMISP):
else: else:
self.__known_template = False self.__known_template = False
if kwargs.get('template_version') and int(kwargs['template_version']) != self.template_version: if kwargs.get('template_version') and int(kwargs['template_version']) != self.template_version:
if self.strict: if self.__strict:
raise UnknownMISPObjectTemplate('Version of the object ({}) is different from the one of the template ({}).'.format(kwargs['template_version'], self.template_version)) raise UnknownMISPObjectTemplate('Version of the object ({}) is different from the one of the template ({}).'.format(kwargs['template_version'], self.template_version))
else: else:
self.__known_template = False self.__known_template = False
@ -654,12 +654,12 @@ class MISPObject(AbstractMISP):
else: else:
setattr(self, key, value) setattr(self, key, value)
def to_dict(self, strict=True): def to_dict(self, strict=False):
if strict or self.__strict and self.__known_template: if strict or self.__strict and self.__known_template:
self._validate() self._validate()
return super(MISPObject, self).to_dict() return super(MISPObject, self).to_dict()
def to_json(self, strict=True): def to_json(self, strict=False):
if strict or self.__strict and self.__known_template: if strict or self.__strict and self.__known_template:
self._validate() self._validate()
return super(MISPObject, self).to_json() return super(MISPObject, self).to_json()