Address review comments

Signed-off-by: Tushar Goel <[email protected]>

Author: TG1999

scanpipe/models.py

@@ -1950,6 +1950,8 @@ def elfs(self):
         """
         Resources that are ``files`` and their filetype startswith `elf` and
         contains any of these `executable`, `relocatable`, `shared object`.
+        Keep sync with contenttype implementation:
+        https://github.com/nexB/typecode/blob/92feb7be3a87c1b541e7034c3f9797c96bc52305/src/typecode/contenttype.py#L733
         """
         return (
             self.files()

scanpipe/pipelines/get_dwarfs_from_elfs.py

@@ -27,21 +27,21 @@
 from scanpipe.pipelines import Pipeline
 
 
-class GetDwarfsFromElfs(Pipeline):
-    """Get dwarfs from elfs."""
+class InspectElfBinaries(Pipeline):
+    """Inspect ELF binaries and collect DWARF paths."""
 
     download_inputs = False
     is_addon = True
 
     @classmethod
     def steps(cls):
-        return (cls.get_dwarfs_from_elfs,)
+        return (cls.collect_dwarf_source_path_references,)
 
-    def get_dwarfs_from_elfs(self):
+    def collect_dwarf_source_path_references(self):
         """
         Update ``extra_data`` of project with
         dwarf data extracted from elf files.
         """
         for elf in self.project.codebaseresources.elfs():
-            data = get_dwarf_paths(Path(self.project.codebase_path / elf.path))
-            self.project.update_extra_data({elf.path: data})
+            dwarf_paths = get_dwarf_paths(Path(self.project.codebase_path / elf.path))
+            elf.update_extra_data(dwarf_paths)

scanpipe/tests/test_models.py

@@ -2110,44 +2110,46 @@ def test_scanpipe_codebase_resource_queryset_has_directory_content_fingerprint(
         results = self.project1.codebaseresources.has_directory_content_fingerprint()
         self.assertQuerySetEqual(expected, results, ordered=False)
 
-    def test_scanpipe_codebase_resource_elfs(self):
+    def test_scanpipe_codebase_resource_queryset_elfs(self):
         project = Project.objects.create(name="Test")
-        CodebaseResource.objects.create(
+        resource_starting_with_elf_and_executable_in_file_type = CodebaseResource.objects.create(
             file_type="""ELF 32-bit LSB executable, ARM, version 1 (ARM), statically
              linked, with debug_info, not stripped""",
             project=project,
             path="a",
             type=CodebaseResource.Type.FILE,
         )
-        CodebaseResource.objects.create(
+        resource_with_executable_in_file_type = CodebaseResource.objects.create(
             file_type="""32-bit LSB executable, ARM, version 1 (ARM), statically
               linked, with debug_info, not stripped""",
             project=project,
             path="b",
             type=CodebaseResource.Type.FILE,
         )
-        CodebaseResource.objects.create(
+        resource_starting_with_elf_in_file_type = CodebaseResource.objects.create(
             file_type="""ELF 32-bit LSB resourcable, ARM, version 1 (ARM), statically
              linked, with debug_info, not stripped""",
             project=project,
             path="c",
             type=CodebaseResource.Type.FILE,
         )
-        CodebaseResource.objects.create(
+        resource = CodebaseResource.objects.create(
             file_type="""32-bit LSB relocatable, ARM, version 1 (ARM), statically
               linked, with debug_info, not stripped""",
             project=project,
             path="d",
             type=CodebaseResource.Type.FILE,
         )
-        CodebaseResource.objects.create(
+        resource_starting_with_elf_and_relocatable_in_file_type = CodebaseResource.objects.create(
             file_type="""ELF 32-bit LSB relocatable, ARM, version 1 (ARM), statically
               linked, with debug_info, not stripped""",
             project=project,
             path="e",
             type=CodebaseResource.Type.FILE,
         )
-        self.assertEqual(2, project.codebaseresources.elfs().count())
+        paths = [str(resource.path) for resource in project.codebaseresources.elfs()]
+        assert "e" in paths
+        assert "a" in paths
 
 
 class ScanPipeModelsTransactionTest(TransactionTestCase):

setup.cfg

@@ -127,7 +127,7 @@ scancodeio_pipelines =
     analyze_root_filesystem_or_vm_image = scanpipe.pipelines.root_filesystem:RootFS
     analyze_windows_docker_image = scanpipe.pipelines.docker_windows:DockerWindows
     find_vulnerabilities = scanpipe.pipelines.find_vulnerabilities:FindVulnerabilities
-    get_dwarfs_from_elfs = scanpipe.pipelines.get_dwarfs_from_elfs:GetDwarfsFromElfs
+    get_dwarfs_from_elfs = scanpipe.pipelines.get_dwarfs_from_elfs:InspectElfBinaries
     inspect_packages = scanpipe.pipelines.inspect_packages:InspectPackages
     load_inventory = scanpipe.pipelines.load_inventory:LoadInventory
     load_sbom = scanpipe.pipelines.load_sbom:LoadSBOM