[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

Changes from 1 commit
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
Prev Previous commit
Next Next commit
chore(asff): fix SH tests
  • Loading branch information
@pedrooot
pedrooot committed Jul 4, 2024
commit ae134d74b0defabbc52f8ebf0fe6f37093ce19af
91 changes: 64 additions & 27 deletions tests/providers/aws/lib/security_hub/security_hub_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import json
from logging import ERROR, WARNING

import botocore
Expand Down Expand Up @@ -188,16 +189,24 @@ def test_filter_security_hub_findings_per_region_enabled_region_all_statuses(sel
findings = [generate_finding_output(status="PASS", region=AWS_REGION_EU_WEST_1)]
asff = ASFF(findings=findings)
asff_finding = asff.data[0]

assert filter_security_hub_findings_per_region(
asff.data,
False,
[],
enabled_regions,
) == {
AWS_REGION_EU_WEST_1: [asff_finding],
# Convert to JSON to compare
asff_finding_json = str(asff_finding.json(exclude_none=True))
asff_finding_json = {AWS_REGION_EU_WEST_1: [asff_finding_json]}
converted_data = {
region: [json.loads(item.replace("'", '"')) for item in items]
for region, items in asff_finding_json.items()
}

assert (
filter_security_hub_findings_per_region(
asff.data,
False,
[],
enabled_regions,
)
== converted_data
)

def test_filter_security_hub_findings_per_region_all_statuses_MANUAL_finding(self):
enabled_regions = [AWS_REGION_EU_WEST_1]
findings = [
Expand Down Expand Up @@ -241,12 +250,22 @@ def test_filter_security_hub_findings_per_region_FAIL_and_FAIL_statuses(self):
findings = [generate_finding_output(status="FAIL", region=AWS_REGION_EU_WEST_1)]
asff = ASFF(findings=findings)

assert filter_security_hub_findings_per_region(
asff.data,
False,
["FAIL"],
enabled_regions,
) == {AWS_REGION_EU_WEST_1: [asff.data[0]]}
# Convert to JSON to compare
asff_finding_json = str(asff.data[0].json(exclude_none=True))
asff_finding_json = {AWS_REGION_EU_WEST_1: [asff_finding_json]}
converted_data = {
region: [json.loads(item.replace("'", '"')) for item in items]
for region, items in asff_finding_json.items()
}
assert (
filter_security_hub_findings_per_region(
asff.data,
False,
["FAIL"],
enabled_regions,
)
== converted_data
)

def test_filter_security_hub_findings_per_region_send_sh_only_fails_PASS(self):
enabled_regions = [AWS_REGION_EU_WEST_1]
Expand All @@ -265,26 +284,44 @@ def test_filter_security_hub_findings_per_region_send_sh_only_fails_FAIL(self):
findings = [generate_finding_output(status="FAIL", region=AWS_REGION_EU_WEST_1)]
asff = ASFF(findings=findings)

assert filter_security_hub_findings_per_region(
asff.data,
True,
[],
enabled_regions,
) == {AWS_REGION_EU_WEST_1: [asff.data[0]]}
# Convert to JSON to compare
asff_finding_json = str(asff.data[0].json(exclude_none=True))
asff_finding_json = {AWS_REGION_EU_WEST_1: [asff_finding_json]}
converted_data = {
region: [json.loads(item.replace("'", '"')) for item in items]
for region, items in asff_finding_json.items()
}
assert (
filter_security_hub_findings_per_region(
asff.data,
True,
[],
enabled_regions,
)
== converted_data
)

def test_filter_security_hub_findings_per_region_no_audited_regions(self):
enabled_regions = [AWS_REGION_EU_WEST_1]
findings = [generate_finding_output(status="PASS", region=AWS_REGION_EU_WEST_1)]
asff = ASFF(findings=findings)

assert filter_security_hub_findings_per_region(
asff.data,
False,
[],
enabled_regions,
) == {
AWS_REGION_EU_WEST_1: [asff.data[0]],
# Convert to JSON to compare
asff_finding_json = str(asff.data[0].json(exclude_none=True))
asff_finding_json = {AWS_REGION_EU_WEST_1: [asff_finding_json]}
converted_data = {
region: [json.loads(item.replace("'", '"')) for item in items]
for region, items in asff_finding_json.items()
}
assert (
filter_security_hub_findings_per_region(
asff.data,
False,
[],
enabled_regions,
)
== converted_data
)

def test_filter_security_hub_findings_per_region_muted_fail_with_send_sh_only_fails(
self,
Expand Down