From 3d563356e5af6300b501d5dc08cf1e797ff987c2 Mon Sep 17 00:00:00 2001
From: Sergio Garcia <38561120+sergargar@users.noreply.github.com>
Date: Thu, 16 Nov 2023 13:52:07 +0100
Subject: [PATCH] fix(json): check if profile is None (#3043)
---
prowler/lib/outputs/html.py | 7 ++++---
prowler/lib/outputs/json.py | 5 ++---
tests/providers/common/common_outputs_test.py | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/prowler/lib/outputs/html.py b/prowler/lib/outputs/html.py
index 6e381bda..820681b0 100644
--- a/prowler/lib/outputs/html.py
+++ b/prowler/lib/outputs/html.py
@@ -338,8 +338,9 @@ def add_html_footer(output_filename, output_directory):
def get_aws_html_assessment_summary(audit_info):
try:
if isinstance(audit_info, AWS_Audit_Info):
- if not audit_info.profile:
- audit_info.profile = "ENV"
+ profile = (
+ audit_info.profile if audit_info.profile is not None else "default"
+ )
if isinstance(audit_info.audited_regions, list):
audited_regions = " ".join(audit_info.audited_regions)
elif not audit_info.audited_regions:
@@ -361,7 +362,7 @@ def get_aws_html_assessment_summary(audit_info):
AWS-CLI Profile: """
- + audit_info.profile
+ + profile
+ """
diff --git a/prowler/lib/outputs/json.py b/prowler/lib/outputs/json.py
index f43360ff..d536271f 100644
--- a/prowler/lib/outputs/json.py
+++ b/prowler/lib/outputs/json.py
@@ -155,6 +155,7 @@ def fill_json_ocsf(audit_info, finding, output_options) -> Check_Output_JSON_OCS
aws_org_uid = ""
account = None
org = None
+ profile = audit_info.profile if audit_info.profile is not None else "default"
if (
hasattr(audit_info, "organizations_metadata")
and audit_info.organizations_metadata
@@ -249,9 +250,7 @@ def fill_json_ocsf(audit_info, finding, output_options) -> Check_Output_JSON_OCS
original_time=outputs_unix_timestamp(
output_options.unix_timestamp, timestamp
),
- profiles=[audit_info.profile]
- if hasattr(audit_info, "organizations_metadata")
- else [],
+ profiles=[profile],
)
compliance = Compliance_OCSF(
status=generate_json_ocsf_status(finding.status),
diff --git a/tests/providers/common/common_outputs_test.py b/tests/providers/common/common_outputs_test.py
index c3f1fb94..86e16048 100644
--- a/tests/providers/common/common_outputs_test.py
+++ b/tests/providers/common/common_outputs_test.py
@@ -334,7 +334,7 @@ class Test_Common_Output_Options:
AWS Account: {audit_info.audited_account}
- AWS-CLI Profile: {audit_info.profile}
+ AWS-CLI Profile: default
Audited Regions: All Regions