From b552e15a8b6f4e7dc05c3c93d85c146ed6decb39 Mon Sep 17 00:00:00 2001
From: terrtia <or1994@hotmail.fr>
Date: Thu, 18 Apr 2024 15:31:34 +0200
Subject: [PATCH] fix: [correlation] fix objects selector

---
 var/www/blueprints/correlation.py             | 59 +------------
 .../correlation/show_correlation.html         | 84 ++++++++++---------
 2 files changed, 50 insertions(+), 93 deletions(-)

diff --git a/var/www/blueprints/correlation.py b/var/www/blueprints/correlation.py
index e23fbda4..983c3f66 100644
--- a/var/www/blueprints/correlation.py
+++ b/var/www/blueprints/correlation.py
@@ -87,61 +87,10 @@ def show_correlation():
 
         ## get all selected correlations
         filter_types = []
-        correl_option = request.form.get('CookieNameCheck')
-        if correl_option:
-            filter_types.append('cookie-name')
-        correl_option = request.form.get('EtagCheck')
-        if correl_option:
-            filter_types.append('etag')
-        correl_option = request.form.get('FaviconCheck')
-        if correl_option:
-            filter_types.append('favicon')
-        correl_option = request.form.get('CveCheck')
-        if correl_option:
-            filter_types.append('cve')
-        correl_option = request.form.get('CryptocurrencyCheck')
-        if correl_option:
-            filter_types.append('cryptocurrency')
-        correl_option = request.form.get('HHHashCheck')
-        if correl_option:
-            filter_types.append('hhhash')
-        correl_option = request.form.get('PgpCheck')
-        if correl_option:
-            filter_types.append('pgp')
-        correl_option = request.form.get('UsernameCheck')
-        if correl_option:
-            filter_types.append('username')
-        correl_option = request.form.get('DecodedCheck')
-        if correl_option:
-            filter_types.append('decoded')
-        correl_option = request.form.get('ScreenshotCheck')
-        if correl_option:
-            filter_types.append('screenshot')
-        # correlation_objects
-        correl_option = request.form.get('DomainCheck')
-        if correl_option:
-            filter_types.append('domain')
-        correl_option = request.form.get('ItemCheck')
-        if correl_option:
-            filter_types.append('item')
-        correl_option = request.form.get('chatCheck')
-        if correl_option:
-            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')
+        for ob_type in ail_objects.get_all_objects():
+            correl_option = request.form.get(f'{ob_type}_Check')
+            if correl_option:
+                filter_types.append(ob_type)
 
         # 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 cdd0bc64..4ca4c272 100644
--- a/var/www/templates/correlation/show_correlation.html
+++ b/var/www/templates/correlation/show_correlation.html
@@ -240,84 +240,92 @@
 
 
                                             <div class="form-check">
-                                                <input class="form-check-input" type="checkbox" value="True" id="CookieNameCheck" name="CookieNameCheck" {%if "cookie-name" in dict_object["filter"]%}checked{%endif%}>
-                                                <label class="form-check-label" for="CookieNameCheck">Cookie Name</label>
+                                                <input class="form-check-input" type="checkbox" value="True" id="cookie-name_Check" name="cookie-name_Check" {%if "cookie-name" in dict_object["filter"]%}checked{%endif%}>
+                                                <label class="form-check-label" for="cookie-name_Check">Cookie Name</label>
                                             </div>
                                             <div class="form-check">
-                                                <input class="form-check-input" type="checkbox" value="True" id="CveCheck" name="CveCheck" {%if "cve" in dict_object["filter"]%}checked{%endif%}>
-                                                <label class="form-check-label" for="CveCheck">Cve</label>
+                                                <input class="form-check-input" type="checkbox" value="True" id="cve_Check" name="cve_Check" {%if "cve" in dict_object["filter"]%}checked{%endif%}>
+                                                <label class="form-check-label" for="cve_Check">Cve</label>
                                             </div>
                                             <div class="form-check">
-                                                <input class="form-check-input" type="checkbox" value="True" id="CryptocurrencyCheck" name="CryptocurrencyCheck" {%if "cryptocurrency" in dict_object["filter"]%}checked{%endif%}>
-                                                <label class="form-check-label" for="CryptocurrencyCheck">Cryptocurrency</label>
+                                                <input class="form-check-input" type="checkbox" value="True" id="cryptocurrency_Check" name="cryptocurrency_Check" {%if "cryptocurrency" in dict_object["filter"]%}checked{%endif%}>
+                                                <label class="form-check-label" for="cryptocurrency_Check">Cryptocurrency</label>
                                             </div>
                                             <div class="form-check">
-                                                <input class="form-check-input" type="checkbox" value="True" id="DecodedCheck" name="DecodedCheck" {%if "decoded" in dict_object["filter"]%}checked{%endif%}>
-                                                <label class="form-check-label" for="DecodedCheck">Decoded</label>
+                                                <input class="form-check-input" type="checkbox" value="True" id="decoded_Check" name="decoded_Check" {%if "decoded" in dict_object["filter"]%}checked{%endif%}>
+                                                <label class="form-check-label" for="decoded_Check">Decoded</label>
                                             </div>
                                             <div class="form-check">
-                                                <input class="form-check-input" type="checkbox" value="True" id="EtagCheck" name="EtagCheck" {%if "etag" in dict_object["filter"]%}checked{%endif%}>
-                                                <label class="form-check-label" for="EtagCheck">Etag</label>
+                                                <input class="form-check-input" type="checkbox" value="True" id="etag_Check" name="EtagCheck" {%if "etag" in dict_object["filter"]%}checked{%endif%}>
+                                                <label class="form-check-label" for="etag_Check">Etag</label>
                                             </div>
                                             <div class="form-check">
-                                                <input class="form-check-input" type="checkbox" value="True" id="FaviconCheck" name="FaviconCheck" {%if "favicon" in dict_object["filter"]%}checked{%endif%}>
-                                                <label class="form-check-label" for="FaviconCheck">Favicon</label>
+                                                <input class="form-check-input" type="checkbox" value="True" id="favicon_Check" name="favicon_Check" {%if "favicon" in dict_object["filter"]%}checked{%endif%}>
+                                                <label class="form-check-label" for="favicon_Check">Favicon</label>
                                             </div>
                                             <div class="form-check">
-                                                <input class="form-check-input" type="checkbox" value="True" id="HHHashCheck" name="HHHashCheck" {%if "hhhash" in dict_object["filter"]%}checked{%endif%}>
-                                                <label class="form-check-label" for="HHHashCheck">HHHash</label>
+                                                <input class="form-check-input" type="checkbox" value="True" id="hhhash_Check" name="hhhash_Check" {%if "hhhash" in dict_object["filter"]%}checked{%endif%}>
+                                                <label class="form-check-label" for="hhhash_Check">HHHash</label>
                                             </div>
                                             <div class="form-check">
-                                                <input class="form-check-input" type="checkbox" value="True" id="ScreenshotCheck" name="ScreenshotCheck" {%if "screenshot" in dict_object["filter"]%}checked{%endif%}>
-                                                <label class="form-check-label" for="ScreenshotCheck">Screenshot</label>
+                                                <input class="form-check-input" type="checkbox" value="True" id="screenshot_Check" name="screenshot_Check" {%if "screenshot" in dict_object["filter"]%}checked{%endif%}>
+                                                <label class="form-check-label" for="screenshot_Check">Screenshot</label>
                                             </div>
                                             <div class="form-check">
-                                                <input class="form-check-input" type="checkbox" value="True" id="TitleCheck" name="TitleCheck" {%if "title" in dict_object["filter"]%}checked{%endif%}>
-                                                <label class="form-check-label" for="TitleCheck">Title</label>
+                                                <input class="form-check-input" type="checkbox" value="True" id="title_Check" name="title_Check" {%if "title" in dict_object["filter"]%}checked{%endif%}>
+                                                <label class="form-check-label" for="title_Check">Title</label>
                                             </div>
                                             <div class="form-check">
-                                                <input class="form-check-input" type="checkbox" value="True" id="PgpCheck" name="PgpCheck" {%if "pgp" in dict_object["filter"]%}checked{%endif%}>
-                                                <label class="form-check-label" for="PgpCheck">PGP</label>
+                                                <input class="form-check-input" type="checkbox" value="True" id="pgp_Check" name="pgp_Check" {%if "pgp" in dict_object["filter"]%}checked{%endif%}>
+                                                <label class="form-check-label" for="pgp_Check">PGP</label>
                                             </div>
                                             <div class="form-check">
-                                                <input class="form-check-input" type="checkbox" value="True" id="DomainCheck" name="DomainCheck" {%if "domain" in dict_object["filter"]%}checked{%endif%}>
-                                                <label class="form-check-label" for="DomainCheck">Domain</label>
+                                                <input class="form-check-input" type="checkbox" value="True" id="domain_Check" name="domain_Check" {%if "domain" in dict_object["filter"]%}checked{%endif%}>
+                                                <label class="form-check-label" for="domain_Check">Domain</label>
                                             </div>
                                             <div class="form-check">
-                                                <input class="form-check-input" type="checkbox" value="True" id="ItemCheck" name="ItemCheck" {%if "item" in dict_object["filter"]%}checked{%endif%}>
-                                                <label class="form-check-label" for="ItemCheck">Item</label>
+                                                <input class="form-check-input" type="checkbox" value="True" id="item_Check" name="item_Check" {%if "item" in dict_object["filter"]%}checked{%endif%}>
+                                                <label class="form-check-label" for="item_Check">Item</label>
                                             </div>
 
                                             <hr>
                                             <div class="form-check">
-                                                <input class="form-check-input" type="checkbox" value="True" id="chatCheck" name="chatCheck" {%if "chat" in dict_object["filter"]%}checked{%endif%}>
-                                                <label class="form-check-label" for="chatCheck">Chat</label>
+                                                <input class="form-check-input" type="checkbox" value="True" id="chat_Check" name="chat_Check" {%if "chat" in dict_object["filter"]%}checked{%endif%}>
+                                                <label class="form-check-label" for="chat_Check">Chat</label>
                                             </div>
                                             <div class="form-check">
-                                                <input class="form-check-input" type="checkbox" value="True" id="subchannelCheck" name="subchannelCheck" {%if "chat-subchannel" in dict_object["filter"]%}checked{%endif%}>
-                                                <label class="form-check-label" for="subchannelCheck">Chat-Subchannel</label>
+                                                <input class="form-check-input" type="checkbox" value="True" id="chat-subchannel_Check" name="chat-subchannel_Check" {%if "chat-subchannel" in dict_object["filter"]%}checked{%endif%}>
+                                                <label class="form-check-label" for="chat-subchannel_Check">Chat-Subchannel</label>
                                             </div>
                                             <div class="form-check">
-                                                <input class="form-check-input" type="checkbox" value="True" id="threadCheck" name="threadCheck" {%if "chat-thread" in dict_object["filter"]%}checked{%endif%}>
-                                                <label class="form-check-label" for="threadCheck">Chat-Thread</label>
+                                                <input class="form-check-input" type="checkbox" value="True" id="chat-thread_Check" name="chat-thread_Check" {%if "chat-thread" in dict_object["filter"]%}checked{%endif%}>
+                                                <label class="form-check-label" for="chat-thread_Check">Chat-Thread</label>
                                             </div>
                                             <div class="form-check">
-                                                <input class="form-check-input" type="checkbox" value="True" id="messageCheck" name="messageCheck" {%if "message" in dict_object["filter"]%}checked{%endif%}>
-                                                <label class="form-check-label" for="messageCheck">Message</label>
+                                                <input class="form-check-input" type="checkbox" value="True" id="message_Check" name="message_Check" {%if "message" in dict_object["filter"]%}checked{%endif%}>
+                                                <label class="form-check-label" for="message_Check">Message</label>
                                             </div>
                                             <div class="form-check">
-                                                <input class="form-check-input" type="checkbox" value="True" id="imageCheck" name="imageCheck" {%if "image" in dict_object["filter"]%}checked{%endif%}>
-                                                <label class="form-check-label" for="imageCheck">Image</label>
+                                                <input class="form-check-input" type="checkbox" value="True" id="file-name_Check" name="message_Check" {%if "file-name" in dict_object["filter"]%}checked{%endif%}>
+                                                <label class="form-check-label" for="file-name_Check">File Name</label>
                                             </div>
+                                            <div class="form-check">
+                                                <input class="form-check-input" type="checkbox" value="True" id="image_Check" name="image_Check" {%if "image" in dict_object["filter"]%}checked{%endif%}>
+                                                <label class="form-check-label" for="image_Check">Image</label>
+                                            </div>
+{#                                            <div class="form-check">#}
+{#                                                <input class="form-check-input" type="checkbox" value="True" id="ocr_Check" name="ocr_Check" {%if "ocr" in dict_object["filter"]%}checked{%endif%}>#}
+{#                                                <label class="form-check-label" for="ocr_Check">OCR</label>#}
+{#                                            </div>#}
 
                                             <hr>
                                             <div class="form-check">
-                                                <input class="form-check-input" type="checkbox" value="True" id="user_accountCheck" name="user_accountCheck" {%if "user-account" in dict_object["filter"]%}checked{%endif%}>
-                                                <label class="form-check-label" for="user_accountCheck">User-Account</label>
+                                                <input class="form-check-input" type="checkbox" value="True" id="user-account_Check" name="user-account_Check" {%if "user-account" in dict_object["filter"]%}checked{%endif%}>
+                                                <label class="form-check-label" for="user-account_Check">User-Account</label>
                                             </div>
                                             <div class="form-check">
-                                                <input class="form-check-input" type="checkbox" value="True" id="UsernameCheck" name="UsernameCheck" {%if "username" in dict_object["filter"]%}checked{%endif%}>
-                                                <label class="form-check-label" for="UsernameCheck">Username</label>
+                                                <input class="form-check-input" type="checkbox" value="True" id="username_Check" name="username_Check" {%if "username" in dict_object["filter"]%}checked{%endif%}>
+                                                <label class="form-check-label" for="username_Check">Username</label>
                                             </div>
 
                                     </li>