update(compliance): ENS RD2022 Spanish security framework updates (#1809)

Co-authored-by: Sergio Garcia <sergargar1@gmail.com>

prowler/lib/check/compliance_models.py

@@ -11,10 +11,10 @@ from prowler.lib.logger import logger
 class ENS_Requirements_Nivel(str, Enum):
     """ENS V3 Requirements Level"""
 
+    opcional = "opcional"
     bajo = "bajo"
     medio = "medio"
     alto = "alto"
-    pytec = "pytec"
 
 
 class ENS_Requirements_Dimensiones(str, Enum):
@@ -106,7 +106,7 @@ class Compliance_Base_Model(BaseModel):
     """Compliance_Base_Model holds the base model for every compliance framework"""
 
     Framework: str
-    Provider: Optional[str]
+    Provider: str
     Version: str
     Description: str
     Requirements: list[Compliance_Requirement]

prowler/lib/outputs/compliance.py

@@ -4,7 +4,7 @@ from csv import DictWriter
 from colorama import Fore, Style
 from tabulate import tabulate
 
-from prowler.config.config import timestamp
+from prowler.config.config import timestamp, orange_color
 from prowler.lib.logger import logger
 from prowler.lib.outputs.models import (
     Check_Output_CSV_CIS,
@@ -158,10 +158,10 @@ def display_compliance_table(
                 "Proveedor": [],
                 "Marco/Categoria": [],
                 "Estado": [],
-                "PYTEC": [],
                 "Alto": [],
                 "Medio": [],
                 "Bajo": [],
+                "Opcional": [],
             }
             pass_count = fail_count = 0
             for finding in findings:
@@ -185,7 +185,7 @@ def display_compliance_table(
                                 if marco_categoria not in marcos:
                                     marcos[marco_categoria] = {
                                         "Estado": f"{Fore.GREEN}CUMPLE{Style.RESET_ALL}",
-                                        "Pytec": 0,
+                                        "Opcional": 0,
                                         "Alto": 0,
                                         "Medio": 0,
                                         "Bajo": 0,
@@ -197,8 +197,8 @@ def display_compliance_table(
                                     ] = f"{Fore.RED}NO CUMPLE{Style.RESET_ALL}"
                                 elif finding.status == "PASS":
                                     pass_count += 1
-                                if attribute.Nivel == "pytec":
-                                    marcos[marco_categoria]["Pytec"] += 1
+                                if attribute.Nivel == "opcional":
+                                    marcos[marco_categoria]["Opcional"] += 1
                                 elif attribute.Nivel == "alto":
                                     marcos[marco_categoria]["Alto"] += 1
                                 elif attribute.Nivel == "medio":
@@ -211,17 +211,17 @@ def display_compliance_table(
                 ens_compliance_table["Proveedor"].append("aws")
                 ens_compliance_table["Marco/Categoria"].append(marco)
                 ens_compliance_table["Estado"].append(marcos[marco]["Estado"])
-                ens_compliance_table["PYTEC"].append(
-                    f"{Fore.LIGHTRED_EX}{marcos[marco]['Pytec']}{Style.RESET_ALL}"
+                ens_compliance_table["Opcional"].append(
+                    f"{Fore.BLUE}{marcos[marco]['Opcional']}{Style.RESET_ALL}"
                 )
                 ens_compliance_table["Alto"].append(
-                    f"{Fore.RED}{marcos[marco]['Alto']}{Style.RESET_ALL}"
+                    f"{Fore.LIGHTRED_EX}{marcos[marco]['Alto']}{Style.RESET_ALL}"
                 )
                 ens_compliance_table["Medio"].append(
-                    f"{Fore.YELLOW}{marcos[marco]['Medio']}{Style.RESET_ALL}"
+                    f"{orange_color}{marcos[marco]['Medio']}{Style.RESET_ALL}"
                 )
                 ens_compliance_table["Bajo"].append(
-                    f"{Fore.BLUE}{marcos[marco]['Bajo']}{Style.RESET_ALL}"
+                    f"{Fore.YELLOW}{marcos[marco]['Bajo']}{Style.RESET_ALL}"
                 )
             if fail_count + pass_count < 0:
                 print(

util/generate_compliance_json_from_csv_for_ens.py

@@ -15,9 +15,11 @@ with open(file_name, newline="", encoding="utf-8") as f:
     reader = csv.reader(f, delimiter=",")
     for row in reader:
         niveles = list(map(str.strip, row[5].split(",")))
-        if "pytec" in niveles:
-            nivelvalue = "pytec"
-        elif "alto" in niveles:
+        # Use of pytec/CPSTIC levels is under clarification, disabling temporarily
+        # if "pytec" in niveles:
+        #     nivelvalue = "pytec"
+        # el
+        if "alto" in niveles:
             nivelvalue = "alto"
         elif "medio" in niveles:
             nivelvalue = "medio"
@@ -27,12 +29,14 @@ with open(file_name, newline="", encoding="utf-8") as f:
             nivelvalue = "bajo"
 
         attribute = {
+            "IdGrupoControl": row[10],
             "Marco": row[2],
             "Categoria": row[3],
             "DescripcionControl": row[4],
             "Nivel": nivelvalue,
             "Tipo": row[9],
             "Dimensiones": list(map(str.strip, row[6].split(","))),
+            "ModoEjecucion": row[11],
         }
         output["Requirements"].append(
             {