devsecops-engine-tools 1.7.40__tar.gz → 1.8.0__tar.gz

{devsecops_engine_tools-1.7.40 → devsecops_engine_tools-1.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devsecops-engine-tools
-Version: 1.7.40
+Version: 1.8.0
 Summary: Tool for DevSecOps strategy
 Home-page: https://github.com/bancolombia/devsecops-engine-tools
 Author: Bancolombia DevSecOps Team
@@ -65,7 +65,7 @@ pip3 install devsecops-engine-tools
 ### Scan running - flags (CLI)
 
 ```bash
-devsecops-engine-tools --platform_devops ["local","azure","github"] --remote_config_repo ["remote_config_repo"] --tool ["engine_iac", "engine_dast", "engine_secret", "engine_dependencies", "engine_container"] --folder_path ["Folder path scan engine_iac"] --platform ["k8s","cloudformation","docker", "openapi"] --use_secrets_manager ["false", "true"] --use_vulnerability_management ["false", "true"] --send_metrics ["false", "true"] --token_cmdb ["token_cmdb"] --token_vulnerability_management ["token_vulnerability_management"] --token_engine_container ["token_engine_container"] --token_engine_dependencies ["token_engine_dependencies"] --xray_mode ["scan", "audit"]
+devsecops-engine-tools --platform_devops ["local","azure","github"] --remote_config_repo ["remote_config_repo"] --tool ["engine_iac", "engine_dast", "engine_secret", "engine_dependencies", "engine_container"] --folder_path ["Folder path scan engine_iac"] --platform ["k8s","cloudformation","docker", "openapi"] --use_secrets_manager ["false", "true"] --use_vulnerability_management ["false", "true"] --send_metrics ["false", "true"] --token_cmdb ["token_cmdb"] --token_vulnerability_management ["token_vulnerability_management"] --token_engine_container ["token_engine_container"] --token_engine_dependencies ["token_engine_dependencies"] --xray_mode ["scan", "audit"] --image_to_scan ["image_to_scan"]
 ```
 
 ### Structure Remote Config

{devsecops_engine_tools-1.7.40 → devsecops_engine_tools-1.8.0}/devsecops_engine_tools/engine_core/src/applications/runner_engine_core.py

@@ -152,6 +152,11 @@ def get_inputs_from_cli(args):
         default="scan",
         help="Mode to execute xray, only apply engine_dependencies xray tool",
     )
+    parser.add_argument(
+        "--image_to_scan",
+        required=False,
+        help="Name of image to scan for engine_container",
+    )
     args = parser.parse_args()
     return {
         "platform_devops": args.platform_devops,
@@ -168,6 +173,7 @@ def get_inputs_from_cli(args):
         "token_engine_dependencies": args.token_engine_dependencies,
         "token_external_checks": args.token_external_checks,
         "xray_mode": args.xray_mode,
+        "image_to_scan": args.image_to_scan
     }
 
 

{devsecops_engine_tools-1.7.40 → devsecops_engine_tools-1.8.0}/devsecops_engine_tools/engine_sca/engine_container/src/domain/model/gateways/images_gateway.py

@@ -3,5 +3,5 @@ from abc import ABCMeta, abstractmethod
 
 class ImagesGateway(metaclass=ABCMeta):
     @abstractmethod
-    def list_images(self) -> str:
-        "list images"
+    def list_images(self, image_to_scan) -> str:
+        "get image to scan"

{devsecops_engine_tools-1.7.40 → devsecops_engine_tools-1.8.0}/devsecops_engine_tools/engine_sca/engine_container/src/domain/usecases/container_sca_scan.py

@@ -20,6 +20,7 @@ class ContainerScaScan:
         tool_deseralizator: DeseralizatorGateway,
         build_id,
         token,
+        image_to_scan,
     ):
         self.tool_run = tool_run
         self.remote_config = remote_config
@@ -27,15 +28,16 @@ class ContainerScaScan:
         self.tool_deseralizator = tool_deseralizator
         self.build_id = build_id
         self.token = token
+        self.image_to_scan = image_to_scan
 
-    def get_latest_image(self):
+    def get_image(self, image_to_scan):
         """
         Process the list of images.
 
         Returns:
             list: List of processed images.
         """
-        return self.tool_images.list_images()
+        return self.tool_images.list_images(image_to_scan)
 
     def get_images_already_scanned(self):
         """
@@ -62,11 +64,11 @@ class ContainerScaScan:
         Returns:
             string: file scanning results name.
         """
-        latest_image = self.get_latest_image()
-        image_name = latest_image.tags[0]
+        matching_image = self.get_image(self.image_to_scan)
         image_scanned = None
-        if str(self.build_id) in image_name:
-            result_file = image_name + "_scan_result.json"
+        if matching_image:
+            image_name = matching_image.tags[0]
+            result_file = image_name.replace("/","_") + "_scan_result.json"
             if result_file in self.get_images_already_scanned():
                 print(f"The image {image_name} has already been scanned previously.")
                 return image_scanned
@@ -75,9 +77,7 @@ class ContainerScaScan:
             )
             self.set_image_scanned(result_file)
         else:
-            print(
-                f"'{image_name}' name does not contain build number '{self.build_id}'. Tool skipped."
-            )
+            print(f"'Not image found for {self.image_to_scan}'. Tool skipped.")
         return image_scanned
 
     def deseralizator(self, image_scanned):

{devsecops_engine_tools-1.7.40 → devsecops_engine_tools-1.8.0}/devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/docker/docker_images.py

@@ -10,18 +10,23 @@ logger = MyLogger.__call__(**settings.SETTING_LOGGER).get_logger()
 
 
 class DockerImages(ImagesGateway):
-    def list_images(self):
+    def list_images(self, image_to_scan):
         try:
             client = docker.from_env()
             images = client.images.list()
-            images_sorted = sorted(
-                images, key=lambda x: x.attrs["Created"], reverse=True
-            )
-            latest_image = images_sorted[0]
-            print("ID last image:", latest_image.id)
-            print("Tag last image:", latest_image.tags)
-            print("Created date last image:", latest_image.attrs["Created"])
-            return latest_image
+
+            matching_image = None
+            for image in images:
+                if image_to_scan in image.tags:
+                    matching_image = image
+                    break
+
+            if matching_image:
+                print("ID matching image:", matching_image.id)
+                print("Tag matching image:", matching_image.tags)
+                print("Created date matching image:", matching_image.attrs["Created"])
+                return matching_image
+
         except Exception as e:
             logger.error(
                 f"Error listing images, docker must be running and added to PATH: {e}"

{devsecops_engine_tools-1.7.40 → devsecops_engine_tools-1.8.0}/devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/prisma_cloud/prisma_deserialize_output.py

@@ -49,7 +49,9 @@ class PrismaDeserealizator(DeseralizatorGateway):
                     identification_date=datetime.strptime(
                         vul.get("discoveredDate", ""), "%Y-%m-%dT%H:%M:%S%z"
                     ),
-                    published_date_cve=vul.get("publishedDate", "").replace("Z", "+00:00"),
+                    published_date_cve=vul.get("publishedDate", "").replace(
+                        "Z", "+00:00"
+                    ),
                     module="engine_container",
                     category=Category.VULNERABILITY,
                     requirements=vul.get("status", ""),

{devsecops_engine_tools-1.7.40 → devsecops_engine_tools-1.8.0}/devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/entry_points/entry_point_tool.py

@@ -36,6 +36,7 @@ def init_engine_sca_rm(
     scan_flag = handle_remote_config_patterns.ignore_analysis_pattern()
     build_id = tool_remote.get_variable("build_id")
     stage = tool_remote.get_variable("stage")
+    image_to_scan = dict_args["image_to_scan"]
     image_scanned = None
     deseralized = []
     input_core = SetInputCore(remote_config, exclusions, pipeline_name, tool, stage)
@@ -47,6 +48,7 @@ def init_engine_sca_rm(
             tool_deseralizator,
             build_id,
             token,
+            image_to_scan,
         )
         image_scanned = container_sca_scan.process()
         if image_scanned:

devsecops_engine_tools-1.8.0/devsecops_engine_tools/version.py

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

{devsecops_engine_tools-1.7.40 → devsecops_engine_tools-1.8.0}/devsecops_engine_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devsecops-engine-tools
-Version: 1.7.40
+Version: 1.8.0
 Summary: Tool for DevSecOps strategy
 Home-page: https://github.com/bancolombia/devsecops-engine-tools
 Author: Bancolombia DevSecOps Team
@@ -65,7 +65,7 @@ pip3 install devsecops-engine-tools
 ### Scan running - flags (CLI)
 
 ```bash
-devsecops-engine-tools --platform_devops ["local","azure","github"] --remote_config_repo ["remote_config_repo"] --tool ["engine_iac", "engine_dast", "engine_secret", "engine_dependencies", "engine_container"] --folder_path ["Folder path scan engine_iac"] --platform ["k8s","cloudformation","docker", "openapi"] --use_secrets_manager ["false", "true"] --use_vulnerability_management ["false", "true"] --send_metrics ["false", "true"] --token_cmdb ["token_cmdb"] --token_vulnerability_management ["token_vulnerability_management"] --token_engine_container ["token_engine_container"] --token_engine_dependencies ["token_engine_dependencies"] --xray_mode ["scan", "audit"]
+devsecops-engine-tools --platform_devops ["local","azure","github"] --remote_config_repo ["remote_config_repo"] --tool ["engine_iac", "engine_dast", "engine_secret", "engine_dependencies", "engine_container"] --folder_path ["Folder path scan engine_iac"] --platform ["k8s","cloudformation","docker", "openapi"] --use_secrets_manager ["false", "true"] --use_vulnerability_management ["false", "true"] --send_metrics ["false", "true"] --token_cmdb ["token_cmdb"] --token_vulnerability_management ["token_vulnerability_management"] --token_engine_container ["token_engine_container"] --token_engine_dependencies ["token_engine_dependencies"] --xray_mode ["scan", "audit"] --image_to_scan ["image_to_scan"]
 ```
 
 ### Structure Remote Config

devsecops_engine_tools-1.7.40/devsecops_engine_tools/version.py

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