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

More logical output for _prepare_full_event

pull/34/head
Raphaël Vinot 2016-10-05 11:43:33 +02:00
parent 8a931a89f3
commit e91ad63ccf
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pymisp/api.py
View File

@ -295,7 +295,7 @@ class PyMISP(object):
analysis=analysis, date=date) analysis=analysis, date=date)
if published: if published:
misp_event.publish() misp_event.publish()
return json.dumps(misp_event, cls=EncodeUpdate) return misp_event
def _prepare_full_attribute(self, category, type_value, value, to_ids, comment=None, distribution=5): def _prepare_full_attribute(self, category, type_value, value, to_ids, comment=None, distribution=5):
misp_attribute = MISPAttribute(self.describe_types['result']) misp_attribute = MISPAttribute(self.describe_types['result'])
@ -334,8 +334,8 @@ class PyMISP(object):
return self.update_event(event['Event']['id'], json.dumps(e, cls=EncodeUpdate)) return self.update_event(event['Event']['id'], json.dumps(e, cls=EncodeUpdate))
def new_event(self, distribution=None, threat_level_id=None, analysis=None, info=None, date=None, published=False): def new_event(self, distribution=None, threat_level_id=None, analysis=None, info=None, date=None, published=False):
data = self._prepare_full_event(distribution, threat_level_id, analysis, info, date, published) misp_event = self._prepare_full_event(distribution, threat_level_id, analysis, info, date, published)
return self.add_event(data) return self.add_event(json.dumps(misp_event, cls=EncodeUpdate))
def add_tag(self, event, tag): def add_tag(self, event, tag):
session = self.__prepare_session() session = self.__prepare_session()
@ -639,7 +639,11 @@ class PyMISP(object):
pass pass
if not isinstance(event_id, int): if not isinstance(event_id, int):
# New event # New event
to_post['request'] = self._prepare_full_event(distribution, threat_level_id, analysis, info) misp_event = self._prepare_full_event(distribution, threat_level_id, analysis, info)
to_post['request']['distribution'] = misp_event.distribution
to_post['request']['info'] = misp_event.info
to_post['request']['analysis'] = misp_event.analysis
to_post['request']['threat_level_id'] = misp_event.threat_level_id
else: else:
to_post['request']['event_id'] = int(event_id) to_post['request']['event_id'] = int(event_id)