fix: [file-name] fix tracker file-name filtering + template

Author: Terrtia

bin/lib/ail_core.py

@@ -115,6 +115,9 @@ def get_obj_queued():
 def get_objects_tracked():
     return AIL_OBJS_TRACKED  # TODO add new test to check if == sorted() return True
 
+def is_tracked_object(obj_type):
+    return obj_type in AIL_OBJS_TRACKED
+
 def get_objects_retro_hunted():
     return AIL_OBJS_RETRO_HUNTED
 

bin/lib/item_basic.py

@@ -225,9 +225,8 @@ def _get_dir_source_name(directory, source_name=None, l_sources_name=set(), filt
     # empty directory
     if not l_dir:
         if source_name:
-            return l_sources_name.add(source_name)
-        else:
-            return l_sources_name
+            l_sources_name.add(source_name)
+        return l_sources_name
     else:
         for src_name in l_dir:
             if len(src_name) == 4 and source_name:

bin/modules/Global.py

@@ -37,7 +37,7 @@
 # Import Project packages
 ##################################
 from modules.abstract_module import AbstractModule
-from lib.ail_core import get_objects_tracked
+from lib.ail_core import is_tracked_object
 from lib.ConfigLoader import ConfigLoader
 from lib.data_retention_engine import update_obj_date
 from lib.objects.Items import Item
@@ -140,12 +140,14 @@ def compute(self, message, r_result=False): # TODO move OBJ ID sanitization to i
             self.add_message_to_queue(obj=self.obj, queue='Titles', message=message)
         elif self.obj.type == 'file-name':
             pass
+        elif self.obj.type == 'pdf':
+            return None
         else:
             self.logger.critical(f"Empty obj: {self.obj} {message} not processed")
             return None
 
         # Trackers
-        if self.obj.type in get_objects_tracked():
+        if is_tracked_object(self.obj.type):
             self.add_message_to_queue(obj=self.obj, queue='Trackers')
 
     def check_filename(self, filename, new_file_content):

var/www/templates/hunter/tracker_add.html

@@ -144,6 +144,10 @@ <h6>Filter PGP by subtype:</h6>
                                                         <input class="custom-control-input" type="checkbox" name="message_obj" id="message_obj" {% if not dict_tracker['filters'] or 'message' in dict_tracker['filters'] %}checked=""{% endif %}>
                                                         <label class="custom-control-label" for="message_obj"><i class="fas fa-comment-dots"></i>&nbsp;Message <i class="fas fa-info-circle text-info" data-toggle="tooltip" data-placement="right" title="Messages from Chats"></i></label>
                                                     </div>
+                                                    <div class="custom-control custom-switch mt-1">
+                                                        <input class="custom-control-input" type="checkbox" name="file-name_obj" id="file-name_obj" {% if not dict_tracker['filters'] or 'file-name' in dict_tracker['filters'] %}checked=""{% endif %}>
+                                                        <label class="custom-control-label" for="file-name_obj"><i class="far fa-file"></i>&nbsp;File Name <i class="fas fa-info-circle text-info" data-toggle="tooltip" data-placement="right" title="File name of Files from chats/messages"></i></label>
+                                                    </div>
                                                     <div class="custom-control custom-switch mt-1">
                                                         <input class="custom-control-input" type="checkbox" name="qrcode_obj" id="qrcode_obj" {% if not dict_tracker['filters'] or 'qrcode' in dict_tracker['filters'] %}checked=""{% endif %}>
                                                         <label class="custom-control-label" for="qrcode_obj"><i class="fas fa-qrcode"></i>&nbsp;Qrcode <i class="fas fa-info-circle text-info" data-toggle="tooltip" data-placement="right" title="Qcodes Extracted from Images and Screenshots"></i></label>

var/www/templates/hunter/tracker_show.html

@@ -273,6 +273,10 @@ <h5>Filter Objects:</h5>
                                             <input class="custom-control-input" type="checkbox" name="item_obj" id="item_obj" {% if 'item' in filter_obj_types or filter_obj_types|length == 0 %}checked=""{% endif %}>
                                                 <label class="custom-control-label" for="item_obj"><i class="fas fa-file"></i>&nbsp;Item <i class="fas fa-info-circle text-info" data-toggle="tooltip" data-placement="right" title="Text that has been processed by AIL. It can include various types of extracted information"></i></label>
                                         </div>
+                                        <div class="custom-control custom-switch mt-1">
+                                            <input class="custom-control-input" type="checkbox" name="file-name_obj" id="file-name_obj" {% if 'file-name' in filter_obj_types or filter_obj_types|length == 0 %}checked=""{% endif %}>
+                                                <label class="custom-control-label" for="file-name_obj"><i class="far fa-file"></i>&nbsp;File Name <i class="fas fa-info-circle text-info" data-toggle="tooltip" data-placement="right" title="File Name of file from chats/messages"></i></label>
+                                        </div>
                                         <div class="custom-control custom-switch mt-1">
                                             <input class="custom-control-input" type="checkbox" name="pgp_obj" id="pgp_obj" {% if 'pgp' in filter_obj_types or filter_obj_types|length == 0 %}checked=""{% endif %}>
                                             <label class="custom-control-label" for="pgp_obj"><i class="fas fa-key"></i>&nbsp;PGP <i class="fas fa-info-circle text-info" data-toggle="tooltip" data-placement="right" title="PGP key/block metadata"></i></label>