From ccf935700a435389d3ccfdc74606ae01963e1f1c Mon Sep 17 00:00:00 2001 From: Terrtia Date: Fri, 14 Apr 2023 10:50:58 +0200 Subject: [PATCH] fix: [objects] show/add subtype objects tags --- bin/lib/objects/ail_objects.py | 3 +- .../metadata_card_cryptocurrency.html | 24 ++++++++++++++ .../correlation/metadata_card_pgp.html | 32 +++++++++++++------ .../correlation/metadata_card_username.html | 24 ++++++++++++++ .../templates/objects/cve/CveDaterange.html | 2 +- .../objects/subtypes_objs_dashboard.html | 2 +- 6 files changed, 74 insertions(+), 13 deletions(-) diff --git a/bin/lib/objects/ail_objects.py b/bin/lib/objects/ail_objects.py index 8eaf84d8..c9e1d7bc 100755 --- a/bin/lib/objects/ail_objects.py +++ b/bin/lib/objects/ail_objects.py @@ -158,8 +158,7 @@ def get_object_card_meta(obj_type, subtype, id, related_btc=False): meta["vt"] = obj.get_meta_vt() meta["vt"]["status"] = obj.is_vt_enabled() # TAGS MODAL - if obj.get_type() == 'screenshot' or obj.get_type() == 'decoded' or obj.get_type() == 'cve': - meta["add_tags_modal"] = Tag.get_modal_add_tags(obj.id, obj.get_type(), obj.get_subtype(r_str=True)) + meta["add_tags_modal"] = Tag.get_modal_add_tags(obj.id, obj.get_type(), obj.get_subtype(r_str=True)) return meta diff --git a/var/www/templates/correlation/metadata_card_cryptocurrency.html b/var/www/templates/correlation/metadata_card_cryptocurrency.html index 7d9318e8..2698caa5 100644 --- a/var/www/templates/correlation/metadata_card_cryptocurrency.html +++ b/var/www/templates/correlation/metadata_card_cryptocurrency.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"] }} :

@@ -39,6 +48,21 @@
+
  • +
    +
    + Tags: + {% for tag in dict_object["metadata"]['tags'] %} + + {% endfor %} + +
    +
  • {% if dict_object["metadata"]["type_id"] == "bitcoin" %} {% if "related_btc" in dict_object["metadata_card"] %} diff --git a/var/www/templates/correlation/metadata_card_pgp.html b/var/www/templates/correlation/metadata_card_pgp.html index 17746183..03d73a2b 100644 --- a/var/www/templates/correlation/metadata_card_pgp.html +++ b/var/www/templates/correlation/metadata_card_pgp.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"] }} :

    @@ -39,16 +48,21 @@
    - {% if dict_object["metadata"]['tags'] %} -
  • -
    - Tags: - {% for tag in dict_object["metadata"]['tags'] %} - {{ tag }} - {% endfor %} -
    +
  • +
    +
    + Tags: + {% for tag in dict_object["metadata"]['tags'] %} + + {% endfor %} + +
  • - {% endif %} {% with obj_type='pgp', obj_id=dict_object['correlation_id'], obj_subtype=dict_object["metadata"]["type_id"] %} diff --git a/var/www/templates/correlation/metadata_card_username.html b/var/www/templates/correlation/metadata_card_username.html index 9467eee9..e1d4dbe1 100644 --- a/var/www/templates/correlation/metadata_card_username.html +++ b/var/www/templates/correlation/metadata_card_username.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"] }} :

    @@ -39,6 +48,21 @@
    +
  • +
    +
    + Tags: + {% for tag in dict_object["metadata"]['tags'] %} + + {% endfor %} + +
    +
  • {% with obj_type='username', obj_id=dict_object['correlation_id'], obj_subtype=dict_object["metadata"]["type_id"] %} diff --git a/var/www/templates/objects/cve/CveDaterange.html b/var/www/templates/objects/cve/CveDaterange.html index 1b477b0f..762fca8f 100644 --- a/var/www/templates/objects/cve/CveDaterange.html +++ b/var/www/templates/objects/cve/CveDaterange.html @@ -2,7 +2,7 @@ - Decoded - AIL + CVEs - AIL diff --git a/var/www/templates/objects/subtypes_objs_dashboard.html b/var/www/templates/objects/subtypes_objs_dashboard.html index 78eb1aad..e8cd3bc4 100644 --- a/var/www/templates/objects/subtypes_objs_dashboard.html +++ b/var/www/templates/objects/subtypes_objs_dashboard.html @@ -2,7 +2,7 @@ - Decoded - AIL + {{ obj_type }} - AIL