From bcac50dd7c4ea40285ae85cd576618ded71dbad3 Mon Sep 17 00:00:00 2001 From: Terrtia Date: Tue, 8 Mar 2022 10:44:41 +0100 Subject: [PATCH] fix: [UI inestigations] add objects link --- bin/lib/objects/CryptoCurrencies.py | 1 + bin/lib/objects/Decodeds.py | 1 + bin/lib/objects/Domains.py | 1 + bin/lib/objects/Items.py | 1 + bin/lib/objects/Pgps.py | 1 + bin/lib/objects/Usernames.py | 1 + var/www/blueprints/investigations_b.py | 2 +- var/www/templates/investigations/view_investigation.html | 6 +++++- 8 files changed, 12 insertions(+), 2 deletions(-) diff --git a/bin/lib/objects/CryptoCurrencies.py b/bin/lib/objects/CryptoCurrencies.py index bcffdf11..a2cb3339 100755 --- a/bin/lib/objects/CryptoCurrencies.py +++ b/bin/lib/objects/CryptoCurrencies.py @@ -11,6 +11,7 @@ sys.path.append(os.path.join(os.environ['AIL_BIN'], 'lib/')) import ConfigLoader from abstract_object import AbstractObject +from flask import url_for config_loader = ConfigLoader.ConfigLoader() diff --git a/bin/lib/objects/Decodeds.py b/bin/lib/objects/Decodeds.py index 07ebfcd9..8f3f82f1 100755 --- a/bin/lib/objects/Decodeds.py +++ b/bin/lib/objects/Decodeds.py @@ -11,6 +11,7 @@ sys.path.append(os.path.join(os.environ['AIL_BIN'], 'lib/')) import ConfigLoader from abstract_object import AbstractObject +from flask import url_for config_loader = ConfigLoader.ConfigLoader() r_serv_metadata = config_loader.get_redis_conn("ARDB_Metadata") diff --git a/bin/lib/objects/Domains.py b/bin/lib/objects/Domains.py index bab307e0..9f82c6c8 100755 --- a/bin/lib/objects/Domains.py +++ b/bin/lib/objects/Domains.py @@ -11,6 +11,7 @@ sys.path.append(os.path.join(os.environ['AIL_BIN'], 'lib/')) import ConfigLoader from abstract_object import AbstractObject +from flask import url_for config_loader = ConfigLoader.ConfigLoader() diff --git a/bin/lib/objects/Items.py b/bin/lib/objects/Items.py index 02085c9b..3e587bfb 100755 --- a/bin/lib/objects/Items.py +++ b/bin/lib/objects/Items.py @@ -27,6 +27,7 @@ import Username from abstract_object import AbstractObject from item_basic import * +from flask import url_for config_loader = ConfigLoader.ConfigLoader() # get and sanityze PASTE DIRECTORY diff --git a/bin/lib/objects/Pgps.py b/bin/lib/objects/Pgps.py index 68ab5b6b..9c80367b 100755 --- a/bin/lib/objects/Pgps.py +++ b/bin/lib/objects/Pgps.py @@ -11,6 +11,7 @@ sys.path.append(os.path.join(os.environ['AIL_BIN'], 'lib/')) import ConfigLoader from abstract_object import AbstractObject +from flask import url_for config_loader = ConfigLoader.ConfigLoader() diff --git a/bin/lib/objects/Usernames.py b/bin/lib/objects/Usernames.py index 17edf49f..3c6c32b7 100755 --- a/bin/lib/objects/Usernames.py +++ b/bin/lib/objects/Usernames.py @@ -11,6 +11,7 @@ sys.path.append(os.path.join(os.environ['AIL_BIN'], 'lib/')) import ConfigLoader from abstract_object import AbstractObject +from flask import url_for config_loader = ConfigLoader.ConfigLoader() diff --git a/var/www/blueprints/investigations_b.py b/var/www/blueprints/investigations_b.py index eaea2c53..0f9e7723 100644 --- a/var/www/blueprints/investigations_b.py +++ b/var/www/blueprints/investigations_b.py @@ -53,7 +53,7 @@ def show_investigation(): investigation_uuid = request.args.get("uuid") investigation = Investigations.Investigation(investigation_uuid) metadata = investigation.get_metadata(r_str=True) - objs = ail_objects.get_objects_meta(investigation.get_objects(), icon=True) + objs = ail_objects.get_objects_meta(investigation.get_objects(), icon=True, url=True, flask_context=True) return render_template("view_investigation.html", bootstrap_label=bootstrap_label, metadata=metadata, investigation_objs=objs) diff --git a/var/www/templates/investigations/view_investigation.html b/var/www/templates/investigations/view_investigation.html index be6e3567..9bfe824d 100644 --- a/var/www/templates/investigations/view_investigation.html +++ b/var/www/templates/investigations/view_investigation.html @@ -138,7 +138,11 @@ {{ object['subtype']}} {% endif %} - {{ object['id']}} + + + {{ object['id']}} + + {% for tag in object['tags'] %} {{ tag }}