From c62d97f23a70119a371f0c1fb77a4eea8b9ed2f2 Mon Sep 17 00:00:00 2001 From: Pepe Fagoaga Date: Tue, 5 Mar 2024 14:16:23 +0100 Subject: [PATCH] chore(html): deprecate output (#3501) Co-authored-by: Sergio Garcia <38561120+sergargar@users.noreply.github.com> --- prowler/__main__.py | 11 - prowler/config/config.py | 2 - prowler/lib/cli/parser.py | 6 +- prowler/lib/outputs/file_descriptors.py | 11 - prowler/lib/outputs/html.py | 579 ------------------ prowler/lib/outputs/models.py | 9 - prowler/lib/outputs/outputs.py | 5 - prowler/lib/outputs/summary_table.py | 5 - prowler/providers/aws/lib/s3/s3.py | 3 - tests/lib/cli/parser_test.py | 9 +- tests/lib/outputs/outputs_test.py | 44 -- tests/providers/common/common_outputs_test.py | 194 +----- 12 files changed, 17 insertions(+), 861 deletions(-) delete mode 100644 prowler/lib/outputs/html.py diff --git a/prowler/__main__.py b/prowler/__main__.py index 04e4c4df11..cf1924c8f1 100644 --- a/prowler/__main__.py +++ b/prowler/__main__.py @@ -33,7 +33,6 @@ from prowler.lib.check.custom_checks_metadata import ( from prowler.lib.cli.parser import ProwlerArgumentParser from prowler.lib.logger import logger, set_logging_config from prowler.lib.outputs.compliance.compliance import display_compliance_table -from prowler.lib.outputs.html import add_html_footer, fill_html_overview_statistics from prowler.lib.outputs.json import close_json from prowler.lib.outputs.outputs import extract_findings_statistics from prowler.lib.outputs.summary_table import display_summary_table @@ -230,16 +229,6 @@ def prowler(): args.output_directory, mode, ) - if mode == "html": - add_html_footer( - global_provider.output_options.output_filename, - args.output_directory, - ) - fill_html_overview_statistics( - stats, - global_provider.output_options.output_filename, - args.output_directory, - ) # Send output to S3 if needed (-B / -D) if provider == "aws" and ( args.output_bucket or args.output_bucket_no_assume diff --git a/prowler/config/config.py b/prowler/config/config.py index c0ebf43d2e..a541a71690 100644 --- a/prowler/config/config.py +++ b/prowler/config/config.py @@ -13,8 +13,6 @@ from prowler.providers.common.common import get_global_provider timestamp = datetime.today() timestamp_utc = datetime.now(timezone.utc).replace(tzinfo=timezone.utc) prowler_version = "3.14.0" -html_logo_url = "https://github.com/prowler-cloud/prowler/" -html_logo_img = "https://user-images.githubusercontent.com/3985464/113734260-7ba06900-96fb-11eb-82bc-d4f68a1e2710.png" square_logo_img = "https://user-images.githubusercontent.com/38561120/235905862-9ece5bd7-9aa3-4e48-807a-3a9035eb8bfb.png" aws_logo = "https://user-images.githubusercontent.com/38561120/235953920-3e3fba08-0795-41dc-b480-9bea57db9f2e.png" azure_logo = "https://user-images.githubusercontent.com/38561120/235927375-b23e2e0f-8932-49ec-b59c-d89f61c8041d.png" diff --git a/prowler/lib/cli/parser.py b/prowler/lib/cli/parser.py index 7568f15f46..03245e7359 100644 --- a/prowler/lib/cli/parser.py +++ b/prowler/lib/cli/parser.py @@ -127,9 +127,9 @@ Detailed documentation at https://docs.prowler.cloud "-M", "--output-modes", nargs="+", - help="Output modes, by default csv, html and json", - default=["csv", "json", "html", "json-ocsf"], - choices=["csv", "json", "json-asff", "html", "json-ocsf"], + help="Output modes, by default csv and json", + default=["csv", "json", "json-ocsf"], + choices=["csv", "json", "json-asff", "json-ocsf"], ) common_outputs_parser.add_argument( "-F", diff --git a/prowler/lib/outputs/file_descriptors.py b/prowler/lib/outputs/file_descriptors.py index d5e199314e..8d3481cf44 100644 --- a/prowler/lib/outputs/file_descriptors.py +++ b/prowler/lib/outputs/file_descriptors.py @@ -4,13 +4,11 @@ from typing import Any from prowler.config.config import ( csv_file_suffix, - html_file_suffix, json_asff_file_suffix, json_file_suffix, json_ocsf_file_suffix, ) from prowler.lib.logger import logger -from prowler.lib.outputs.html import add_html_header from prowler.lib.outputs.models import ( Check_Output_CSV_AWS_CIS, Check_Output_CSV_AWS_ISO27001_2013, @@ -46,8 +44,6 @@ def initialize_file_descriptor( if output_mode in ("json", "json-asff", "json-ocsf"): file_descriptor.write("[") - elif "html" in output_mode: - add_html_header(file_descriptor, audit_info) else: # Format is the class model of the CSV format to print the headers csv_header = [x.upper() for x in generate_csv_fields(format)] @@ -95,13 +91,6 @@ def fill_file_descriptors(output_modes, output_directory, output_filename, provi ) file_descriptors.update({output_mode: file_descriptor}) - elif output_mode == "html": - filename = f"{output_directory}/{output_filename}{html_file_suffix}" - file_descriptor = initialize_file_descriptor( - filename, output_mode, provider - ) - file_descriptors.update({output_mode: file_descriptor}) - elif provider.type == "gcp": if output_mode == "cis_2.0_gcp": filename = f"{output_directory}/compliance/{output_filename}_cis_2.0_gcp{csv_file_suffix}" diff --git a/prowler/lib/outputs/html.py b/prowler/lib/outputs/html.py deleted file mode 100644 index 482d5749db..0000000000 --- a/prowler/lib/outputs/html.py +++ /dev/null @@ -1,579 +0,0 @@ -import importlib -import sys -from os import path - -from prowler.config.config import ( - html_file_suffix, - html_logo_img, - html_logo_url, - prowler_version, - timestamp, -) -from prowler.lib.check.models import Check_Report_AWS, Check_Report_GCP -from prowler.lib.logger import logger -from prowler.lib.outputs.models import ( - get_check_compliance, - parse_html_string, - unroll_dict, - unroll_tags, -) -from prowler.lib.utils.utils import open_file - - -def add_html_header(file_descriptor, provider): - try: - file_descriptor.write( - """ - - - - - - - - - - - - - - Prowler - The Handy Cloud Security Tool - - -
-
-
- prowler-logo -
-
- Report Information -
-
    -
  • -
    -
    - Version: """ - + prowler_version - + """ -
    -
    -
    • -
  • - Parameters used: """ - + " ".join(sys.argv[1:]) - + """ -
    • -
  • - Date: """ - + timestamp.isoformat() - + """ -
    • -
-
-
""" - + get_assessment_summary(provider) - + """ -
-
-
- Assessment Overview -
-
    -
  • - Total Findings: TOTAL_FINDINGS -
    • -
  • - Passed: TOTAL_PASS -
    • -
  • - Failed: TOTAL_FAIL -
    • -
  • - Total Resources: TOTAL_RESOURCES -
    • -
-
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - """ - ) - except Exception as error: - logger.critical( - f"{error.__class__.__name__}[{error.__traceback__.tb_lineno}] -- {error}" - ) - sys.exit(1) - - -def fill_html(file_descriptor, finding, output_options): - try: - row_class = "p-3 mb-2 bg-success-custom" - if finding.status == "MANUAL": - row_class = "table-info" - elif finding.status == "FAIL": - row_class = "table-danger" - elif finding.status == "MUTED": - row_class = "table-warning" - file_descriptor.write( - f""" - - - - - - - - - - - - - - - """ - ) - except Exception as error: - logger.critical( - f"{error.__class__.__name__}[{error.__traceback__.tb_lineno}] -- {error}" - ) - sys.exit(1) - - -def fill_html_overview_statistics(stats, output_filename, output_directory): - try: - filename = f"{output_directory}/{output_filename}{html_file_suffix}" - # Read file - if path.isfile(filename): - with open(filename, "r") as file: - filedata = file.read() - - # Replace statistics - # TOTAL_FINDINGS - filedata = filedata.replace( - "TOTAL_FINDINGS", str(stats.get("findings_count")) - ) - # TOTAL_RESOURCES - filedata = filedata.replace( - "TOTAL_RESOURCES", str(stats.get("resources_count")) - ) - # TOTAL_PASS - filedata = filedata.replace("TOTAL_PASS", str(stats.get("total_pass"))) - # TOTAL_FAIL - filedata = filedata.replace("TOTAL_FAIL", str(stats.get("total_fail"))) - # Write file - with open(filename, "w") as file: - file.write(filedata) - - except Exception as error: - logger.critical( - f"{error.__class__.__name__}[{error.__traceback__.tb_lineno}] -- {error}" - ) - sys.exit(1) - - -def add_html_footer(output_filename, output_directory): - try: - filename = f"{output_directory}/{output_filename}{html_file_suffix}" - # Close HTML file if exists - if path.isfile(filename): - file_descriptor = open_file( - filename, - "a", - ) - file_descriptor.write( - """ - -
StatusSeverityService NameRegionCheck IDCheck TitleResource IDResource TagsStatus ExtendedRiskRecomendationCompliance
{finding.status}{finding.check_metadata.Severity}{finding.check_metadata.ServiceName}{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("_", "_")}{parse_html_string(unroll_tags(finding.resource_tags))}{finding.status_extended.replace("<", "<").replace(">", ">").replace("_", "_")}

{finding.check_metadata.Risk}

{finding.check_metadata.Remediation.Recommendation.Text}

{parse_html_string(unroll_dict(get_check_compliance(finding, finding.check_metadata.Provider, output_options)))}

-
-
- - - - - - - - - - - - - -""" - ) - file_descriptor.close() - except Exception as error: - logger.critical( - f"{error.__class__.__name__}[{error.__traceback__.tb_lineno}] -- {error}" - ) - sys.exit(1) - - -def get_aws_html_assessment_summary(provider): - try: - if provider.type == "aws": - profile = ( - provider.identity.profile - if provider.identity.profile is not None - else "default" - ) - if isinstance(provider.identity.audited_regions, list): - audited_regions = " ".join(provider.identity.audited_regions) - elif not provider.identity.audited_regions: - audited_regions = "All Regions" - # TODO: why this fallback? - else: - audited_regions = ", ".join(provider.identity.audited_regions) - return ( - """ -
-
-
- AWS Assessment Summary -
-
    -
  • - AWS Account: """ - + provider.identity.account - + """ -
    • -
  • - AWS-CLI Profile: """ - + profile - + """ -
    • -
  • - Audited Regions: """ - + audited_regions - + """ -
    • -
-
-
-
-
-
- AWS Credentials -
-
    -
  • - User Id: """ - + provider.identity.user_id - + """ -
    • -
  • - Caller Identity ARN: """ - + provider.identity.identity_arn - + """ -
    • -
-
-
- """ - ) - - except Exception as error: - logger.critical( - f"{error.__class__.__name__}[{error.__traceback__.tb_lineno}] -- {error}" - ) - sys.exit(1) - - -def get_azure_html_assessment_summary(provider): - try: - if provider.type == "azure": - printed_subscriptions = [] - for key, value in provider.identity.subscriptions.items(): - intermediate = f"{key} : {value}" - printed_subscriptions.append(intermediate) - - # check if identity is str(coming from SP) or dict(coming from browser or) - if isinstance(provider.identity.identity_id, dict): - html_identity = provider.identity.identity_id.get( - "userPrincipalName", "Identity not found" - ) - else: - html_identity = provider.identity.identity_id - return ( - """ -
-
-
- Azure Assessment Summary -
-
    -
  • - Azure Tenant IDs: """ - + " ".join(provider.identity.tenant_ids) - + """ -
    • -
  • - Azure Tenant Domain: """ - + provider.identity.domain - + """ -
    • -
  • - Azure Subscriptions: """ - + " ".join(printed_subscriptions) - + """ -
    • -
-
-
-
-
-
- Azure Credentials -
-
    -
  • - Azure Identity Type: """ - + provider.identity.identity_type - + """ -
    • -
  • - Azure Identity ID: """ - + html_identity - + """ -
    • -
-
-
- """ - ) - except Exception as error: - logger.critical( - f"{error.__class__.__name__}[{error.__traceback__.tb_lineno}] -- {error}" - ) - sys.exit(1) - - -def get_gcp_html_assessment_summary(provider): - try: - if provider.type == "gcp": - return ( - """ -
-
-
- GCP Assessment Summary -
-
    -
  • - GCP Project IDs: """ - + ", ".join(provider.project_ids) - + """ -
    • -
-
-
-
-
-
- GCP Credentials -
-
    -
  • - GCP Account: """ - + provider.identity.profile - + """ -
    • -
-
-
- """ - ) - except Exception as error: - logger.critical( - f"{error.__class__.__name__}[{error.__traceback__.tb_lineno}] -- {error}" - ) - sys.exit(1) - - -def get_kubernetes_html_assessment_summary(provider): - try: - if provider.type == "kubernetes": - return ( - """ -
-
-
- Kubernetes Assessment Summary -
-
    -
  • - Kubernetes Context: """ - + provider.identity.context - + """ -
    • -
-
-
-
-
-
- Kubernetes Credentials -
-
    -
  • - Kubernetes Cluster: """ - + provider.identity.cluster - + """ -
    • -
  • - Kubernetes User: """ - + provider.identity.user - + """ -
    • -
-
-
- """ - ) - except Exception as error: - logger.critical( - f"{error.__class__.__name__}[{error.__traceback__.tb_lineno}] -- {error}" - ) - sys.exit(1) - - -def get_assessment_summary(provider): - """ - get_assessment_summary gets the HTML assessment summary for the provider - """ - try: - # Dynamically get the Provider quick inventory handler - provider_html_assessment_summary_function = ( - f"get_{provider.type}_html_assessment_summary" - ) - return getattr( - importlib.import_module(__name__), provider_html_assessment_summary_function - )(provider) - except Exception as error: - logger.critical( - f"{error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}" - ) - sys.exit(1) diff --git a/prowler/lib/outputs/models.py b/prowler/lib/outputs/models.py index 05c4bf9dc8..37b5347e09 100644 --- a/prowler/lib/outputs/models.py +++ b/prowler/lib/outputs/models.py @@ -264,15 +264,6 @@ def unroll_dict_to_list(dict: dict): return dict_list -def parse_html_string(str: str): - string = "" - for elem in str.split(" | "): - if elem: - string += f"\n•{elem}\n" - - return string - - def parse_json_tags(tags: list): dict_tags = {} if tags and tags != [{}] and tags != [None]: diff --git a/prowler/lib/outputs/outputs.py b/prowler/lib/outputs/outputs.py index c869cd1856..befe8cb99b 100644 --- a/prowler/lib/outputs/outputs.py +++ b/prowler/lib/outputs/outputs.py @@ -9,7 +9,6 @@ from prowler.lib.outputs.compliance.compliance import ( fill_compliance, ) from prowler.lib.outputs.file_descriptors import fill_file_descriptors -from prowler.lib.outputs.html import fill_html from prowler.lib.outputs.json import fill_json_asff, fill_json_ocsf from prowler.lib.outputs.models import ( Check_Output_JSON_ASFF, @@ -106,10 +105,6 @@ def report(check_findings, provider): file_descriptors["json-asff"].write(",") # Common outputs - if "html" in file_descriptors: - fill_html(file_descriptors["html"], finding, output_options) - file_descriptors["html"].write("") - if "csv" in file_descriptors: csv_writer, finding_output = generate_provider_output_csv( provider, diff --git a/prowler/lib/outputs/summary_table.py b/prowler/lib/outputs/summary_table.py index cb11a1eed9..e94fe28fc4 100644 --- a/prowler/lib/outputs/summary_table.py +++ b/prowler/lib/outputs/summary_table.py @@ -5,7 +5,6 @@ from tabulate import tabulate from prowler.config.config import ( csv_file_suffix, - html_file_suffix, json_asff_file_suffix, json_file_suffix, json_ocsf_file_suffix, @@ -115,10 +114,6 @@ def display_summary_table( f"{Style.BRIGHT}* You only see here those services that contains resources.{Style.RESET_ALL}" ) print("\nDetailed results are in:") - if "html" in output_options.output_modes: - print( - f" - HTML: {output_directory}/{output_filename}{html_file_suffix}" - ) if "json-asff" in output_options.output_modes: print( f" - JSON-ASFF: {output_directory}/{output_filename}{json_asff_file_suffix}" diff --git a/prowler/providers/aws/lib/s3/s3.py b/prowler/providers/aws/lib/s3/s3.py index 6ebb711fff..62ec246c9d 100644 --- a/prowler/providers/aws/lib/s3/s3.py +++ b/prowler/providers/aws/lib/s3/s3.py @@ -1,6 +1,5 @@ from prowler.config.config import ( csv_file_suffix, - html_file_suffix, json_asff_file_suffix, json_file_suffix, json_ocsf_file_suffix, @@ -22,8 +21,6 @@ def send_to_s3_bucket( filename = f"{output_filename}{json_asff_file_suffix}" elif output_mode == "json-ocsf": filename = f"{output_filename}{json_ocsf_file_suffix}" - elif output_mode == "html": - filename = f"{output_filename}{html_file_suffix}" else: # Compliance output mode filename = f"{output_filename}_{output_mode}{csv_file_suffix}" diff --git a/tests/lib/cli/parser_test.py b/tests/lib/cli/parser_test.py index fc09f8371b..3da2bc478c 100644 --- a/tests/lib/cli/parser_test.py +++ b/tests/lib/cli/parser_test.py @@ -44,7 +44,7 @@ class Test_Parser: assert not parsed.quiet assert len(parsed.output_modes) == 4 assert "csv" in parsed.output_modes - assert "html" in parsed.output_modes + assert "json" in parsed.output_modes assert not parsed.output_filename assert "output" in parsed.output_directory @@ -92,7 +92,7 @@ class Test_Parser: assert not parsed.quiet assert len(parsed.output_modes) == 4 assert "csv" in parsed.output_modes - assert "html" in parsed.output_modes + assert "json" in parsed.output_modes assert not parsed.output_filename assert "output" in parsed.output_directory @@ -132,7 +132,7 @@ class Test_Parser: assert not parsed.quiet assert len(parsed.output_modes) == 4 assert "csv" in parsed.output_modes - assert "html" in parsed.output_modes + assert "json" in parsed.output_modes assert not parsed.output_filename assert "output" in parsed.output_directory @@ -167,7 +167,7 @@ class Test_Parser: assert not parsed.quiet assert len(parsed.output_modes) == 4 assert "csv" in parsed.output_modes - assert "html" in parsed.output_modes + assert "json" in parsed.output_modes assert not parsed.output_filename assert "output" in parsed.output_directory @@ -268,7 +268,6 @@ class Test_Parser: assert len(parsed.output_modes) == 4 assert "csv" in parsed.output_modes assert "json" in parsed.output_modes - assert "html" in parsed.output_modes def test_root_parser_output_modes_short(self): command = [prowler_command, "-M", "csv"] diff --git a/tests/lib/outputs/outputs_test.py b/tests/lib/outputs/outputs_test.py index 80e8279d1c..711cc8ab55 100644 --- a/tests/lib/outputs/outputs_test.py +++ b/tests/lib/outputs/outputs_test.py @@ -54,7 +54,6 @@ from prowler.lib.outputs.models import ( Severity, generate_csv_fields, get_check_compliance, - parse_html_string, parse_json_tags, unroll_dict, unroll_dict_to_list, @@ -301,49 +300,6 @@ class Test_Outputs: assert unroll_dict_to_list(dict_B) == list_B - def test_parse_html_string(self): - string = "CISA: your-systems-3, your-data-1, your-data-2 | CIS-1.4: 2.1.1 | CIS-1.5: 2.1.1 | GDPR: article_32 | AWS-Foundational-Security-Best-Practices: s3 | HIPAA: 164_308_a_1_ii_b, 164_308_a_4_ii_a, 164_312_a_2_iv, 164_312_c_1, 164_312_c_2, 164_312_e_2_ii | GxP-21-CFR-Part-11: 11.10-c, 11.30 | GxP-EU-Annex-11: 7.1-data-storage-damage-protection | NIST-800-171-Revision-2: 3_3_8, 3_5_10, 3_13_11, 3_13_16 | NIST-800-53-Revision-4: sc_28 | NIST-800-53-Revision-5: au_9_3, cm_6_a, cm_9_b, cp_9_d, cp_9_8, pm_11_b, sc_8_3, sc_8_4, sc_13_a, sc_16_1, sc_28_1, si_19_4 | ENS-RD2022: mp.si.2.aws.s3.1 | NIST-CSF-1.1: ds_1 | RBI-Cyber-Security-Framework: annex_i_1_3 | FFIEC: d3-pc-am-b-12 | PCI-3.2.1: s3 | FedRamp-Moderate-Revision-4: sc-13, sc-28 | FedRAMP-Low-Revision-4: sc-13" - assert ( - parse_html_string(string) - == """ -•CISA: your-systems-3, your-data-1, your-data-2 - -•CIS-1.4: 2.1.1 - -•CIS-1.5: 2.1.1 - -•GDPR: article_32 - -•AWS-Foundational-Security-Best-Practices: s3 - -•HIPAA: 164_308_a_1_ii_b, 164_308_a_4_ii_a, 164_312_a_2_iv, 164_312_c_1, 164_312_c_2, 164_312_e_2_ii - -•GxP-21-CFR-Part-11: 11.10-c, 11.30 - -•GxP-EU-Annex-11: 7.1-data-storage-damage-protection - -•NIST-800-171-Revision-2: 3_3_8, 3_5_10, 3_13_11, 3_13_16 - -•NIST-800-53-Revision-4: sc_28 - -•NIST-800-53-Revision-5: au_9_3, cm_6_a, cm_9_b, cp_9_d, cp_9_8, pm_11_b, sc_8_3, sc_8_4, sc_13_a, sc_16_1, sc_28_1, si_19_4 - -•ENS-RD2022: mp.si.2.aws.s3.1 - -•NIST-CSF-1.1: ds_1 - -•RBI-Cyber-Security-Framework: annex_i_1_3 - -•FFIEC: d3-pc-am-b-12 - -•PCI-3.2.1: s3 - -•FedRamp-Moderate-Revision-4: sc-13, sc-28 - -•FedRAMP-Low-Revision-4: sc-13 -""" - ) - def test_parse_json_tags(self): json_tags = [ {"Key": "name", "Value": "test"}, diff --git a/tests/providers/common/common_outputs_test.py b/tests/providers/common/common_outputs_test.py index 70885aa812..642c639ef5 100644 --- a/tests/providers/common/common_outputs_test.py +++ b/tests/providers/common/common_outputs_test.py @@ -4,7 +4,6 @@ from os import rmdir from boto3 import session from mock import patch -from prowler.lib.outputs.html import get_assessment_summary from prowler.providers.aws.lib.audit_info.audit_info import AWS_Audit_Info from prowler.providers.azure.lib.audit_info.audit_info import ( Azure_Audit_Info, @@ -105,7 +104,7 @@ class Test_Common_Output_Options: # Set the arguments passed arguments = Namespace() arguments.quiet = True - arguments.output_modes = ["html", "csv", "json"] + arguments.output_modes = ["csv", "json"] arguments.output_directory = "output_test_directory" arguments.verbose = True arguments.output_filename = "output_test_filename" @@ -125,7 +124,7 @@ class Test_Common_Output_Options: assert output_options.security_hub_enabled assert output_options.send_sh_only_fails assert output_options.is_quiet - assert output_options.output_modes == ["html", "csv", "json", "json-asff"] + assert output_options.output_modes == ["csv", "json", "json-asff"] assert output_options.output_directory == arguments.output_directory assert output_options.mutelist_file == "" assert output_options.bulk_checks_metadata == {} @@ -141,7 +140,7 @@ class Test_Common_Output_Options: # Set the arguments passed arguments = Namespace() arguments.quiet = True - arguments.output_modes = ["html", "csv", "json"] + arguments.output_modes = ["csv", "json"] arguments.output_directory = "output_test_directory" arguments.verbose = True arguments.output_filename = "output_test_filename" @@ -156,7 +155,7 @@ class Test_Common_Output_Options: ) assert isinstance(output_options, Gcp_Output_Options) assert output_options.is_quiet - assert output_options.output_modes == ["html", "csv", "json"] + assert output_options.output_modes == ["csv", "json"] assert output_options.output_directory == arguments.output_directory assert output_options.mutelist_file == "" assert output_options.bulk_checks_metadata == {} @@ -172,7 +171,7 @@ class Test_Common_Output_Options: # Set the arguments passed arguments = Namespace() arguments.quiet = True - arguments.output_modes = ["html", "csv", "json"] + arguments.output_modes = ["csv", "json"] arguments.output_directory = "output_test_directory" arguments.verbose = True arguments.output_filename = "output_test_filename" @@ -187,7 +186,7 @@ class Test_Common_Output_Options: ) assert isinstance(output_options, Kubernetes_Output_Options) assert output_options.is_quiet - assert output_options.output_modes == ["html", "csv", "json"] + assert output_options.output_modes == ["csv", "json"] assert output_options.output_directory == arguments.output_directory assert output_options.mutelist_file == "" assert output_options.bulk_checks_metadata == {} @@ -203,7 +202,7 @@ class Test_Common_Output_Options: # Set the arguments passed arguments = Namespace() arguments.quiet = True - arguments.output_modes = ["html", "csv", "json"] + arguments.output_modes = ["csv", "json"] arguments.output_directory = "output_test_directory" arguments.verbose = True arguments.security_hub = True @@ -224,7 +223,7 @@ class Test_Common_Output_Options: assert output_options.security_hub_enabled assert output_options.send_sh_only_fails assert output_options.is_quiet - assert output_options.output_modes == ["html", "csv", "json", "json-asff"] + assert output_options.output_modes == ["csv", "json", "json-asff"] assert output_options.output_directory == arguments.output_directory assert output_options.mutelist_file == "" assert output_options.bulk_checks_metadata == {} @@ -243,7 +242,7 @@ class Test_Common_Output_Options: # Set the arguments passed arguments = Namespace() arguments.quiet = True - arguments.output_modes = ["html", "csv", "json"] + arguments.output_modes = ["csv", "json"] arguments.output_directory = "output_test_directory" arguments.verbose = True arguments.only_logs = False @@ -262,7 +261,6 @@ class Test_Common_Output_Options: assert isinstance(output_options, Azure_Output_Options) assert output_options.is_quiet assert output_options.output_modes == [ - "html", "csv", "json", ] @@ -284,7 +282,7 @@ class Test_Common_Output_Options: # Set the arguments passed arguments = Namespace() arguments.quiet = True - arguments.output_modes = ["html", "csv", "json"] + arguments.output_modes = ["csv", "json"] arguments.output_directory = "output_test_directory" arguments.verbose = True arguments.only_logs = False @@ -304,7 +302,6 @@ class Test_Common_Output_Options: assert isinstance(output_options, Azure_Output_Options) assert output_options.is_quiet assert output_options.output_modes == [ - "html", "csv", "json", ] @@ -320,177 +317,6 @@ class Test_Common_Output_Options: # Delete testing directory rmdir(arguments.output_directory) - def test_azure_get_assessment_summary(self): - # Mock Azure Audit Info - audit_info = self.set_mocked_azure_audit_info() - tenants = ["tenant-1", "tenant-2"] - audit_info.identity.tenant_ids = tenants - audit_info.identity.subscriptions = { - "Azure subscription 1": "12345-qwerty", - "Subscription2": "12345-qwerty", - } - printed_subscriptions = [] - for key, value in audit_info.identity.subscriptions.items(): - intermediate = f"{key} : {value}" - printed_subscriptions.append(intermediate) - assert ( - get_assessment_summary(audit_info) - == f""" -
-
-
- Azure Assessment Summary -
-
    -
  • - Azure Tenant IDs: {" ".join(audit_info.identity.tenant_ids)} -
    • -
  • - Azure Tenant Domain: {audit_info.identity.domain} -
    • -
  • - Azure Subscriptions: {" ".join(printed_subscriptions)} -
    • -
-
-
-
-
-
- Azure Credentials -
-
    -
  • - Azure Identity Type: {audit_info.identity.identity_type} -
    • -
  • - Azure Identity ID: {audit_info.identity.identity_id} -
    • -
-
-
- """ - ) - - def test_aws_get_assessment_summary(self): - # Mock AWS Audit Info - audit_info = self.set_mocked_aws_audit_info() - - assert ( - get_assessment_summary(audit_info) - == f""" -
-
-
- AWS Assessment Summary -
-
    -
  • - AWS Account: {audit_info.audited_account} -
    • -
  • - AWS-CLI Profile: default -
    • -
  • - Audited Regions: All Regions -
    • -
-
-
-
-
-
- AWS Credentials -
-
    -
  • - User Id: {audit_info.audited_user_id} -
    • -
  • - Caller Identity ARN: {audit_info.audited_identity_arn} -
    • -
-
-
- """ - ) - - def test_gcp_get_assessment_summary(self): - # Mock GCP Audit Info - audit_info = self.set_mocked_gcp_audit_info() - profile = "default" - assert ( - get_assessment_summary(audit_info) - == f""" -
-
-
- GCP Assessment Summary -
-
    -
  • - GCP Project IDs: {', '.join(audit_info.project_ids)} -
    • -
-
-
-
-
-
- GCP Credentials -
-
    -
  • - GCP Account: {profile} -
    • -
-
-
- """ - ) - - def test_kubernetes_get_assessment_summary(self): - # Mock Kubernetes Audit Info - audit_info = self.set_mocked_kubernetes_audit_info() - assert ( - get_assessment_summary(audit_info) - == """ -
-
-
- Kubernetes Assessment Summary -
-
    -
  • - Kubernetes Context: """ - + audit_info.context["name"] - + """ -
    • -
-
-
-
-
-
- Kubernetes Credentials -
-
    -
  • - Kubernetes Cluster: """ - + audit_info.context["context"]["cluster"] - + """ -
    • -
  • - Kubernetes User: """ - + audit_info.context["context"]["user"] - + """ -
    • -
-
-
- """ - ) - def test_get_provider_output_model(self): audit_info_class_names = [ "AWS_Audit_Info",