From 3ca38fe92d1136b10bf81f2c3d86071651cb35a3 Mon Sep 17 00:00:00 2001 From: Sergio Garcia <38561120+sergargar@users.noreply.github.com> Date: Thu, 26 Oct 2023 13:21:09 +0200 Subject: [PATCH] fix(gcp): set always location to lowercase (#2970) --- prowler/lib/outputs/compliance.py | 2 +- prowler/lib/outputs/html.py | 2 +- prowler/lib/outputs/json.py | 2 +- prowler/lib/outputs/models.py | 4 ++-- prowler/lib/outputs/outputs.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/prowler/lib/outputs/compliance.py b/prowler/lib/outputs/compliance.py index e62ef26a..4395af2d 100644 --- a/prowler/lib/outputs/compliance.py +++ b/prowler/lib/outputs/compliance.py @@ -136,7 +136,7 @@ def fill_compliance(output_options, finding, audit_info, file_descriptors): Provider=finding.check_metadata.Provider, Description=compliance.Description, ProjectId=finding.project_id, - Location=finding.location, + Location=finding.location.lower(), AssessmentDate=outputs_unix_timestamp( output_options.unix_timestamp, timestamp ), diff --git a/prowler/lib/outputs/html.py b/prowler/lib/outputs/html.py index 5010f9f5..6e381bda 100644 --- a/prowler/lib/outputs/html.py +++ b/prowler/lib/outputs/html.py @@ -181,7 +181,7 @@ def fill_html(file_descriptor, finding, output_options): {finding.status} {finding.check_metadata.Severity} {finding.check_metadata.ServiceName} - {finding.location if isinstance(finding, Check_Report_GCP) else finding.region if isinstance(finding, Check_Report_AWS) else ""} + {finding.location.lower() if isinstance(finding, Check_Report_GCP) else finding.region if isinstance(finding, Check_Report_AWS) else ""} {finding.check_metadata.CheckID.replace("_", "_")} {finding.check_metadata.CheckTitle} {finding.resource_id.replace("<", "<").replace(">", ">").replace("_", "_")} diff --git a/prowler/lib/outputs/json.py b/prowler/lib/outputs/json.py index a7928393..f43360ff 100644 --- a/prowler/lib/outputs/json.py +++ b/prowler/lib/outputs/json.py @@ -188,7 +188,7 @@ def fill_json_ocsf(audit_info, finding, output_options) -> Check_Output_JSON_OCS finding_uid = f"prowler-{finding.check_metadata.Provider}-{finding.check_metadata.CheckID}-{finding.subscription}-{finding.resource_id}" elif finding.check_metadata.Provider == "gcp": project_uid = finding.project_id - resource_region = finding.location + resource_region = finding.location.lower() resource_name = finding.resource_name resource_uid = finding.resource_id finding_uid = f"prowler-{finding.check_metadata.Provider}-{finding.check_metadata.CheckID}-{finding.project_id}-{finding.resource_id}" diff --git a/prowler/lib/outputs/models.py b/prowler/lib/outputs/models.py index 47114ecb..09f42b6e 100644 --- a/prowler/lib/outputs/models.py +++ b/prowler/lib/outputs/models.py @@ -67,7 +67,7 @@ def generate_provider_output_csv( data["resource_id"] = finding.resource_id data["resource_name"] = finding.resource_name data["project_id"] = finding.project_id - data["location"] = finding.location + data["location"] = finding.location.lower() data[ "finding_unique_id" ] = f"prowler-{provider}-{finding.check_metadata.CheckID}-{finding.project_id}-{finding.resource_id}" @@ -380,7 +380,7 @@ def generate_provider_output_json( if provider == "gcp": finding_output.ProjectId = finding.project_id - finding_output.Location = finding.location + finding_output.Location = finding.location.lower() finding_output.ResourceId = finding.resource_id finding_output.ResourceName = finding.resource_name finding_output.FindingUniqueId = f"prowler-{provider}-{finding.check_metadata.CheckID}-{finding.project_id}-{finding.resource_id}" diff --git a/prowler/lib/outputs/outputs.py b/prowler/lib/outputs/outputs.py index 6d4d8fc7..fce5d225 100644 --- a/prowler/lib/outputs/outputs.py +++ b/prowler/lib/outputs/outputs.py @@ -25,7 +25,7 @@ def stdout_report(finding, color, verbose, is_quiet): if finding.check_metadata.Provider == "azure": details = finding.check_metadata.ServiceName if finding.check_metadata.Provider == "gcp": - details = finding.location + details = finding.location.lower() if verbose and not (is_quiet and finding.status != "FAIL"): print(