CIRCL
/
AIL-framework
mirror of https://github.com/CIRCL/AIL-framework
2
1
Fork 0
Code Issues Releases Wiki Activity

fix: [Correlation UI] fix decoded file type + exist_correlation_id

pull/453/head
Terrtia 2019-11-21 10:32:51 +01:00
parent 69457ca75e
commit 00c2b139c6
No known key found for this signature in database
GPG Key ID: 1E1B1F50D84613D0
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/lib/Correlate_object.py
View File

@ -54,7 +54,7 @@ def get_object_metadata(object_type, correlation_id, type_id=None):
elif object_type == 'paste': elif object_type == 'paste':
return Item.get_item({"id": correlation_id, "date": True, "tags": True})[0] return Item.get_item({"id": correlation_id, "date": True, "tags": True})[0]
elif object_type == 'decoded': elif object_type == 'decoded':
return Decoded.get_decoded_metadata(correlation_id, nb_seen=True, size=True) return Decoded.get_decoded_metadata(correlation_id, nb_seen=True, size=True, file_type=True)
elif object_type == 'pgp': elif object_type == 'pgp':
return Pgp.pgp.get_metadata(type_id, correlation_id) return Pgp.pgp.get_metadata(type_id, correlation_id)
elif object_type == 'cryptocurrency': elif object_type == 'cryptocurrency':

4
bin/lib/Decoded.py
View File

@ -42,7 +42,7 @@ def nb_decoded_item_size(sha1_string):
def exist_decoded(sha1_string): def exist_decoded(sha1_string):
return r_serv_metadata.exists('metadata_hash:{}'.format(sha1_string)) return r_serv_metadata.exists('metadata_hash:{}'.format(sha1_string))
def get_decoded_metadata(sha1_string, nb_seen=False, size=False): def get_decoded_metadata(sha1_string, nb_seen=False, size=False, file_type=False):
metadata_dict = {} metadata_dict = {}
metadata_dict['first_seen'] = r_serv_metadata.hget('metadata_hash:{}'.format(sha1_string), 'first_seen') metadata_dict['first_seen'] = r_serv_metadata.hget('metadata_hash:{}'.format(sha1_string), 'first_seen')
metadata_dict['last_seen'] = r_serv_metadata.hget('metadata_hash:{}'.format(sha1_string), 'last_seen') metadata_dict['last_seen'] = r_serv_metadata.hget('metadata_hash:{}'.format(sha1_string), 'last_seen')
@ -50,6 +50,8 @@ def get_decoded_metadata(sha1_string, nb_seen=False, size=False):
metadata_dict['nb_seen'] = nb_decoded_seen_in_item(sha1_string) metadata_dict['nb_seen'] = nb_decoded_seen_in_item(sha1_string)
if size: if size:
metadata_dict['size'] = nb_decoded_item_size(sha1_string) metadata_dict['size'] = nb_decoded_item_size(sha1_string)
if file_type:
metadata_dict['file_type'] = get_decoded_item_type(sha1_string)
return metadata_dict return metadata_dict
def get_list_nb_previous_hash(sha1_string, num_day): def get_list_nb_previous_hash(sha1_string, num_day):

2
bin/packages/Correlation.py
View File

@ -22,7 +22,7 @@ class Correlation(object):
self.all_correlation_types = all_correlation_types self.all_correlation_types = all_correlation_types
def _exist_corelation_field(self, correlation_type, field_name, item_type='paste'): def _exist_corelation_field(self, correlation_type, field_name, item_type='paste'):
if type=='paste': if item_type=='paste':
return r_serv_metadata.exists('set_{}_{}:{}'.format(self.correlation_name, correlation_type, field_name)) return r_serv_metadata.exists('set_{}_{}:{}'.format(self.correlation_name, correlation_type, field_name))
else: else:
return r_serv_metadata.exists('set_domain_{}_{}:{}'.format(self.correlation_name, correlation_type, field_name)) return r_serv_metadata.exists('set_domain_{}_{}:{}'.format(self.correlation_name, correlation_type, field_name))

2
var/www/templates/correlation/metadata_card_decoded.html
View File

@ -26,7 +26,7 @@
<text x="13" y="13" text-anchor="middle" dominant-baseline="central" class="graph_node_icon {{ dict_object["metadata_card"]["icon"]["icon_class"] }}" font-size="16px">{{ dict_object["metadata_card"]["icon"]["icon_text"] }}</text> <text x="13" y="13" text-anchor="middle" dominant-baseline="central" class="graph_node_icon {{ dict_object["metadata_card"]["icon"]["icon_class"] }}" font-size="16px">{{ dict_object["metadata_card"]["icon"]["icon_text"] }}</text>
</g> </g>
</svg> </svg>
{{ dict_object["metadata"]["type_id"] }} {{ dict_object["metadata"]["file_type"] }}
</td> </td>
<td>{{ dict_object["metadata"]['first_seen'] }}</td> <td>{{ dict_object["metadata"]['first_seen'] }}</td>
<td>{{ dict_object["metadata"]['last_seen'] }}</td> <td>{{ dict_object["metadata"]['last_seen'] }}</td>