diff --git a/bin/lib/objects/ail_objects.py b/bin/lib/objects/ail_objects.py index 14a035a4..bd4e7668 100755 --- a/bin/lib/objects/ail_objects.py +++ b/bin/lib/objects/ail_objects.py @@ -254,7 +254,7 @@ def get_objects_meta(objs, options=set(), flask_context=False): def get_object_card_meta(obj_type, subtype, id, related_btc=False): obj = get_object(obj_type, subtype, id) - meta = obj.get_meta(options={'icon', 'info', 'nb_participants'}) + meta = obj.get_meta(options={'created_at', 'icon', 'info', 'nb_messages', 'nb_participants'}) # meta['icon'] = obj.get_svg_icon() meta['svg_icon'] = obj.get_svg_icon() if subtype or obj_type == 'cookie-name' or obj_type == 'cve' or obj_type == 'etag' or obj_type == 'title' or obj_type == 'favicon' or obj_type == 'hhhash': diff --git a/var/www/blueprints/chats_explorer.py b/var/www/blueprints/chats_explorer.py index 3363a29b..5c543665 100644 --- a/var/www/blueprints/chats_explorer.py +++ b/var/www/blueprints/chats_explorer.py @@ -139,7 +139,9 @@ def objects_subchannel_messages(): else: subchannel = subchannel[0] languages = Language.get_translation_languages() - return render_template('SubChannelMessages.html', subchannel=subchannel, bootstrap_label=bootstrap_label, translation_languages=languages, translation_target=target) + return render_template('SubChannelMessages.html', subchannel=subchannel, + ail_tags=Tag.get_modal_add_tags(subchannel['id'], subchannel['type'], subchannel['subtype']), + bootstrap_label=bootstrap_label, translation_languages=languages, translation_target=target) @chats_explorer.route("/chats/explorer/thread", methods=['GET']) @login_required diff --git a/var/www/templates/chats_explorer/SubChannelMessages.html b/var/www/templates/chats_explorer/SubChannelMessages.html index 17390a0c..e4c36d6a 100644 --- a/var/www/templates/chats_explorer/SubChannelMessages.html +++ b/var/www/templates/chats_explorer/SubChannelMessages.html @@ -53,93 +53,9 @@
-
-
-

{% if subchannel['chat']['name'] %}{{ subchannel['chat']['name'] }} {% else %} {{ subchannel['chat']['id'] }}{% endif %} - {% if subchannel['username'] %}{{ subchannel["username"]["id"] }} {% else %} {{ subchannel['name'] }}{% endif %} :

{{ subchannel["id"] }} -
    -
  • -
    -
    - - - - - - - - - - - - - - - - - - - - - - - -
    NameCreated atFirst seenLast seenUsernameNb MessagesParticipants
    - {{ subchannel['name'] }} - {% if subchannel['translation_name'] %} -
    {{ subchannel['translation_name'] }}
    - {% endif %} -     		{{ subchannel["created_at"] }} - {% if subchannel['first_seen'] %} - {{ subchannel['first_seen'][0:4] }}-{{ subchannel['first_seen'][4:6] }}-{{ subchannel['first_seen'][6:8] }} - {% endif %} - - {% if subchannel['last_seen'] %} - {{ subchannel['last_seen'][0:4] }}-{{ subchannel['last_seen'][4:6] }}-{{ subchannel['last_seen'][6:8] }} - {% endif %} - - {% if 'username' in subchannel %} - {% if subchannel['username'] %} - {{ subchannel['username']['id'] }} - {% endif %} - {% endif %} - {{ subchannel['nb_messages'] }} - {{ subchannel['nb_participants']}} -
    -
    -
    -
    • - {% if subchannel['info'] %} -
  • - 
    {{ subchannel['info'] }}
    -
    • - {% endif %} -
  • -
    -
    - Tags: - {% for tag in subchannel['tags'] %} - - {% endfor %} - -
    -
    • -
- -{# {% with obj_type='chat', obj_id=subchannel['id'], obj_subtype=subchannel['subtype'] %}#} -{# {% include 'modals/investigations_register_obj.html' %}#} -{# {% endwith %}#} -{# #} - -
-
- + {% with meta=subchannel %} + {% include 'chats_explorer/card_chat_subchannel.html' %} + {% endwith %} {% if subchannel['threads'] %} diff --git a/var/www/templates/chats_explorer/card_chat.html b/var/www/templates/chats_explorer/card_chat.html index 982297b9..99a0ce38 100644 --- a/var/www/templates/chats_explorer/card_chat.html +++ b/var/www/templates/chats_explorer/card_chat.html @@ -84,5 +84,19 @@ Investigations + + {% if is_correlation %} + + + + {% else %} + + + + {% endif %} + + \ No newline at end of file diff --git a/var/www/templates/chats_explorer/card_chat_subchannel.html b/var/www/templates/chats_explorer/card_chat_subchannel.html new file mode 100644 index 00000000..3fd9a33e --- /dev/null +++ b/var/www/templates/chats_explorer/card_chat_subchannel.html @@ -0,0 +1,103 @@ + + + +{% with modal_add_tags=ail_tags %} + {% include 'modals/add_tags.html' %} +{% endwith %} + +{% include 'modals/edit_tag.html' %} + + +
+
+

{% if meta['chat']['name'] %}{{ meta['chat']['name'] }} {% else %} {{ meta['chat']['id'] }}{% endif %} - {% if meta['username'] %}{{ meta["username"]["id"] }} {% else %} {{ meta['name'] }}{% endif %} :

{{ meta["id"] }} +
    +
  • +
    +
    +
+ + + + + + + + + + + + + + + + + + + + +
NameCreated atFirst seenLast seenNb MessagesParticipants
+ {{ meta['name'] }} + {% if meta['translation_name'] %} +
{{ meta['translation_name'] }}
+ {% endif %} + 		{{ meta["created_at"] }} + {% if meta['first_seen'] %} + {{ meta['first_seen'][0:4] }}-{{ meta['first_seen'][4:6] }}-{{ meta['first_seen'][6:8] }} + {% endif %} + + {% if meta['last_seen'] %} + {{ meta['last_seen'][0:4] }}-{{ meta['last_seen'][4:6] }}-{{ meta['last_seen'][6:8] }} + {% endif %} + {{ meta['nb_messages'] }} + {{ meta['nb_participants']}} +
+
+ + + {% if meta['info'] %} +
  • + 
    {{ meta['info'] }}
    +
    • + {% endif %} + +
  • +
    + Tags: + {% for tag in meta['tags'] %} + + {% endfor %} + +
    +
    • + + + {% with obj_type=meta['type'], obj_id=meta['id'], obj_subtype=meta['subtype'] %} + {% include 'modals/investigations_register_obj.html' %} + {% endwith %} + + + + {% if is_correlation %} + + + + {% else %} + + + + {% endif %} + + + + \ No newline at end of file diff --git a/var/www/templates/chats_explorer/card_image.html b/var/www/templates/chats_explorer/card_image.html index 9e382aea..e97cea81 100644 --- a/var/www/templates/chats_explorer/card_image.html +++ b/var/www/templates/chats_explorer/card_image.html @@ -33,7 +33,7 @@ - {{ meta["icon"]["icon"] }} + {{ meta["svg_icon"]["icon"] }} {{ meta['type'] }} diff --git a/var/www/templates/correlation/metadata_card_chat.html b/var/www/templates/correlation/metadata_card_chat.html deleted file mode 100644 index 4e672e1a..00000000 --- a/var/www/templates/correlation/metadata_card_chat.html +++ /dev/null @@ -1,78 +0,0 @@ - - - -{#{% 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"] }}

    - {{ dict_object }} -
    {{ dict_object["correlation_id"] }}
    - - - {% with obj_type='cookie-name', obj_id=dict_object['correlation_id'], obj_subtype='' %} - {% include 'modals/investigations_register_obj.html' %} - {% endwith %} - - -
    -
    - diff --git a/var/www/templates/correlation/metadata_card_cookie_name.html b/var/www/templates/correlation/metadata_card_cookie_name.html index 5a926182..514c8485 100644 --- a/var/www/templates/correlation/metadata_card_cookie_name.html +++ b/var/www/templates/correlation/metadata_card_cookie_name.html @@ -30,7 +30,7 @@ - {{ dict_object["metadata_card"]["icon"]["icon"] }} + {{ dict_object["metadata_card"]["svg_icon"]["icon"] }} {{ dict_object["object_type"] }} diff --git a/var/www/templates/correlation/metadata_card_cryptocurrency.html b/var/www/templates/correlation/metadata_card_cryptocurrency.html index 2698caa5..30321b67 100644 --- a/var/www/templates/correlation/metadata_card_cryptocurrency.html +++ b/var/www/templates/correlation/metadata_card_cryptocurrency.html @@ -31,7 +31,7 @@ - {{ dict_object["metadata_card"]["icon"]["icon"] }} + {{ dict_object["metadata_card"]["svg_icon"]["icon"] }} {{ dict_object["metadata"]["type_id"] }} diff --git a/var/www/templates/correlation/metadata_card_cve.html b/var/www/templates/correlation/metadata_card_cve.html index 1e166ddc..2a4141c9 100644 --- a/var/www/templates/correlation/metadata_card_cve.html +++ b/var/www/templates/correlation/metadata_card_cve.html @@ -30,7 +30,7 @@ - {{ dict_object["metadata_card"]["icon"]["icon"] }} + {{ dict_object["metadata_card"]["svg_icon"]["icon"] }} diff --git a/var/www/templates/correlation/metadata_card_decoded.html b/var/www/templates/correlation/metadata_card_decoded.html index 1e292a80..25d9e499 100644 --- a/var/www/templates/correlation/metadata_card_decoded.html +++ b/var/www/templates/correlation/metadata_card_decoded.html @@ -32,7 +32,7 @@ - {{ dict_object["metadata_card"]["icon"]["icon"] }} + {{ dict_object["metadata_card"]["svg_icon"]["icon"] }} {{ dict_object["metadata_card"]["mimetype"] }} diff --git a/var/www/templates/correlation/metadata_card_domain.html b/var/www/templates/correlation/metadata_card_domain.html index 0e538916..ffa09537 100644 --- a/var/www/templates/correlation/metadata_card_domain.html +++ b/var/www/templates/correlation/metadata_card_domain.html @@ -21,7 +21,7 @@ - {{ dict_object["metadata_card"]["icon"]["icon"] }} + {{ dict_object["metadata_card"]["svg_icon"]["icon"] }} {{ dict_object["metadata"]["type_id"] }} diff --git a/var/www/templates/correlation/metadata_card_etag.html b/var/www/templates/correlation/metadata_card_etag.html index cc599227..1ce11821 100644 --- a/var/www/templates/correlation/metadata_card_etag.html +++ b/var/www/templates/correlation/metadata_card_etag.html @@ -30,7 +30,7 @@ - {{ dict_object["metadata_card"]["icon"]["icon"] }} + {{ dict_object["metadata_card"]["svg_icon"]["icon"] }} {{ dict_object["object_type"] }} diff --git a/var/www/templates/correlation/metadata_card_favicon.html b/var/www/templates/correlation/metadata_card_favicon.html index 6b12ab3b..496cbb77 100644 --- a/var/www/templates/correlation/metadata_card_favicon.html +++ b/var/www/templates/correlation/metadata_card_favicon.html @@ -29,7 +29,7 @@ - {{ dict_object["metadata_card"]["icon"]["icon"] }} + {{ dict_object["metadata_card"]["svg_icon"]["icon"] }} {{ dict_object["object_type"] }} diff --git a/var/www/templates/correlation/metadata_card_hhhash.html b/var/www/templates/correlation/metadata_card_hhhash.html index c1474605..5b37ced3 100644 --- a/var/www/templates/correlation/metadata_card_hhhash.html +++ b/var/www/templates/correlation/metadata_card_hhhash.html @@ -30,7 +30,7 @@ - {{ dict_object["metadata_card"]["icon"]["icon"] }} + {{ dict_object["metadata_card"]["svg_icon"]["icon"] }} {{ dict_object["object_type"] }} diff --git a/var/www/templates/correlation/metadata_card_item.html b/var/www/templates/correlation/metadata_card_item.html index 194ec200..cf5395d1 100644 --- a/var/www/templates/correlation/metadata_card_item.html +++ b/var/www/templates/correlation/metadata_card_item.html @@ -18,7 +18,7 @@ - {{ dict_object["metadata_card"]["icon"]["icon_text"] }} + {{ dict_object["metadata_card"]["svg_icon"]["icon"] }} {{ dict_object["metadata"]["type_id"] }} diff --git a/var/www/templates/correlation/metadata_card_pgp.html b/var/www/templates/correlation/metadata_card_pgp.html index 03d73a2b..bb870dcd 100644 --- a/var/www/templates/correlation/metadata_card_pgp.html +++ b/var/www/templates/correlation/metadata_card_pgp.html @@ -31,7 +31,7 @@ - {{ dict_object["metadata_card"]["icon"]["icon"] }} + {{ dict_object["metadata_card"]["svg_icon"]["icon"] }} {{ dict_object["metadata"]["type_id"] }} diff --git a/var/www/templates/correlation/metadata_card_title.html b/var/www/templates/correlation/metadata_card_title.html index cd943349..7b1140f0 100644 --- a/var/www/templates/correlation/metadata_card_title.html +++ b/var/www/templates/correlation/metadata_card_title.html @@ -30,7 +30,7 @@ - {{ dict_object["metadata_card"]["icon"]["icon"] }} + {{ dict_object["metadata_card"]["svg_icon"]["icon"] }} {{ dict_object["object_type"] }} diff --git a/var/www/templates/correlation/metadata_card_username.html b/var/www/templates/correlation/metadata_card_username.html index e1d4dbe1..c1e45cd6 100644 --- a/var/www/templates/correlation/metadata_card_username.html +++ b/var/www/templates/correlation/metadata_card_username.html @@ -31,7 +31,7 @@ - {{ dict_object["metadata_card"]["icon"]["icon"] }} + {{ dict_object["metadata_card"]["svg_icon"]["icon"] }} {{ dict_object["metadata"]["type_id"] }} diff --git a/var/www/templates/correlation/show_correlation.html b/var/www/templates/correlation/show_correlation.html index 67d71a5d..4a023967 100644 --- a/var/www/templates/correlation/show_correlation.html +++ b/var/www/templates/correlation/show_correlation.html @@ -99,10 +99,13 @@
    + {% set is_correlation = True %} {% if dict_object["object_type"] == "pgp" %} {% include 'correlation/metadata_card_pgp.html' %} {% elif dict_object["object_type"] == "chat" %} {% include 'chats_explorer/card_chat.html' %} + {% elif dict_object["object_type"] == "chat-subchannel" %} + {% include 'chats_explorer/card_chat_subchannel.html' %} {% elif dict_object["object_type"] == "cryptocurrency" %} {% include 'correlation/metadata_card_cryptocurrency.html' %} {% elif dict_object["object_type"] == "username" %} diff --git a/var/www/templates/correlation/show_relationship.html b/var/www/templates/correlation/show_relationship.html index bff41724..9ad5cc8b 100644 --- a/var/www/templates/correlation/show_relationship.html +++ b/var/www/templates/correlation/show_relationship.html @@ -108,7 +108,7 @@ {% elif dict_object["object_type"] == "decoded" %} {% include 'correlation/metadata_card_decoded.html' %} {% elif dict_object["object_type"] == "chat" %} - {% include 'correlation/metadata_card_chat.html' %} + {% include 'chats_explorer/card_chat.html' %} {% elif dict_object["object_type"] == "cve" %} {% include 'correlation/metadata_card_cve.html' %} {% elif dict_object["object_type"] == "domain" %}