devsecops-engine-tools 1.7.19__py3-none-any.whl → 1.7.21__py3-none-any.whl

devsecops_engine_tools/engine_core/src/applications/runner_engine_core.py

@@ -89,7 +89,7 @@ def get_inputs_from_cli(args):
     parser.add_argument("--token_cmdb", required=False, help="Token to connect to the CMDB")
     parser.add_argument("--token_vulnerability_management", required=False, help="Token to connect to the Vulnerability Management")
     parser.add_argument("--token_engine_container", required=False, help="Token to execute engine_container if is necessary")
-    parser.add_argument("--token_engine_dependencies", required=False, help="Token to execute engine_dependencies if is necessary")
+    parser.add_argument("--token_engine_dependencies", required=False, help="Token to execute engine_dependencies if is necessary. If using xray as engine_dependencies tool, the token is the base64 of artifactory server config.")
     args = parser.parse_args()
     return {
         "platform_devops": args.platform_devops,

devsecops_engine_tools/engine_sast/engine_secret/src/infrastructure/driven_adapters/git_cli/git_run.py

@@ -46,11 +46,11 @@ class GitRun(GitGateway):
             os.chdir(path_new_folder)
             
             repository = git.Repo(path_new_folder)
+
             source_branch = source_branch.replace("refs/heads/", "")
-            repository.git.checkout(source_branch)
-            repository.git.pull('-X', 'theirs', '--no-edit', 'origin', target_branch)
+            subprocess.run(["git", "checkout", f"origin/{source_branch}"], capture_output=True, text=True)
             if source_branch != None:
-                diff = repository.git.diff(f"{source_branch}..{target_branch}", name_only=True)
+                diff = repository.git.diff(f"origin/{source_branch}..origin/{target_branch}", name_only=True)
                 if diff:
                     diff_files = diff.strip().split("\n")
                 print("Pull Requests Associated Files:",len(diff_files))

devsecops_engine_tools/engine_sca/engine_dependencies/src/domain/model/gateways/tool_gateway.py

@@ -4,6 +4,6 @@ from abc import ABCMeta, abstractmethod
 class ToolGateway(metaclass=ABCMeta):
     @abstractmethod
     def run_tool_dependencies_sca(
-        self, remote_config, dir_to_scan_path, bypass_limits_flag, token
+        self, remote_config, file_to_scan, bypass_limits_flag, token
     ) -> str:
         "run tool dependencies sca"

devsecops_engine_tools/engine_sca/engine_dependencies/src/domain/usecases/dependencies_sca_scan.py

@@ -12,14 +12,14 @@ class DependenciesScan:
         tool_run: ToolGateway,
         tool_deserializator: DeserializatorGateway,
         remote_config,
-        dir_to_scan_path,
+        file_to_scan,
         bypass_limits_flag,
         token,
     ):
         self.tool_run = tool_run
         self.tool_deserializator = tool_deserializator
         self.remote_config = remote_config
-        self.dir_to_scan_path = dir_to_scan_path
+        self.file_to_scan = file_to_scan
         self.bypass_limits_flag = bypass_limits_flag
         self.token = token
 
@@ -31,7 +31,7 @@ class DependenciesScan:
         """
         return self.tool_run.run_tool_dependencies_sca(
             self.remote_config,
-            self.dir_to_scan_path,
+            self.file_to_scan,
             self.bypass_limits_flag,
             self.token,
         )

devsecops_engine_tools/engine_sca/engine_dependencies/src/domain/usecases/find_artifacts.py

@@ -47,7 +47,6 @@ class FindArtifacts:
                     arcname=os.path.basename(package),
                     filter=lambda x: None if "/.bin/" in x.name else x,
                 )
-                logger.debug(f"File to scan: {tar_path}")
 
         except subprocess.CalledProcessError as e:
             logger.error(f"Error during {package} compression: {e}")
@@ -88,9 +87,14 @@ class FindArtifacts:
             for file in files
             if os.path.isfile(os.path.join(dir_to_scan_path, file))
         ]
+        file_to_scan = None
         if files:
+            file_to_scan = os.path.join(dir_to_scan_path, "file_to_scan.tar")
+            self.compress_and_mv(file_to_scan, dir_to_scan_path)
             files_string = ", ".join(files)
             logger.debug(f"Files to scan: {files_string}")
             print(f"Files to scan: {files_string}")
+        else:
+            logger.warning("No artifacts found")
 
-        return dir_to_scan_path
+        return file_to_scan

devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/driven_adapters/xray_tool/xray_manager_scan.py

@@ -95,7 +95,7 @@ class XrayScan(ToolGateway):
         except subprocess.CalledProcessError as error:
             logger.error(f"Error during Xray Server configuration: {error}")
 
-    def scan_dependencies(self, prefix, target_dir_name, bypass_limits_flag):
+    def scan_dependencies(self, prefix, file_to_scan, bypass_limits_flag):
         try:
             if bypass_limits_flag:
                 command = [
@@ -103,15 +103,15 @@ class XrayScan(ToolGateway):
                     "scan",
                     "--format=json",
                     "--bypass-archive-limits",
-                    f"{target_dir_name}/",
+                    f"{file_to_scan}",
                 ]
             else:
-                command = [prefix, "scan", "--format=json", f"{target_dir_name}/"]
+                command = [prefix, "scan", "--format=json", f"{file_to_scan}"]
             result = subprocess.run(
                 command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True
             )
             scan_result = json.loads(result.stdout)
-            file_result = os.path.join(target_dir_name, "scan_result.json")
+            file_result = os.path.join(os.getcwd(), "scan_result.json")
             with open(file_result, "w") as file:
                 json.dump(scan_result, file, indent=4)
             return file_result
@@ -121,7 +121,7 @@ class XrayScan(ToolGateway):
     def run_tool_dependencies_sca(
         self,
         remote_config,
-        dir_to_scan_path,
+        file_to_scan,
         bypass_limits_flag,
         token,
     ):
@@ -143,12 +143,8 @@ class XrayScan(ToolGateway):
 
         self.config_server(command_prefix, token)
 
-        results_file = None
-        if len(os.listdir(dir_to_scan_path)) == 0:
-            logger.warning("No artifacts found")
-        else:
-            results_file = self.scan_dependencies(
-                command_prefix, dir_to_scan_path, bypass_limits_flag
-            )
+        results_file = self.scan_dependencies(
+            command_prefix, file_to_scan, bypass_limits_flag
+        )
 
         return results_file

devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/entry_points/entry_point_tool.py

@@ -49,19 +49,20 @@ 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, remote_config["PACKAGES_TO_SCAN"])
-        dir_to_scan_path = find_artifacts.find_artifacts()
-
-        dependencies_sca_scan = DependenciesScan(
-            tool_run,
-            tool_deserializator,
-            remote_config,
-            dir_to_scan_path,
-            bypass_limits_flag,
-            token,
+        find_artifacts = FindArtifacts(
+            os.getcwd(), pattern, remote_config["PACKAGES_TO_SCAN"]
         )
-        dependencies_scanned = dependencies_sca_scan.process()
-        if dependencies_scanned:
+        file_to_scan = find_artifacts.find_artifacts()
+        if file_to_scan:
+            dependencies_sca_scan = DependenciesScan(
+                tool_run,
+                tool_deserializator,
+                remote_config,
+                file_to_scan,
+                bypass_limits_flag,
+                token,
+            )
+            dependencies_scanned = dependencies_sca_scan.process()
             deserialized = dependencies_sca_scan.deserializator(dependencies_scanned)
     else:
         print(f"Tool skipped by DevSecOps policy")

devsecops_engine_tools/version.py

@@ -1 +1 @@
-version = '1.7.19'
+version = '1.7.21'

{devsecops_engine_tools-1.7.19.dist-info → devsecops_engine_tools-1.7.21.dist-info}/METADATA

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

{devsecops_engine_tools-1.7.19.dist-info → devsecops_engine_tools-1.7.21.dist-info}/RECORD

@@ -1,9 +1,9 @@
 devsecops_engine_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-devsecops_engine_tools/version.py,sha256=00_H-4k28gxQ568B_BJmashakAo4hiRIakxTpvUO-J0,19
+devsecops_engine_tools/version.py,sha256=OswmJbbdP6j-8j-P6qOqozXr7DTBdHZC5V7RnSqE-YQ,19
 devsecops_engine_tools/engine_core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_core/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_core/src/applications/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-devsecops_engine_tools/engine_core/src/applications/runner_engine_core.py,sha256=17BPgOOIu21bsIsu319Q-7HUMYXjMUtxVf17tPA8BOU,5650
+devsecops_engine_tools/engine_core/src/applications/runner_engine_core.py,sha256=CbLdGjyZkgpSYPe-7Q3Xus83BHq5wWwwMaFB29VaILA,5748
 devsecops_engine_tools/engine_core/src/deployment/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_core/src/deployment/infrastructure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_core/src/domain/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -118,7 +118,7 @@ devsecops_engine_tools/engine_sast/engine_secret/src/domain/usecases/set_input_c
 devsecops_engine_tools/engine_sast/engine_secret/src/infrastructure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_sast/engine_secret/src/infrastructure/driven_adapters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_sast/engine_secret/src/infrastructure/driven_adapters/git_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-devsecops_engine_tools/engine_sast/engine_secret/src/infrastructure/driven_adapters/git_cli/git_run.py,sha256=eMHZn72BdpEqYF_r-hyKkdDNaRkDjRYJ5Pn5YD-HCG0,2657
+devsecops_engine_tools/engine_sast/engine_secret/src/infrastructure/driven_adapters/git_cli/git_run.py,sha256=xKIUAnNK4u0pTHgo5tFrzmnquBegBQgN2-3jU6V6vxQ,2642
 devsecops_engine_tools/engine_sast/engine_secret/src/infrastructure/driven_adapters/trufflehog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_sast/engine_secret/src/infrastructure/driven_adapters/trufflehog/trufflehog_deserealizator.py,sha256=HZcNUa9VvK1InsDY94HiuDQuEH_R6pJIeAN3Zwi8CBA,1825
 devsecops_engine_tools/engine_sast/engine_secret/src/infrastructure/driven_adapters/trufflehog/trufflehog_run.py,sha256=cvCSKTDN-4oL9H5EZF_-WrP5bNamFt0WfeCwaMO_Nfo,5345
@@ -164,19 +164,19 @@ devsecops_engine_tools/engine_sca/engine_dependencies/src/domain/__init__.py,sha
 devsecops_engine_tools/engine_sca/engine_dependencies/src/domain/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_sca/engine_dependencies/src/domain/model/gateways/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_sca/engine_dependencies/src/domain/model/gateways/deserializator_gateway.py,sha256=WOJbKbeFIbQ0IR6lic2JheTPUJPPzAYsGykU1DiMmHw,286
-devsecops_engine_tools/engine_sca/engine_dependencies/src/domain/model/gateways/tool_gateway.py,sha256=ceRndnbWphvYxqt2EzqDkEw7NEgBXAmf0FMohA7_i1o,258
+devsecops_engine_tools/engine_sca/engine_dependencies/src/domain/model/gateways/tool_gateway.py,sha256=h84C_RWeSBPaeExEJbyz6aFv8q_W3PSMLH9DY1yJHyY,254
 devsecops_engine_tools/engine_sca/engine_dependencies/src/domain/usecases/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-devsecops_engine_tools/engine_sca/engine_dependencies/src/domain/usecases/dependencies_sca_scan.py,sha256=YqgfoS5uXpZ8l30TI_UsmgusONNNvVbgpPnFKajmU38,1349
-devsecops_engine_tools/engine_sca/engine_dependencies/src/domain/usecases/find_artifacts.py,sha256=XSxkwK88lfksBYuWrWGkQuUzJhlX3lo0XoLI7a07dRM,3192
+devsecops_engine_tools/engine_sca/engine_dependencies/src/domain/usecases/dependencies_sca_scan.py,sha256=a-TDJG5PvdlfAMN7IdwyDPRKicqIDp2m0SsXQpKKYR0,1333
+devsecops_engine_tools/engine_sca/engine_dependencies/src/domain/usecases/find_artifacts.py,sha256=t6PjrwE94nG1CQfZdqwYmZLBgi1NxlB2GxyHXXKBPvQ,3364
 devsecops_engine_tools/engine_sca/engine_dependencies/src/domain/usecases/handle_remote_config_patterns.py,sha256=ct_TinG3-UnHmG0Ic2fgPAc6mvWjiyq1bxU7RqFIZXA,2203
 devsecops_engine_tools/engine_sca/engine_dependencies/src/domain/usecases/set_input_core.py,sha256=ZMr9l1h9-JdoT7QlLN8K9VTP2VP0B_5TZGMUQ6KyIYo,2525
 devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/driven_adapters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/driven_adapters/xray_tool/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/driven_adapters/xray_tool/xray_deserialize_output.py,sha256=Vm0pj1i6a34xXouXUU95Y04hzR--9tcMQuycR7IMUnQ,2221
-devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/driven_adapters/xray_tool/xray_manager_scan.py,sha256=mlGtHeZza3b4n0OeOcHLOALQHKU-C63wtHXSxfMRA_A,5780
+devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/driven_adapters/xray_tool/xray_manager_scan.py,sha256=fvlT7yP9ALA7hR1NTlDQpjygJbmTzRGdJx5Pbp1cySc,5603
 devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/entry_points/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/entry_points/entry_point_tool.py,sha256=gsVZpEVUPvDWS4mrzsD-t1vCkasiOfJf88Z0DWQc9-4,2650
+devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/entry_points/entry_point_tool.py,sha256=GWFwZQsNx_4U8AlZIyXWmyWtM7MzyF5EQLLcJTPg9pk,2691
 devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_utilities/settings.py,sha256=CPnDndwVeRgQNml3HVzvytVruDd8dTd1ICHbkMDSgTM,2144
@@ -241,8 +241,8 @@ devsecops_engine_tools/engine_utilities/utils/logger_info.py,sha256=4Mz8Bwlm9Mku
 devsecops_engine_tools/engine_utilities/utils/name_conversion.py,sha256=ADJrRGaxYSDe0ZRh6VHRf53H4sXPcb-vNP_i81PUn3I,307
 devsecops_engine_tools/engine_utilities/utils/printers.py,sha256=GAslbWaBpwP3mP6fBsgVl07TTBgcCggQTy8h2M9ibeo,612
 devsecops_engine_tools/engine_utilities/utils/session_manager.py,sha256=yNtlT-8Legz1sHbGPH8LNYjL-LgDUE0zXG2rYjiab7U,290
-devsecops_engine_tools-1.7.19.dist-info/METADATA,sha256=7jgfyzd2K7hcX0z6d3DYSJ-dVTVKOqQwe6c_OQGdbqs,4840
-devsecops_engine_tools-1.7.19.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-devsecops_engine_tools-1.7.19.dist-info/entry_points.txt,sha256=9IjXF_7Zpgowq_SY6OSmsA9vZze18a8_AeHwkQVrgKk,131
-devsecops_engine_tools-1.7.19.dist-info/top_level.txt,sha256=ge6y0X_xBAU1aG3EMWFtl9djbVyg5BxuSp2r2Lg6EQU,23
-devsecops_engine_tools-1.7.19.dist-info/RECORD,,
+devsecops_engine_tools-1.7.21.dist-info/METADATA,sha256=OFB3Zu1FeDt3y40b88HAY4wCs5isbf8WKfYsBV8QWs8,4840
+devsecops_engine_tools-1.7.21.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+devsecops_engine_tools-1.7.21.dist-info/entry_points.txt,sha256=9IjXF_7Zpgowq_SY6OSmsA9vZze18a8_AeHwkQVrgKk,131
+devsecops_engine_tools-1.7.21.dist-info/top_level.txt,sha256=ge6y0X_xBAU1aG3EMWFtl9djbVyg5BxuSp2r2Lg6EQU,23
+devsecops_engine_tools-1.7.21.dist-info/RECORD,,