mirror of
https://github.com/ail-project/ail-framework.git
synced 2024-11-27 00:07:16 +00:00
fix: [MISP export UI] fix input: name + value overwrite
This commit is contained in:
parent
720ffa1c9c
commit
bdbbcc64c0
2 changed files with 2 additions and 8 deletions
|
@ -137,14 +137,10 @@ def export_object_file():
|
||||||
dict_misp_event_export = None
|
dict_misp_event_export = None
|
||||||
|
|
||||||
if l_obj_invalid:
|
if l_obj_invalid:
|
||||||
for obj_dict in l_obj_to_export:
|
|
||||||
obj_dict['uuid'] = str(uuid.uuid4())
|
|
||||||
obj_dict['type'] = Correlate_object.get_obj_str_type_subtype(obj_dict['type'], obj_dict.get('subtype', None))
|
|
||||||
|
|
||||||
# get user saved obj to export # # TODO: # performance
|
# get user saved obj to export # # TODO: # performance
|
||||||
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)
|
||||||
|
|
||||||
for obj_dict in l_obj_invalid:
|
for obj_dict in l_obj_invalid: # set uuid input
|
||||||
obj_dict['uuid'] = str(uuid.uuid4())
|
obj_dict['uuid'] = str(uuid.uuid4())
|
||||||
obj_dict['type'] = Correlate_object.get_obj_str_type_subtype(obj_dict['type'], obj_dict.get('subtype', None))
|
obj_dict['type'] = Correlate_object.get_obj_str_type_subtype(obj_dict['type'], obj_dict.get('subtype', None))
|
||||||
|
|
||||||
|
@ -152,7 +148,6 @@ def export_object_file():
|
||||||
l_obj_invalid=l_obj_invalid, dict_misp_event_export=dict_misp_event_export)
|
l_obj_invalid=l_obj_invalid, dict_misp_event_export=dict_misp_event_export)
|
||||||
else:
|
else:
|
||||||
if export_to_misp and MispExport.ping_misp():
|
if export_to_misp and MispExport.ping_misp():
|
||||||
l_obj_to_export = AILObjects.get_user_list_of_obj_to_export(user_id)
|
|
||||||
event = MispExport.create_list_of_objs_to_export(l_obj_to_export, r_type='event')
|
event = MispExport.create_list_of_objs_to_export(l_obj_to_export, r_type='event')
|
||||||
|
|
||||||
event_metadata = MispExport.create_misp_event(event, distribution=dict_misp_event_export.get('export_to_misp', None),
|
event_metadata = MispExport.create_misp_event(event, distribution=dict_misp_event_export.get('export_to_misp', None),
|
||||||
|
@ -167,7 +162,6 @@ def export_object_file():
|
||||||
l_obj_invalid=[], dict_misp_event_export=[])
|
l_obj_invalid=[], dict_misp_event_export=[])
|
||||||
else:
|
else:
|
||||||
# get user saved obj to export # # TODO: # performance
|
# get user saved obj to export # # TODO: # performance
|
||||||
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.to_json())
|
json_export = MispExport.create_in_memory_file(json_export.to_json())
|
||||||
|
|
|
@ -73,7 +73,7 @@
|
||||||
<span class="btn btn-info input-group-addon add-field col-1"><i class="fas fa-plus"></i></span>
|
<span class="btn btn-info input-group-addon add-field col-1"><i class="fas fa-plus"></i></span>
|
||||||
</div>
|
</div>
|
||||||
{% for obj_dict in l_obj_to_export %}
|
{% for obj_dict in l_obj_to_export %}
|
||||||
{% with obj_type=obj_dict['type'], obj_id=obj_dict['id'], obj_lvl=obj_dict['lvl'], input_uuid=obj_dict['uuid'], obj_error=False%}
|
{% with obj_type=obj_dict['type'], obj_id=obj_dict['id'], obj_lvl=obj_dict['lvl'], input_uuid=obj_dict, obj_error=False%}
|
||||||
{% include 'import_export/block_to_export_input.html' %}
|
{% include 'import_export/block_to_export_input.html' %}
|
||||||
{% endwith %}
|
{% endwith %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
Loading…
Reference in a new issue