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

new: break on duplicate for object update

obj_break_on_duplicates
Raphaël Vinot 2021-03-01 15:47:51 +01:00
parent 94ce4a367b
commit 4e2cef7c89
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pymisp/api.py
View File

@ -550,7 +550,7 @@ class PyMISP:
o.from_dict(**new_object) o.from_dict(**new_object)
return o return o
def update_object(self, misp_object: MISPObject, object_id: Optional[int] = None, pythonify: bool = False) -> Union[Dict, MISPObject]: def update_object(self, misp_object: MISPObject, object_id: Optional[int] = None, pythonify: bool = False, break_on_duplicate: bool = False) -> Union[Dict, MISPObject]:
"""Update an object on a MISP instance """Update an object on a MISP instance
:param misp_object: object to update :param misp_object: object to update
@ -561,7 +561,8 @@ class PyMISP:
oid = get_uuid_or_id_from_abstract_misp(misp_object) oid = get_uuid_or_id_from_abstract_misp(misp_object)
else: else:
oid = get_uuid_or_id_from_abstract_misp(object_id) oid = get_uuid_or_id_from_abstract_misp(object_id)
r = self._prepare_request('POST', f'objects/edit/{oid}', data=misp_object) params = {'breakOnDuplicate': True} if break_on_duplicate else {}
r = self._prepare_request('POST', f'objects/edit/{oid}', data=misp_object, kw_params=params)
updated_object = self._check_json_response(r) updated_object = self._check_json_response(r)
if not (self.global_pythonify or pythonify) or 'errors' in updated_object: if not (self.global_pythonify or pythonify) or 'errors' in updated_object:
return updated_object return updated_object

24
tests/testlive_comprehensive.py
View File

@ -1480,16 +1480,36 @@ class TestComprehensive(unittest.TestCase):
self.assertEqual(len(obj_attrs), 1, obj_attrs) self.assertEqual(len(obj_attrs), 1, obj_attrs)
self.assertEqual(r.name, 'file', r) self.assertEqual(r.name, 'file', r)
# Test break_on_duplicate at object level # Test break_on_duplicate at object level for add_object
fo_dup, peo_dup, _ = make_binary_objects('tests/viper-test-files/test_files/whoami.exe') fo_dup, peo_dup, _ = make_binary_objects('tests/viper-test-files/test_files/whoami.exe')
r = self.user_misp_connector.add_object(first, peo_dup, break_on_duplicate=True) r = self.user_misp_connector.add_object(first, peo_dup, break_on_duplicate=True)
self.assertTrue("Duplicate object found" in r['errors'][1]['errors'], r) self.assertTrue("Duplicate object found" in r['errors'][1]['errors'], r)
# Test break on duplicate with breakOnDuplicate key in object # Test break on duplicate with breakOnDuplicate key in object for add_object
fo_dup.breakOnDuplicate = True fo_dup.breakOnDuplicate = True
r = self.user_misp_connector.add_object(first, fo_dup) r = self.user_misp_connector.add_object(first, fo_dup)
self.assertTrue("Duplicate object found" in r['errors'][1]['errors'], r) self.assertTrue("Duplicate object found" in r['errors'][1]['errors'], r)
# Test break_on_duplicate at object level for update_object
obj1 = MISPObject('domain-ip')
obj1.add_attribute('ip', value="8.8.8.8")
obj1.add_attribute('domain', value="google.lu")
obj2 = MISPObject('domain-ip')
obj2.add_attribute('ip', value="8.8.8.8")
obj2.add_attribute('domain', value="google.fr")
o1 = self.user_misp_connector.add_object(first, obj1, pythonify=True)
self.assertEqual(o1.attributes[1].value, 'google.lu')
o2 = self.user_misp_connector.add_object(first, obj2, pythonify=True)
self.assertEqual(o2.attributes[1].value, 'google.fr')
obj2.attributes[1].value = 'google.lu'
r = self.user_misp_connector.update_object(obj2, o2.uuid, break_on_duplicate=True)
self.assertTrue("Duplicate object found" in r['errors'][1]['errors'], r)
# Test break on duplicate with breakOnDuplicate key in object for update_object
obj2.breakOnDuplicate = True
r = self.user_misp_connector.update_object(obj2, o2.uuid)
self.assertTrue("Duplicate object found" in r['errors'][1]['errors'], r)
# Test refs # Test refs
r = self.user_misp_connector.add_object_reference(fo.ObjectReference[0]) r = self.user_misp_connector.add_object_reference(fo.ObjectReference[0])
self.assertEqual(r.object_uuid, fo.uuid, r.to_json()) self.assertEqual(r.object_uuid, fo.uuid, r.to_json())