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

Avoid validation issue if attribute_count is none

pull/34/head
Raphaël Vinot 2016-10-11 17:45:38 +02:00
parent 3df35826c5
commit ed2be78f4e
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pymisp/mispevent.py
View File

@ -208,16 +208,23 @@ class MISPEvent(object):
def load(self, json_event): def load(self, json_event):
self.new = False self.new = False
self.dump_full = True self.dump_full = True
if isinstance(json_event, basestring) and os.path.exists(json_event):
# NOTE: is it a good idea? (possible security issue if an untrusted user call this method)
json_event = open(json_event, 'r')
if hasattr(json_event, 'read'):
# python2 and python3 compatible to find if we have a file
json_event = json_event.read()
if isinstance(json_event, basestring): if isinstance(json_event, basestring):
loaded = json.loads(json_event) json_event = json.loads(json_event)
if loaded.get('response'): if json_event.get('response'):
event = loaded.get('response')[0] event = json_event.get('response')[0]
else:
event = loaded
if not event:
raise PyMISPError('Invalid event')
else: else:
event = json_event event = json_event
if not event:
raise PyMISPError('Invalid event')
# Invalid event created by MISP up to 2.4.52 (attribute_count is none instead of '0')
if event.get('Event') and event.get('Event').get('attribute_count') is None:
event['Event']['attribute_count'] = '0'
jsonschema.validate(event, self.json_schema_lax) jsonschema.validate(event, self.json_schema_lax)
e = event.get('Event') e = event.get('Event')
self._reinitialize_event() self._reinitialize_event()