diff --git a/bin/lib/correlations_engine.py b/bin/lib/correlations_engine.py
index 60479b1f..fe37e7fe 100755
--- a/bin/lib/correlations_engine.py
+++ b/bin/lib/correlations_engine.py
@@ -59,8 +59,8 @@ CORRELATION_TYPES_BY_OBJ = {
"pgp": ["domain", "item", "message"],
"screenshot": ["domain", "item"],
"title": ["domain", "item"],
- "user-account": ["chat", "chat-subchannel", "chat-thread", "image", "message"],
- "username": ["domain", "item", "message"], # TODO chat-user/account
+ "user-account": ["chat", "chat-subchannel", "chat-thread", "image", "message", "username"],
+ "username": ["domain", "item", "message", "user-account"],
}
def get_obj_correl_types(obj_type):
diff --git a/var/www/blueprints/correlation.py b/var/www/blueprints/correlation.py
index d5d672b1..4cf9ce53 100644
--- a/var/www/blueprints/correlation.py
+++ b/var/www/blueprints/correlation.py
@@ -121,9 +121,24 @@ def show_correlation():
correl_option = request.form.get('ItemCheck')
if correl_option:
filter_types.append('item')
- correl_option = request.form.get('TitleCheck')
+ correl_option = request.form.get('chatCheck')
if correl_option:
- filter_types.append('title')
+ filter_types.append('chat')
+ correl_option = request.form.get('subchannelCheck')
+ if correl_option:
+ filter_types.append('chat-subchannel')
+ correl_option = request.form.get('threadCheck')
+ if correl_option:
+ filter_types.append('chat-thread')
+ correl_option = request.form.get('messageCheck')
+ if correl_option:
+ filter_types.append('message')
+ correl_option = request.form.get('imageCheck')
+ if correl_option:
+ filter_types.append('image')
+ correl_option = request.form.get('user_accountCheck')
+ if correl_option:
+ filter_types.append('user-account')
# list as params
filter_types = ",".join(filter_types)
diff --git a/var/www/templates/correlation/show_correlation.html b/var/www/templates/correlation/show_correlation.html
index ebcd84e3..cda58f1c 100644
--- a/var/www/templates/correlation/show_correlation.html
+++ b/var/www/templates/correlation/show_correlation.html
@@ -248,10 +248,6 @@
-
-
-
-
@@ -261,6 +257,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{# #}
{# #}