diff --git a/bin/lib/Correlate_object.py b/bin/lib/Correlate_object.py index e39a4c73..8639aecf 100755 --- a/bin/lib/Correlate_object.py +++ b/bin/lib/Correlate_object.py @@ -24,7 +24,7 @@ r_serv_metadata = config_loader.get_redis_conn("ARDB_Metadata") config_loader = None def is_valid_object_type(object_type): - if object_type in ['domain', 'item', 'image']: + if object_type in ['domain', 'item', 'image', 'decoded']: return True else: return False @@ -60,13 +60,14 @@ def exist_object(object_type, correlation_id, type_id=None): else: return False +# request_type => api or ui def get_object_metadata(object_type, correlation_id, type_id=None): if object_type == 'domain': return Domain.Domain(correlation_id).get_domain_metadata(tags=True) elif object_type == 'paste' or object_type == 'item': return Item.get_item({"id": correlation_id, "date": True, "date_separator": True, "tags": True})[0] elif object_type == 'decoded': - return Decoded.get_decoded_metadata(correlation_id, nb_seen=True, size=True, file_type=True) + return Decoded.get_decoded_metadata(correlation_id, nb_seen=True, size=True, file_type=True, tag=True) elif object_type == 'pgp': return Pgp.pgp.get_metadata(type_id, correlation_id) elif object_type == 'cryptocurrency': diff --git a/bin/lib/Decoded.py b/bin/lib/Decoded.py index 0f5d65dc..3d3589c3 100755 --- a/bin/lib/Decoded.py +++ b/bin/lib/Decoded.py @@ -9,6 +9,7 @@ import redis sys.path.append(os.path.join(os.environ['AIL_BIN'], 'packages')) import Item import Date +import Tag import ConfigLoader @@ -42,7 +43,7 @@ def nb_decoded_item_size(sha1_string): def exist_decoded(sha1_string): return r_serv_metadata.exists('metadata_hash:{}'.format(sha1_string)) -def get_decoded_metadata(sha1_string, nb_seen=False, size=False, file_type=False): +def get_decoded_metadata(sha1_string, nb_seen=False, size=False, file_type=False, tag=False): metadata_dict = {} 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') @@ -52,8 +53,13 @@ def get_decoded_metadata(sha1_string, nb_seen=False, size=False, file_type=False metadata_dict['size'] = nb_decoded_item_size(sha1_string) if file_type: metadata_dict['file_type'] = get_decoded_item_type(sha1_string) + if tag: + metadata_dict['tags'] = get_decoded_tag(sha1_string) return metadata_dict +def get_decoded_tag(sha1_string): + return Tag.get_obj_tag(sha1_string) + def get_list_nb_previous_hash(sha1_string, num_day): nb_previous_hash = [] for date_day in Date.get_previous_date_list(num_day): diff --git a/bin/packages/Tag.py b/bin/packages/Tag.py index dba1b26e..01462426 100755 --- a/bin/packages/Tag.py +++ b/bin/packages/Tag.py @@ -355,7 +355,7 @@ def api_add_obj_tags(tags=[], galaxy_tags=[], object_id=None, object_type="item" return ({'status': 'error', 'reason': 'object_id id not found'}, 404) if not tags and not galaxy_tags: return ({'status': 'error', 'reason': 'Tags or Galaxy not specified'}, 400) - if object_type not in ('item', 'domain', 'image'): # # TODO: put me in another file + if object_type not in ('item', 'domain', 'image', 'decoded'): # # TODO: put me in another file return ({'status': 'error', 'reason': 'Incorrect object_type'}, 400) # remove empty tags diff --git a/var/www/blueprints/correlation.py b/var/www/blueprints/correlation.py index 9e23bdf5..6096bb52 100644 --- a/var/www/blueprints/correlation.py +++ b/var/www/blueprints/correlation.py @@ -113,6 +113,7 @@ def get_card_metadata(object_type, correlation_id, type_id=None, expand_card=Fal card_dict["icon"] = Correlate_object.get_correlation_node_icon(object_type, value=correlation_id) card_dict["vt"] = Decoded.get_decoded_vt_report(correlation_id) card_dict["vt"]["status"] = vt_enabled + card_dict["add_tags_modal"] = Tag.get_modal_add_tags(correlation_id, object_type='decoded') elif object_type == 'domain': card_dict["icon"] = Correlate_object.get_correlation_node_icon(object_type, value=correlation_id) card_dict["tags"] = Domain.get_domain_tags(correlation_id) diff --git a/var/www/blueprints/tags_ui.py b/var/www/blueprints/tags_ui.py index 56cd788f..45dde709 100644 --- a/var/www/blueprints/tags_ui.py +++ b/var/www/blueprints/tags_ui.py @@ -111,6 +111,14 @@ def tags_search_domains(): dict_tagged = {"object_type":object_type, "object_name":object_type.title() + "s"} return render_template("tags/search_obj_by_tags.html", bootstrap_label=bootstrap_label, dict_tagged=dict_tagged) +@tags_ui.route('/tag/search/decoded') +@login_required +@login_read_only +def tags_search_decoded(): + object_type = 'decoded' + dict_tagged = {"object_type":object_type, "object_name":object_type.title() + "s"} + return render_template("tags/search_obj_by_tags.html", bootstrap_label=bootstrap_label, dict_tagged=dict_tagged) + @tags_ui.route('/tag/search/image') @login_required @login_read_only diff --git a/var/www/templates/correlation/metadata_card_decoded.html b/var/www/templates/correlation/metadata_card_decoded.html index 3a070784..f02d422c 100644 --- a/var/www/templates/correlation/metadata_card_decoded.html +++ b/var/www/templates/correlation/metadata_card_decoded.html @@ -1,3 +1,12 @@ + + + +{% with modal_add_tags=dict_object['metadata_card']['add_tags_modal']%} + {% include 'modals/add_tags.html' %} +{% endwith %} + +{% include 'modals/edit_tag.html' %} +

{{ dict_object["correlation_id"] }} :

@@ -41,6 +50,21 @@
+
  • +
    +
    + Tags: + {% for tag in dict_object["metadata"]['tags'] %} + + {% endfor %} + +
    +
    • {% if dict_object["metadata_card"]["vt"]["status"] %} diff --git a/var/www/templates/tags/menu_sidebar.html b/var/www/templates/tags/menu_sidebar.html index c6c6a041..69811497 100644 --- a/var/www/templates/tags/menu_sidebar.html +++ b/var/www/templates/tags/menu_sidebar.html @@ -22,6 +22,12 @@ Search Domains by Tags +
  • + + + Search Decoded Items by Tags + +
  • diff --git a/var/www/templates/tags/search_obj_by_tags.html b/var/www/templates/tags/search_obj_by_tags.html index 42f14a3c..3e9400ba 100644 --- a/var/www/templates/tags/search_obj_by_tags.html +++ b/var/www/templates/tags/search_obj_by_tags.html @@ -54,6 +54,13 @@ last check Domain status + {%elif dict_tagged["object_type"]=="decoded"%} + Estimated type + Hash + First seen + Last seen + Nb seen + Size {%elif dict_tagged["object_type"]=="image"%} Image {%elif dict_tagged["object_type"]=="item"%} @@ -141,6 +148,28 @@ {% endfor %} + {%elif dict_tagged["object_type"]=="decoded"%} + {% for dict_obj in dict_tagged["tagged_obj"] %} + + {{ dict_obj['file_type'] }} + + +
    {{ dict_obj['id'] }}
    +     +
    + {% for tag in dict_obj['tags'] %} + + {{ tag }} + + {% endfor %} +
    + + {{ dict_obj['first_seen'] }} + {{ dict_obj['last_seen'] }} + {{ dict_obj['nb_seen'] }} + {{ dict_obj['size'] }} + + {% endfor %} {% endif %}