prowler-cloud 5.12.3__py3-none-any.whl → 5.13.0__py3-none-any.whl

prowler/lib/outputs/compliance/cis/models.py

@@ -35,6 +35,8 @@ class AWSCISModel(BaseModel):
     ResourceName: str
     CheckId: str
     Muted: bool
+    Framework: str
+    Name: str
 
 
 class AzureCISModel(BaseModel):
@@ -67,6 +69,8 @@ class AzureCISModel(BaseModel):
     ResourceName: str
     CheckId: str
     Muted: bool
+    Framework: str
+    Name: str
 
 
 class M365CISModel(BaseModel):
@@ -99,6 +103,8 @@ class M365CISModel(BaseModel):
     ResourceName: str
     CheckId: str
     Muted: bool
+    Framework: str
+    Name: str
 
 
 class GCPCISModel(BaseModel):
@@ -130,6 +136,8 @@ class GCPCISModel(BaseModel):
     ResourceName: str
     CheckId: str
     Muted: bool
+    Framework: str
+    Name: str
 
 
 class KubernetesCISModel(BaseModel):
@@ -162,6 +170,8 @@ class KubernetesCISModel(BaseModel):
     ResourceName: str
     CheckId: str
     Muted: bool
+    Framework: str
+    Name: str
 
 
 class GithubCISModel(BaseModel):
@@ -193,6 +203,52 @@ class GithubCISModel(BaseModel):
     ResourceName: str
     CheckId: str
     Muted: bool
+    Framework: str
+    Name: str
+
+
+class OCICISModel(BaseModel):
+    """
+    OCICISModel generates a finding's output in OCI CIS Compliance format.
+    """
+
+    Provider: str
+    Description: str
+    TenancyId: str
+    Region: str
+    AssessmentDate: str
+    Requirements_Id: str
+    Requirements_Description: str
+    Requirements_Attributes_Section: str
+    Requirements_Attributes_SubSection: Optional[str] = None
+    Requirements_Attributes_Profile: str
+    Requirements_Attributes_AssessmentStatus: str
+    Requirements_Attributes_Description: str
+    Requirements_Attributes_RationaleStatement: str
+    Requirements_Attributes_ImpactStatement: str
+    Requirements_Attributes_RemediationProcedure: str
+    Requirements_Attributes_AuditProcedure: str
+    Requirements_Attributes_AdditionalInformation: str
+    Requirements_Attributes_DefaultValue: Optional[str] = None
+    Requirements_Attributes_References: str
+    Status: str
+    StatusExtended: str
+    ResourceId: str
+    ResourceName: str
+    CheckId: str
+    Muted: bool
+    Framework: str
+    Name: str
+
+
+# Compliance models alias for backwards compatibility
+CIS_AWS = AWSCISModel
+CIS_Azure = AzureCISModel
+CIS_GCP = GCPCISModel
+CIS_Kubernetes = KubernetesCISModel
+CIS_M365 = M365CISModel
+CIS_Github = GithubCISModel
+CIS_OCI = OCICISModel
 
 
 # TODO: Create a parent class for the common fields of CIS and have the specific classes from each provider to inherit from it.

prowler/lib/outputs/compliance/compliance.py

@@ -2,6 +2,7 @@ import sys
 
 from prowler.lib.check.models import Check_Report
 from prowler.lib.logger import logger
+from prowler.lib.outputs.compliance.c5.c5 import get_c5_table
 from prowler.lib.outputs.compliance.cis.cis import get_cis_table
 from prowler.lib.outputs.compliance.ens.ens import get_ens_table
 from prowler.lib.outputs.compliance.generic.generic_table import (
@@ -84,6 +85,15 @@ def display_compliance_table(
                 output_directory,
                 compliance_overview,
             )
+        elif "c5_" in compliance_framework:
+            get_c5_table(
+                findings,
+                bulk_checks_metadata,
+                compliance_framework,
+                output_filename,
+                output_directory,
+                compliance_overview,
+            )
         else:
             get_generic_compliance_table(
                 findings,

prowler/lib/outputs/compliance/compliance_output.py

@@ -42,7 +42,10 @@ class ComplianceOutput(Output):
         self._from_cli = from_cli
 
         if not file_extension and file_path:
-            self._file_extension = "".join(Path(file_path).suffixes)
+            # Compliance reports are always CSV, so just use the last suffix
+            # e.g., "cis_5.0_aws.csv" should have extension ".csv", not ".0_aws.csv"
+            path_obj = Path(file_path)
+            self._file_extension = path_obj.suffix if path_obj.suffix else ""
         if file_extension:
             self._file_extension = file_extension
             self.file_path = f"{file_path}{self.file_extension}"

prowler/lib/outputs/compliance/ens/ens_aws.py

@@ -67,6 +67,8 @@ class AWSENS(ComplianceOutput):
                             ResourceName=finding.resource_name,
                             CheckId=finding.check_id,
                             Muted=finding.muted,
+                            Framework=compliance.Framework,
+                            Name=compliance.Name,
                         )
                         self._data.append(compliance_row)
         # Add manual requirements to the compliance output
@@ -100,5 +102,7 @@ class AWSENS(ComplianceOutput):
                         ResourceName="Manual check",
                         CheckId="manual",
                         Muted=False,
+                        Framework=compliance.Framework,
+                        Name=compliance.Name,
                     )
                     self._data.append(compliance_row)

prowler/lib/outputs/compliance/ens/ens_azure.py

@@ -67,6 +67,8 @@ class AzureENS(ComplianceOutput):
                             ResourceName=finding.resource_name,
                             CheckId=finding.check_id,
                             Muted=finding.muted,
+                            Framework=compliance.Framework,
+                            Name=compliance.Name,
                         )
                         self._data.append(compliance_row)
         # Add manual requirements to the compliance output
@@ -100,5 +102,7 @@ class AzureENS(ComplianceOutput):
                         ResourceName="Manual check",
                         CheckId="manual",
                         Muted=False,
+                        Framework=compliance.Framework,
+                        Name=compliance.Name,
                     )
                     self._data.append(compliance_row)

prowler/lib/outputs/compliance/ens/ens_gcp.py

@@ -67,6 +67,8 @@ class GCPENS(ComplianceOutput):
                             ResourceName=finding.resource_name,
                             CheckId=finding.check_id,
                             Muted=finding.muted,
+                            Framework=compliance.Framework,
+                            Name=compliance.Name,
                         )
                         self._data.append(compliance_row)
         # Add manual requirements to the compliance output
@@ -100,5 +102,7 @@ class GCPENS(ComplianceOutput):
                         ResourceName="Manual check",
                         CheckId="manual",
                         Muted=False,
+                        Framework=compliance.Framework,
+                        Name=compliance.Name,
                     )
                     self._data.append(compliance_row)

prowler/lib/outputs/compliance/ens/models.py

@@ -28,6 +28,8 @@ class AWSENSModel(BaseModel):
     CheckId: str
     Muted: bool
     ResourceName: str
+    Framework: str
+    Name: str
 
 
 class AzureENSModel(BaseModel):
@@ -57,6 +59,8 @@ class AzureENSModel(BaseModel):
     CheckId: str
     Muted: bool
     ResourceName: str
+    Framework: str
+    Name: str
 
 
 class GCPENSModel(BaseModel):
@@ -86,3 +90,5 @@ class GCPENSModel(BaseModel):
     CheckId: str
     Muted: bool
     ResourceName: str
+    Framework: str
+    Name: str

prowler/lib/outputs/compliance/generic/generic.py

@@ -59,6 +59,8 @@ class GenericCompliance(ComplianceOutput):
                             ResourceName=finding.resource_name,
                             CheckId=finding.check_id,
                             Muted=finding.muted,
+                            Framework=compliance.Framework,
+                            Name=compliance.Name,
                         )
                         self._data.append(compliance_row)
         # Add manual requirements to the compliance output
@@ -84,5 +86,7 @@ class GenericCompliance(ComplianceOutput):
                         ResourceName="Manual check",
                         CheckId="manual",
                         Muted=False,
+                        Framework=compliance.Framework,
+                        Name=compliance.Name,
                     )
                     self._data.append(compliance_row)

prowler/lib/outputs/compliance/generic/models.py

@@ -26,3 +26,5 @@ class GenericComplianceModel(BaseModel):
     CheckId: str
     Muted: bool
     ResourceName: str
+    Framework: str
+    Name: str

prowler/lib/outputs/compliance/iso27001/iso27001_aws.py

@@ -59,6 +59,8 @@ class AWSISO27001(ComplianceOutput):
                             CheckId=finding.check_id,
                             Muted=finding.muted,
                             ResourceName=finding.resource_name,
+                            Framework=compliance.Framework,
+                            Name=compliance.Name,
                         )
                         self._data.append(compliance_row)
         # Add manual requirements to the compliance output
@@ -84,5 +86,7 @@ class AWSISO27001(ComplianceOutput):
                         ResourceName="Manual check",
                         CheckId="manual",
                         Muted=False,
+                        Framework=compliance.Framework,
+                        Name=compliance.Name,
                     )
                     self._data.append(compliance_row)

prowler/lib/outputs/compliance/iso27001/iso27001_azure.py

@@ -59,6 +59,8 @@ class AzureISO27001(ComplianceOutput):
                             CheckId=finding.check_id,
                             Muted=finding.muted,
                             ResourceName=finding.resource_name,
+                            Framework=compliance.Framework,
+                            Name=compliance.Name,
                         )
                         self._data.append(compliance_row)
         # Add manual requirements to the compliance output
@@ -84,5 +86,7 @@ class AzureISO27001(ComplianceOutput):
                         ResourceName="Manual check",
                         CheckId="manual",
                         Muted=False,
+                        Framework=compliance.Framework,
+                        Name=compliance.Name,
                     )
                     self._data.append(compliance_row)

prowler/lib/outputs/compliance/iso27001/iso27001_gcp.py

@@ -59,6 +59,8 @@ class GCPISO27001(ComplianceOutput):
                             CheckId=finding.check_id,
                             Muted=finding.muted,
                             ResourceName=finding.resource_name,
+                            Framework=compliance.Framework,
+                            Name=compliance.Name,
                         )
                         self._data.append(compliance_row)
         # Add manual requirements to the compliance output
@@ -84,5 +86,7 @@ class GCPISO27001(ComplianceOutput):
                         ResourceName="Manual check",
                         CheckId="manual",
                         Muted=False,
+                        Framework=compliance.Framework,
+                        Name=compliance.Name,
                     )
                     self._data.append(compliance_row)

prowler/lib/outputs/compliance/iso27001/iso27001_kubernetes.py

@@ -59,6 +59,8 @@ class KubernetesISO27001(ComplianceOutput):
                             CheckId=finding.check_id,
                             Muted=finding.muted,
                             ResourceName=finding.resource_name,
+                            Framework=compliance.Framework,
+                            Name=compliance.Name,
                         )
                         self._data.append(compliance_row)
         # Add manual requirements to the compliance output
@@ -84,5 +86,7 @@ class KubernetesISO27001(ComplianceOutput):
                         ResourceName="Manual check",
                         CheckId="manual",
                         Muted=False,
+                        Framework=compliance.Framework,
+                        Name=compliance.Name,
                     )
                     self._data.append(compliance_row)

prowler/lib/outputs/compliance/iso27001/iso27001_m365.py

@@ -58,6 +58,8 @@ class M365ISO27001(ComplianceOutput):
                             CheckId=finding.check_id,
                             Muted=finding.muted,
                             ResourceName=finding.resource_name,
+                            Framework=compliance.Framework,
+                            Name=compliance.Name,
                         )
                         self._data.append(compliance_row)
 
@@ -84,5 +86,7 @@ class M365ISO27001(ComplianceOutput):
                         ResourceName="Manual check",
                         CheckId="manual",
                         Muted=False,
+                        Framework=compliance.Framework,
+                        Name=compliance.Name,
                     )
                     self._data.append(compliance_row)

prowler/lib/outputs/compliance/iso27001/iso27001_nhn.py

@@ -58,6 +58,8 @@ class NHNISO27001(ComplianceOutput):
                             CheckId=finding.check_id,
                             Muted=finding.muted,
                             ResourceName=finding.resource_name,
+                            Framework=compliance.Framework,
+                            Name=compliance.Name,
                         )
                         self._data.append(compliance_row)
 
@@ -84,5 +86,7 @@ class NHNISO27001(ComplianceOutput):
                         ResourceName="Manual check",
                         CheckId="manual",
                         Muted=False,
+                        Framework=compliance.Framework,
+                        Name=compliance.Name,
                     )
                     self._data.append(compliance_row)

prowler/lib/outputs/compliance/iso27001/models.py

@@ -24,6 +24,8 @@ class AWSISO27001Model(BaseModel):
     CheckId: str
     Muted: bool
     ResourceName: str
+    Framework: str
+    Name: str
 
 
 class AzureISO27001Model(BaseModel):
@@ -49,6 +51,8 @@ class AzureISO27001Model(BaseModel):
     CheckId: str
     Muted: bool
     ResourceName: str
+    Framework: str
+    Name: str
 
 
 class GCPISO27001Model(BaseModel):
@@ -74,6 +78,8 @@ class GCPISO27001Model(BaseModel):
     CheckId: str
     Muted: bool
     ResourceName: str
+    Framework: str
+    Name: str
 
 
 class KubernetesISO27001Model(BaseModel):
@@ -99,6 +105,8 @@ class KubernetesISO27001Model(BaseModel):
     CheckId: str
     Muted: bool
     ResourceName: str
+    Framework: str
+    Name: str
 
 
 class NHNISO27001Model(BaseModel):
@@ -124,6 +132,8 @@ class NHNISO27001Model(BaseModel):
     CheckId: str
     Muted: bool
     ResourceName: str
+    Framework: str
+    Name: str
 
 
 class M365ISO27001Model(BaseModel):
@@ -149,3 +159,5 @@ class M365ISO27001Model(BaseModel):
     CheckId: str
     Muted: bool
     ResourceName: str
+    Framework: str
+    Name: str

prowler/lib/outputs/compliance/kisa_ismsp/kisa_ismsp_aws.py

@@ -62,6 +62,8 @@ class AWSKISAISMSP(ComplianceOutput):
                             ResourceName=finding.resource_name,
                             CheckId=finding.check_id,
                             Muted=finding.muted,
+                            Framework=compliance.Framework,
+                            Name=compliance.Name,
                         )
                         self._data.append(compliance_row)
         # Add manual requirements to the compliance output
@@ -90,5 +92,7 @@ class AWSKISAISMSP(ComplianceOutput):
                         ResourceName="Manual check",
                         CheckId="manual",
                         Muted=False,
+                        Framework=compliance.Framework,
+                        Name=compliance.Name,
                     )
                     self._data.append(compliance_row)

prowler/lib/outputs/compliance/kisa_ismsp/models.py

@@ -29,3 +29,5 @@ class AWSKISAISMSPModel(BaseModel):
     ResourceName: str
     CheckId: str
     Muted: bool
+    Framework: str
+    Name: str

prowler/lib/outputs/compliance/mitre_attack/mitre_attack_aws.py

@@ -73,6 +73,8 @@ class AWSMitreAttack(ComplianceOutput):
                         ResourceName=finding.resource_name,
                         CheckId=finding.check_id,
                         Muted=finding.muted,
+                        Framework=compliance.Framework,
+                        Name=compliance.Name,
                     )
                     self._data.append(compliance_row)
         # Add manual requirements to the compliance output
@@ -112,5 +114,7 @@ class AWSMitreAttack(ComplianceOutput):
                         ResourceName="Manual check",
                         CheckId="manual",
                         Muted=False,
+                        Framework=compliance.Framework,
+                        Name=compliance.Name,
                     )
                     self._data.append(compliance_row)

prowler/lib/outputs/compliance/mitre_attack/mitre_attack_azure.py

@@ -74,6 +74,8 @@ class AzureMitreAttack(ComplianceOutput):
                         ResourceName=finding.resource_name,
                         CheckId=finding.check_id,
                         Muted=finding.muted,
+                        Framework=compliance.Framework,
+                        Name=compliance.Name,
                     )
                     self._data.append(compliance_row)
         # Add manual requirements to the compliance output
@@ -114,5 +116,7 @@ class AzureMitreAttack(ComplianceOutput):
                         ResourceName="Manual check",
                         CheckId="manual",
                         Muted=False,
+                        Framework=compliance.Framework,
+                        Name=compliance.Name,
                     )
                     self._data.append(compliance_row)

prowler/lib/outputs/compliance/mitre_attack/mitre_attack_gcp.py

@@ -73,6 +73,8 @@ class GCPMitreAttack(ComplianceOutput):
                         ResourceName=finding.resource_name,
                         CheckId=finding.check_id,
                         Muted=finding.muted,
+                        Framework=compliance.Framework,
+                        Name=compliance.Name,
                     )
                     self._data.append(compliance_row)
         # Add manual requirements to the compliance output
@@ -112,5 +114,7 @@ class GCPMitreAttack(ComplianceOutput):
                         ResourceName="Manual check",
                         CheckId="manual",
                         Muted=False,
+                        Framework=compliance.Framework,
+                        Name=compliance.Name,
                     )
                     self._data.append(compliance_row)

prowler/lib/outputs/compliance/mitre_attack/models.py

@@ -28,6 +28,8 @@ class AWSMitreAttackModel(BaseModel):
     CheckId: str
     Muted: bool
     ResourceName: str
+    Framework: str
+    Name: str
 
 
 class AzureMitreAttackModel(BaseModel):
@@ -57,6 +59,8 @@ class AzureMitreAttackModel(BaseModel):
     Muted: bool
     ResourceName: str
     Location: str
+    Framework: str
+    Name: str
 
 
 class GCPMitreAttackModel(BaseModel):
@@ -86,6 +90,8 @@ class GCPMitreAttackModel(BaseModel):
     Muted: bool
     ResourceName: str
     Location: str
+    Framework: str
+    Name: str
 
 
 # TODO: Create a parent class for the common fields of MITRE ATT&CK and have the specific classes from each provider to inherit from it.

prowler/lib/outputs/compliance/prowler_threatscore/models.py

@@ -28,6 +28,8 @@ class ProwlerThreatScoreAWSModel(BaseModel):
     ResourceName: str
     CheckId: str
     Muted: bool
+    Framework: str
+    Name: str
 
 
 class ProwlerThreatScoreAzureModel(BaseModel):
@@ -55,6 +57,8 @@ class ProwlerThreatScoreAzureModel(BaseModel):
     ResourceName: str
     CheckId: str
     Muted: bool
+    Framework: str
+    Name: str
 
 
 class ProwlerThreatScoreGCPModel(BaseModel):
@@ -82,6 +86,8 @@ class ProwlerThreatScoreGCPModel(BaseModel):
     ResourceName: str
     CheckId: str
     Muted: bool
+    Framework: str
+    Name: str
 
 
 class ProwlerThreatScoreM365Model(BaseModel):
@@ -109,3 +115,5 @@ class ProwlerThreatScoreM365Model(BaseModel):
     ResourceName: str
     CheckId: str
     Muted: bool
+    Framework: str
+    Name: str

prowler/lib/outputs/compliance/prowler_threatscore/prowler_threatscore.py

@@ -2,6 +2,7 @@ from colorama import Fore, Style
 from tabulate import tabulate
 
 from prowler.config.config import orange_color
+from prowler.lib.check.compliance_models import Compliance
 
 
 def get_prowler_threatscore_table(
@@ -23,9 +24,12 @@ def get_prowler_threatscore_table(
     fail_count = []
     muted_count = []
     pillars = {}
+    generic_score = 0
+    max_generic_score = 0
+    counted_findings_generic = []
     score_per_pillar = {}
     max_score_per_pillar = {}
-    counted_findings = []
+    counted_findings_per_pillar = {}
     for index, finding in enumerate(findings):
         check = bulk_checks_metadata[finding.check_metadata.CheckID]
         check_compliances = check.Compliance
@@ -39,12 +43,17 @@ def get_prowler_threatscore_table(
                             [
                                 pillar in score_per_pillar.keys(),
                                 pillar in max_score_per_pillar.keys(),
+                                pillar in counted_findings_per_pillar.keys(),
                             ]
                         ):
                             score_per_pillar[pillar] = 0
                             max_score_per_pillar[pillar] = 0
+                            counted_findings_per_pillar[pillar] = []
 
-                        if index not in counted_findings:
+                        if (
+                            index not in counted_findings_per_pillar[pillar]
+                            and not finding.muted
+                        ):
                             if finding.status == "PASS":
                                 score_per_pillar[pillar] += (
                                     attribute.LevelOfRisk * attribute.Weight
@@ -52,7 +61,7 @@ def get_prowler_threatscore_table(
                             max_score_per_pillar[pillar] += (
                                 attribute.LevelOfRisk * attribute.Weight
                             )
-                            counted_findings.append(index)
+                            counted_findings_per_pillar[pillar].append(index)
 
                         if pillar not in pillars:
                             pillars[pillar] = {"FAIL": 0, "PASS": 0, "Muted": 0}
@@ -69,6 +78,27 @@ def get_prowler_threatscore_table(
                                 pass_count.append(index)
                                 pillars[pillar]["PASS"] += 1
 
+                        # Generic score
+                        if index not in counted_findings_generic and not finding.muted:
+                            if finding.status == "PASS":
+                                generic_score += (
+                                    attribute.LevelOfRisk * attribute.Weight
+                                )
+                            max_generic_score += (
+                                attribute.LevelOfRisk * attribute.Weight
+                            )
+                            counted_findings_generic.append(index)
+
+    no_findings_pillars = []
+    bulk_compliance = Compliance.get_bulk(provider=compliance.Provider.lower()).get(
+        compliance_framework
+    )
+    for requirement in bulk_compliance.Requirements:
+        for attribute in requirement.Attributes:
+            pillar = attribute.Section
+            if pillar not in pillars.keys() and pillar not in no_findings_pillars:
+                no_findings_pillars.append(pillar)
+
     pillars = dict(sorted(pillars.items()))
     for pillar in pillars:
         pillar_table["Provider"].append(compliance.Provider)
@@ -88,6 +118,16 @@ def get_prowler_threatscore_table(
             f"{orange_color}{pillars[pillar]['Muted']}{Style.RESET_ALL}"
         )
 
+    for pillar in no_findings_pillars:
+        pillar_table["Provider"].append(compliance.Provider)
+        pillar_table["Pillar"].append(pillar)
+        pillar_table["Score"].append(f"{Style.BRIGHT}{Fore.GREEN}100%{Style.RESET_ALL}")
+        pillar_table["Status"].append(f"{Fore.GREEN}PASS{Style.RESET_ALL}")
+        pillar_table["Muted"].append(f"{orange_color}0{Style.RESET_ALL}")
+
+    # Sort table by pillars
+    pillar_table["Pillar"] = sorted(pillar_table["Pillar"])
+
     if (
         len(fail_count) + len(pass_count) + len(muted_count) > 1
     ):  # If there are no resources, don't print the compliance table
@@ -108,7 +148,9 @@ def get_prowler_threatscore_table(
                 print(
                     f"\nFramework {Fore.YELLOW}{compliance_framework.upper()}{Style.RESET_ALL} Results:"
                 )
-
+                print(
+                    f"\nGeneric Threat Score: {generic_score / max_generic_score * 100:.2f}%"
+                )
                 print(
                     tabulate(
                         pillar_table,

prowler/lib/outputs/compliance/prowler_threatscore/prowler_threatscore_aws.py

@@ -63,6 +63,8 @@ class ProwlerThreatScoreAWS(ComplianceOutput):
                             ResourceName=finding.resource_name,
                             CheckId=finding.check_id,
                             Muted=finding.muted,
+                            Framework=compliance.Framework,
+                            Name=compliance.Name,
                         )
                         self._data.append(compliance_row)
         # Add manual requirements to the compliance output
@@ -90,5 +92,7 @@ class ProwlerThreatScoreAWS(ComplianceOutput):
                         ResourceName="Manual check",
                         CheckId="manual",
                         Muted=False,
+                        Framework=compliance.Framework,
+                        Name=compliance.Name,
                     )
                     self._data.append(compliance_row)

prowler/lib/outputs/compliance/prowler_threatscore/prowler_threatscore_azure.py

@@ -63,6 +63,8 @@ class ProwlerThreatScoreAzure(ComplianceOutput):
                             ResourceName=finding.resource_name,
                             CheckId=finding.check_id,
                             Muted=finding.muted,
+                            Framework=compliance.Framework,
+                            Name=compliance.Name,
                         )
                         self._data.append(compliance_row)
         # Add manual requirements to the compliance output
@@ -90,5 +92,7 @@ class ProwlerThreatScoreAzure(ComplianceOutput):
                         ResourceName="Manual check",
                         CheckId="manual",
                         Muted=False,
+                        Framework=compliance.Framework,
+                        Name=compliance.Name,
                     )
                     self._data.append(compliance_row)