devsecops-engine-tools 1.7.14__tar.gz → 1.7.16__tar.gz

{devsecops_engine_tools-1.7.14 → devsecops_engine_tools-1.7.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devsecops-engine-tools
-Version: 1.7.14
+Version: 1.7.16
 Summary: Tool for DevSecOps strategy
 Home-page: https://github.com/bancolombia/devsecops-engine-tools
 Author: Bancolombia DevSecOps Team

{devsecops_engine_tools-1.7.14 → devsecops_engine_tools-1.7.16}/devsecops_engine_tools/engine_sca/engine_dependencies/src/domain/usecases/find_artifacts.py

@@ -15,43 +15,32 @@ class FindArtifacts:
         self,
         working_dir,
         pattern,
+        packages,
     ):
         self.working_dir = working_dir
         self.pattern = pattern
+        self.packages = packages
 
-    def find_packages(self, pattern, working_dir):
-        npm_packages = []
-        py_packages = []
-        ext_files = []
+    def find_packages(self, pattern, packages, working_dir):
+        packages_list = []
+        files_list = []
         extension_pattern = re.compile(pattern, re.IGNORECASE)
         for root, dirs, files in os.walk(working_dir):
             components = root.split(os.path.sep)
-            if not ("node_modules" in components) and not (
-                "site-packages" in components
-            ):
-                if "site-packages" in dirs:
-                    py_packages.append(os.path.join(root, "site-packages"))
-                if "node_modules" in dirs:
-                    npm_packages.append(os.path.join(root, "node_modules"))
+            flag = 0
+            for package in packages:
+                if not (package in components):
+                    flag = 1
+                    if package in dirs:
+                        packages_list.append(os.path.join(root, package))
+            if flag:
                 for file in files:
                     if extension_pattern.search(file):
-                        ext_files.append(os.path.join(root, file))
-        return npm_packages, py_packages, ext_files
-
-    def get_recent_package(self, packages):
-        recent_package = None
-        recent_time = 0
-        for path in packages:
-            created_time = os.path.getctime(path)
-            if created_time > recent_time:
-                recent_time = created_time
-                recent_package = path
-        return recent_package
+                        files_list.append(os.path.join(root, file))
+        return packages_list, files_list
 
     def compress_and_mv(self, tar_path, package):
         try:
-            if os.path.exists(tar_path):
-                os.remove(tar_path)
             with tarfile.open(tar_path, "w") as tar:
                 tar.add(
                     package,
@@ -75,21 +64,33 @@ class FindArtifacts:
             shutil.rmtree(dir_to_scan_path)
         os.makedirs(dir_to_scan_path)
 
-        npm_packages, py_packages, ext_files = self.find_packages(
-            self.pattern, self.working_dir
+        packages_list, files_list = self.find_packages(
+            self.pattern, self.packages, self.working_dir
         )
 
-        if len(npm_packages):
-            npm_recent = self.get_recent_package(npm_packages)
-            tar_path = os.path.join(dir_to_scan_path, "node_modules.tar")
-            self.compress_and_mv(tar_path, npm_recent)
+        for package in packages_list:
+            tar_path = os.path.join(
+                dir_to_scan_path,
+                "pkg"
+                + str(packages_list.index(package) + 1)
+                + "_"
+                + os.path.basename(package)
+                + ".tar",
+            )
+            self.compress_and_mv(tar_path, package)
 
-        if len(py_packages):
-            py_recent = self.get_recent_package(py_packages)
-            tar_path = os.path.join(dir_to_scan_path, "site-packages.tar")
-            self.compress_and_mv(tar_path, py_recent)
+        if len(files_list):
+            self.move_files(dir_to_scan_path, files_list)
 
-        if len(ext_files):
-            self.move_files(dir_to_scan_path, ext_files)
+        files = os.listdir(dir_to_scan_path)
+        files = [
+            file
+            for file in files
+            if os.path.isfile(os.path.join(dir_to_scan_path, file))
+        ]
+        if files:
+            files_string = ", ".join(files)
+            logger.debug(f"Files to scan: {files_string}")
+            print(f"Files to scan: {files_string}")
 
         return dir_to_scan_path

{devsecops_engine_tools-1.7.14 → devsecops_engine_tools-1.7.16}/devsecops_engine_tools/engine_sca/engine_dependencies/src/domain/usecases/handle_remote_config_patterns.py

@@ -1,5 +1,4 @@
 import re
-import os
 
 
 class HandleRemoteConfigPatterns:

{devsecops_engine_tools-1.7.14 → devsecops_engine_tools-1.7.16}/devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/entry_points/entry_point_tool.py

@@ -49,7 +49,7 @@ def init_engine_dependencies(
         bypass_limits_flag = handle_remote_config_patterns.bypass_archive_limits()
         pattern = handle_remote_config_patterns.excluded_files()
 
-        find_artifacts = FindArtifacts(os.getcwd(), pattern)
+        find_artifacts = FindArtifacts(os.getcwd(), pattern, remote_config["PACKAGES_TO_SCAN"])
         dir_to_scan_path = find_artifacts.find_artifacts()
 
         dependencies_sca_scan = DependenciesScan(

devsecops_engine_tools-1.7.16/devsecops_engine_tools/version.py

@@ -0,0 +1 @@
+version = '1.7.16'

{devsecops_engine_tools-1.7.14 → devsecops_engine_tools-1.7.16}/devsecops_engine_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devsecops-engine-tools
-Version: 1.7.14
+Version: 1.7.16
 Summary: Tool for DevSecOps strategy
 Home-page: https://github.com/bancolombia/devsecops-engine-tools
 Author: Bancolombia DevSecOps Team

devsecops_engine_tools-1.7.14/devsecops_engine_tools/version.py

@@ -1 +0,0 @@
-version = '1.7.14'