[go: nahoru, domu]
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(ASFF): create class #4368

Merged
merged 16 commits into from
Jul 4, 2024
Merged

refactor(ASFF): create class #4368

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
2b8fc7b
refactor(ASFF): create class
jfagoagas Jul 3, 2024
8e3e2ab
fix: tests
jfagoagas Jul 3, 2024
37b69e6
docs: add docstring to format_compliance
jfagoagas Jul 3, 2024
9510991
fix(asff): if no tags None
jfagoagas Jul 3, 2024
87e0175
fix: do not create json-asff file
jfagoagas Jul 3, 2024
4e86925
fix(security-hub): increment counter
jfagoagas Jul 3, 2024
ae134d7
chore(asff): fix SH tests
pedrooot Jul 4, 2024
8c52547
chore(asff): fix tests for outputs
pedrooot Jul 4, 2024
4d85351
refactor(asff): refactor method filter_security_hub_findings_per_region
pedrooot Jul 4, 2024
952c8bf
refactor(asff): refactor class to retrieve findings per region
pedrooot Jul 4, 2024
35e4866
refactor(asff): pass findings as a dict and fix tests
pedrooot Jul 4, 2024
e5e6d35
refactor(asff): improve docstings
pedrooot Jul 4, 2024
5c11f0a
refactor(asff): refactor class to no pass none
pedrooot Jul 4, 2024
b745181
refactor(asff): fix tests
pedrooot Jul 4, 2024
430f212
Merge branch 'master' of github.com:prowler-cloud/prowler into PRWLR-…
jfagoagas Jul 4, 2024
c7e9264
fix: tests
jfagoagas Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 26 additions & 9 deletions prowler/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@

from colorama import Fore, Style

from prowler.config.config import csv_file_suffix, get_available_compliance_frameworks
from prowler.config.config import (
csv_file_suffix,
get_available_compliance_frameworks,
json_asff_file_suffix,
)
from prowler.lib.banner import print_banner
from prowler.lib.check.check import (
bulk_load_checks_metadata,
Expand Down Expand Up @@ -36,6 +40,7 @@
)
from prowler.lib.cli.parser import ProwlerArgumentParser
from prowler.lib.logger import logger, set_logging_config
from prowler.lib.outputs.asff.asff import ASFF
from prowler.lib.outputs.compliance.compliance import display_compliance_table
from prowler.lib.outputs.csv.models import CSV
from prowler.lib.outputs.finding import Finding
Expand All @@ -47,7 +52,7 @@
from prowler.providers.aws.lib.s3.s3 import send_to_s3_bucket
from prowler.providers.aws.lib.security_hub.security_hub import (
batch_send_to_security_hub,
prepare_security_hub_findings,
filter_security_hub_findings_per_region,
resolve_security_hub_previous_findings,
verify_security_hub_integration_enabled_per_region,
)
Expand Down Expand Up @@ -298,13 +303,26 @@ def prowler():
f"{global_provider.output_options.output_directory}/"
f"{global_provider.output_options.output_filename}{csv_file_suffix}"
)
csv_finding = CSV(
csv_output = CSV(
findings=finding_outputs,
create_file_descriptor=True,
file_path=filename,
)
# Write CSV Finding Object to file
csv_finding.batch_write_data_to_file()
csv_output.batch_write_data_to_file()

if "json-asff" in mode:
filename = (
f"{global_provider.output_options.output_directory}/"
f"{global_provider.output_options.output_filename}{json_asff_file_suffix}"
)
asff_output = ASFF(
findings=finding_outputs,
create_file_descriptor=True,
file_path=filename,
)
# Write ASFF Finding Object to file
asff_output.batch_write_data_to_file()

# Close json file if exists
# TODO: generate JSON here
Expand Down Expand Up @@ -368,13 +386,12 @@ def prowler():
aws_security_enabled_regions.append(region)

# Prepare the findings to be sent to Security Hub
security_hub_findings_per_region = prepare_security_hub_findings(
findings,
global_provider,
global_provider.output_options,
security_hub_findings_per_region = filter_security_hub_findings_per_region(
asff_output.data,
global_provider.output_options.send_sh_only_fails,
global_provider.output_options.status,
aws_security_enabled_regions,
)

# Send the findings to Security Hub
findings_sent_to_security_hub = batch_send_to_security_hub(
security_hub_findings_per_region, global_provider.session.current_session
Expand Down
0 prowler/lib/outputs/json_asff/__init__.py → prowler/lib/outputs/asff/__init__.py
View file
Open in desktop
File renamed without changes.
Loading
Loading