INTEGRITY: Avoid detection file overriding on a match, when a similar file exist in a different directory. Add it as a normal non detection file.

Author: ShivangNagta

db_functions.py

@@ -1644,18 +1644,23 @@ def set_populate_file(fileset, fileset_id, conn, detection):
             for target_file in target_files
         }
 
+        seen_detection_files = set()
+
         for file in fileset["rom"]:
             if "md5" not in file:
                 continue
             checksize, checktype, checksum = get_checksum_props("md5", file["md5"])
 
             filename = os.path.basename(normalised_path(file["name"]))
 
-            if filename.lower() not in candidate_files or (
-                filename.lower() in candidate_files
-                and (
-                    candidate_files[filename.lower()][1] != -1
-                    and candidate_files[filename.lower()][1] != file["size"]
+            if ((filename.lower(), file["size"]) in seen_detection_files) or (
+                filename.lower() not in candidate_files
+                or (
+                    filename.lower() in candidate_files
+                    and (
+                        candidate_files[filename.lower()][1] != -1
+                        and candidate_files[filename.lower()][1] != file["size"]
+                    )
                 )
             ):
                 name = normalised_path(file["name"])
@@ -1707,6 +1712,7 @@ def set_populate_file(fileset, fileset_id, conn, detection):
                         checksum,
                     ),
                 )
+                seen_detection_files.add((filename.lower(), file["size"]))
 
 
 def insert_new_fileset(