Add tests

Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>

Author: TG1999

scanpipe/filters.py

@@ -411,7 +411,7 @@ def filter(self, qs, value):
     ("sha1", "sha1"),
     ("dwarf_included_paths", "dwarf_included_paths"),
     ("dwarf_compiled_paths", "dwarf_compiled_paths"),
-    ("file_paths", "file_paths"),
+    ("go_file_paths", "go_file_paths"),
 )
 
 

scanpipe/models.py

@@ -2017,7 +2017,7 @@ def win_exes(self):
         """
         return self.files().filter(
             Q(file_type__icontains="for ms windows")
-            | Q(filetype_file__istartswith="pe32")
+            | Q(file_type__istartswith="pe32")
         )
 
     def mach_os(self):
@@ -2027,8 +2027,8 @@ def mach_os(self):
         Keep sync with the content type implementation at ``typecode.contenttype``.
         """
         return self.files().filter(
-            models.Q(filetype__icontains="mach-o")
-            | models.Q(mimetype__icontains="application/x-mach-binary")
+            models.Q(file_type__icontains="mach-o")
+            | models.Q(mime_type__icontains="application/x-mach-binary")
         )
 
     def executable_binaries(self):

scanpipe/pipes/d2d.py

@@ -1741,9 +1741,9 @@ def _map_paths_resource(
 
 def map_paths(project, file_type, collect_paths_func, map_types, logger=None):
     """Map paths using similarities of path suffixes."""
-    project_files = getattr(project.codebaseresources, file_type)()
-    from_resources = project_files.from_codebase()
-    to_resources = project_files.to_codebase().has_no_relation()
+    from_resources = project.codebaseresources.files().from_codebase()
+    to_resources = project.codebaseresources.files().to_codebase().has_no_relation()
+    to_resources = getattr(to_resources, file_type)()
     for resource in to_resources:
         paths = collect_paths_func(resource.location_path)
         resource.update_extra_data(paths)
@@ -1776,20 +1776,34 @@ def map_paths(project, file_type, collect_paths_func, map_types, logger=None):
 
 def map_elfs(project, logger=None):
     map_paths(
-        project,
-        "elfs",
-        get_dwarf_paths,
-        ["dwarf_compiled_paths", "dwarf_included_paths"],
-        logger,
+        project=project,
+        file_type="elfs",
+        collect_paths_func=get_elf_file_dwarf_paths,
+        map_types=["dwarf_compiled_paths", "dwarf_included_paths"],
+        logger=logger,
     )
 
 
+def get_elf_file_dwarf_paths(location):
+    paths = get_dwarf_paths(location)
+    return {
+        "dwarf_compiled_paths": paths.get("compiled_paths") or [],
+        "dwarf_included_paths": paths.get("included_paths") or [],
+    }
+
+
 def get_go_file_paths(location):
     go_symbols = (
         collect_and_parse_symbols(location, check_type=False).get("go_symbols") or {}
     )
-    return {"file_paths": go_symbols.get("file_paths") or []}
+    return {"go_file_paths": go_symbols.get("file_paths") or []}
 
 
 def map_go_paths(project, logger=None):
-    map_paths(project, "executable_binaries", get_go_file_paths, ["file_paths"], logger)
+    map_paths(
+        project=project,
+        file_type="executable_binaries",
+        collect_paths_func=get_go_file_paths,
+        map_types=["go_file_paths"],
+        logger=logger,
+    )

scanpipe/tests/data/d2d-elfs/from-data.zip

@@ -29,6 +29,7 @@
 from django.test import TestCase
 
 from scanpipe import pipes
+from scanpipe.models import CodebaseRelation
 from scanpipe.models import CodebaseResource
 from scanpipe.models import Project
 from scanpipe.pipes import d2d
@@ -1461,3 +1462,63 @@ def test_scanpipe_pipes_d2d_match_purldb_resources_post_process(self):
 
         self.assertEqual(2, package1_resource_count)
         self.assertEqual(0, package2_resource_count)
+
+    def test_scanpipe_pipes_d2d_map_elfs(self):
+        input_dir = self.project1.input_path
+        input_resources = [
+            self.data_location / "d2d-elfs/to-data.zip",
+            self.data_location / "d2d-elfs/from-data.zip",
+        ]
+        copy_inputs(input_resources, input_dir)
+        self.from_files, self.to_files = d2d.get_inputs(self.project1)
+        inputs_with_codebase_path_destination = [
+            (self.from_files, self.project1.codebase_path / d2d.FROM),
+            (self.to_files, self.project1.codebase_path / d2d.TO),
+        ]
+        for input_files, codebase_path in inputs_with_codebase_path_destination:
+            for input_file_path in input_files:
+                scancode.extract_archive(input_file_path, codebase_path)
+
+        scancode.extract_archives(
+            self.project1.codebase_path,
+            recurse=True,
+        )
+        pipes.collect_and_create_codebase_resources(self.project1)
+        print(self.project1.codebaseresources.files().from_codebase())
+        d2d.map_elfs(project=self.project1, logger=None)
+        assert (
+            CodebaseRelation.objects.filter(
+                project=self.project1, map_type="dwarf_included_paths"
+            ).count()
+            == 1
+        )
+    
+    def test_scanpipe_pipes_d2d_map_go_paths(self):
+        input_dir = self.project1.input_path
+        input_resources = [
+            self.data_location / "d2d-go/to-data.zip",
+            self.data_location / "d2d-go/from-data.zip",
+        ]
+        copy_inputs(input_resources, input_dir)
+        self.from_files, self.to_files = d2d.get_inputs(self.project1)
+        inputs_with_codebase_path_destination = [
+            (self.from_files, self.project1.codebase_path / d2d.FROM),
+            (self.to_files, self.project1.codebase_path / d2d.TO),
+        ]
+        for input_files, codebase_path in inputs_with_codebase_path_destination:
+            for input_file_path in input_files:
+                scancode.extract_archive(input_file_path, codebase_path)
+
+        scancode.extract_archives(
+            self.project1.codebase_path,
+            recurse=True,
+        )
+        pipes.collect_and_create_codebase_resources(self.project1)
+
+        d2d.map_go_paths(project=self.project1, logger=None)
+        assert (
+            CodebaseRelation.objects.filter(
+                project=self.project1, map_type="go_file_paths"
+            ).count()
+            == 1
+        )