fix: [misp export] force event uuid

This commit is contained in:
Terrtia 2020-02-21 14:35:34 +01:00
parent bdddb1e5b6
commit 988f71035d
No known key found for this signature in database
GPG key ID: 1E1B1F50D84613D0
3 changed files with 11 additions and 15 deletions

View file

@ -21,6 +21,12 @@ def create_map_obj_uuid_golbal_id(obj_uuid, global_id):
r_serv_objects.sadd('object:map:uuid_id:{}'.format(obj_uuid), global_id) r_serv_objects.sadd('object:map:uuid_id:{}'.format(obj_uuid), global_id)
r_serv_objects.sadd('object:map:id_uuid:{}'.format(global_id), obj_uuid) r_serv_objects.sadd('object:map:id_uuid:{}'.format(global_id), obj_uuid)
def create_map_obj_event_uuid(event_uuid, global_id):
r_serv_objects.sadd('export:all_object:event_uuid', event_uuid)
r_serv_objects.sadd('export:all_object:global_id', global_id)
r_serv_objects.sadd('object:map:event_id:{}'.format(event_uuid), global_id)
r_serv_objects.sadd('object:map:id_event:{}'.format(global_id), event_uuid)
def get_user_list_of_obj_to_export(user_id, add_uuid=False): def get_user_list_of_obj_to_export(user_id, add_uuid=False):
set_objs_to_export = [] set_objs_to_export = []
res = r_serv_objects.hgetall('user:all_objs_to_export:{}'.format(user_id)) res = r_serv_objects.hgetall('user:all_objs_to_export:{}'.format(user_id))

View file

@ -47,7 +47,7 @@ def sanitize_obj_export_lvl(lvl):
return lvl return lvl
def get_export_filename(json_content): def get_export_filename(json_content):
return 'ail_export{}.json'.format(str(uuid.uuid4())) return 'ail_export_{}.json'.format(json_content.uuid)
def create_in_memory_file(json_content): def create_in_memory_file(json_content):
return io.BytesIO(json_content.encode()) return io.BytesIO(json_content.encode())
@ -238,16 +238,14 @@ def create_list_of_objs_to_export(l_obj, r_type='json'):
event = MISPEvent() event = MISPEvent()
event.info = 'AIL framework export' event.info = 'AIL framework export'
event.uuid = str(uuid.uuid4())
for obj_global_id in dict_misp_obj: for obj_global_id in dict_misp_obj:
misp_obj = dict_misp_obj[obj_global_id] misp_obj = dict_misp_obj[obj_global_id]
if misp_obj: if misp_obj:
# add object to event # add object to event
event.add_object(dict_misp_obj[obj_global_id]) event.add_object(dict_misp_obj[obj_global_id])
if r_type == 'json': return event
return event.to_json()
else:
return event
def create_all_misp_obj(all_obj_to_export, set_relationship): def create_all_misp_obj(all_obj_to_export, set_relationship):
dict_misp_obj = {} dict_misp_obj = {}
@ -406,15 +404,7 @@ def extract_event_metadata(event):
if __name__ == '__main__': if __name__ == '__main__':
l_obj = [{'id': 'crawled/2019/11/08/6d3zimnpbwbzdgnp.onionf58258c8-c990-4707-b236-762a2b881183', 'type': 'item', 'lvl': 3}, l_obj = [{'id': 'bfd5f1d89e55b10a8b122a9d7ce31667ec1d086a', 'type': 'decoded', 'lvl': 2}]
{'id': '6d3zimnpbwbzdgnp.onion', 'type': 'domain', 'lvl': 0},
{'id': 'bfd5f1d89e55b10a8b122a9d7ce31667ec1d086a', 'type': 'decoded', 'lvl': 2},
#{'id': 'a92d459f70c4dea8a14688f585a5e2364be8b91fbf924290ead361d9b909dcf1', 'type': 'image', 'lvl': 3},
{'id': 'archive/pastebin.com_pro/2020/01/27/iHjcWhkD.gz', 'type': 'item', 'lvl': 1},
{'id': '0xA4BB02A75E6AF448', 'type': 'pgp', 'subtype': 'key', 'lvl': 1},
{'id': '15efuhpw5V9B1opHAgNXKPBPqdYALXP4hc', 'type': 'cryptocurrency', 'subtype': 'bitcoin', 'lvl': 1}
]
create_list_of_objs_to_export(l_obj) create_list_of_objs_to_export(l_obj)
#print(event.to_json()) #print(event.to_json())

View file

@ -168,7 +168,7 @@ def export_object_file():
l_obj_to_export = AILObjects.get_user_list_of_obj_to_export(user_id) l_obj_to_export = AILObjects.get_user_list_of_obj_to_export(user_id)
json_export = MispExport.create_list_of_objs_to_export(l_obj_to_export) json_export = MispExport.create_list_of_objs_to_export(l_obj_to_export)
export_filename = MispExport.get_export_filename(json_export) export_filename = MispExport.get_export_filename(json_export)
json_export = MispExport.create_in_memory_file(json_export) json_export = MispExport.create_in_memory_file(json_export.to_json())
AILObjects.delete_all_user_object_to_export(user_id) AILObjects.delete_all_user_object_to_export(user_id)
return send_file(json_export, as_attachment=True, attachment_filename=export_filename) return send_file(json_export, as_attachment=True, attachment_filename=export_filename)