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

fix: Typo, add test for extended event

pull/573/head
Raphaël Vinot 2020-05-04 10:19:55 +02:00
parent b08cf8b6a6
commit 8980c2da3b
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pymisp/api.py
View File

@ -246,17 +246,6 @@ class PyMISP:
e.load(updated_event)
return e
def extend_event(self, event: MISPEvent, event_id: int, pythonify: bool=False) -> Union[dict, MISPEvent]:
'''Extends an event on a MISP instance'''
eid = self.__get_uuid_or_id_from_abstract_misp(event_id)
r = self._prepare_request('POST', f'events/add/extends/{eid}', data=event)
updated_event = self._check_json_response(r)
if not (self.global_pythonify or pythonify) or 'errors' in updated_event:
return updated_event
e = MISPEvent()
e.load(updated_event)
return e
def delete_event(self, event: Union[MISPEvent, int, str, UUID]) -> dict:
'''Delete an event from a MISP instance'''
event_id = self.__get_uuid_or_id_from_abstract_misp(event)

9
tests/testlive_comprehensive.py
View File

@ -824,11 +824,10 @@ class TestComprehensive(unittest.TestCase):
second.add_attribute('ip-src', '9.9.9.9')
try:
first = self.user_misp_connector.add_event(first)
extended_event = self.user_misp_connector.extend_event(event=second, event_id=first.id, pythonify=True)
self.assertTrue(isinstance(extended_event, MISPEvent), extended_event)
extended_event = self.user_misp_connector.get_event(event=first.id, extended=True, pythonify=True)
self.assertTrue(isinstance(extended_event, MISPEvent), extended_event)
self.assertEqual(extended_event.extensionEvents[second.id]['info'], second.info)
second = self.user_misp_connector.add_event(second)
first_extended = self.user_misp_connector.update_event({'extends_uuid': second.uuid}, event_id=first, pythonify=True)
self.assertTrue(isinstance(first_extended, MISPEvent), first_extended)
self.assertEqual(first_extended.extends_uuid, second.uuid)
finally:
# Delete event
self.admin_misp_connector.delete_event(first)