mirror of
https://github.com/ghndrx/prowler.git
synced 2026-02-12 07:45:16 +00:00
fix(vpc services): list to dicts in vpc and subnets (#2310)
This commit is contained in:
Nacho Rivera
@@ -8,7 +8,7 @@ from prowler.providers.aws.services.vpc.vpc_client import vpc_client
|
||||
class networkfirewall_in_all_vpc(Check):
|
||||
def execute(self):
|
||||
findings = []
|
||||
for vpc in vpc_client.vpcs:
|
||||
for vpc in vpc_client.vpcs.values():
|
||||
report = Check_Report_AWS(self.metadata())
|
||||
report.region = vpc.region
|
||||
report.resource_id = vpc.id
|
||||
|
||||
@@ -5,21 +5,20 @@ from prowler.providers.aws.services.vpc.vpc_client import vpc_client
|
||||
class vpc_different_regions(Check):
|
||||
def execute(self):
|
||||
findings = []
|
||||
region = None
|
||||
for vpc in vpc_client.vpcs:
|
||||
vpc_regions = set()
|
||||
for vpc in vpc_client.vpcs.values():
|
||||
if not vpc.default:
|
||||
report = Check_Report_AWS(self.metadata())
|
||||
# This is a global check under the vpc service: region, resource_id and tags are not relevant here but we keep them for consistency
|
||||
report.region = vpc.region
|
||||
report.resource_id = vpc.id
|
||||
report.resource_tags = vpc.tags
|
||||
report.status = "FAIL"
|
||||
report.status_extended = f"VPCs found only in one region {vpc.region}."
|
||||
if region and vpc.region != region:
|
||||
report.status = "PASS"
|
||||
report.status_extended = "VPCs found in more than one region."
|
||||
break
|
||||
region = vpc.region
|
||||
vpc_regions.add(vpc.region)
|
||||
|
||||
report = Check_Report_AWS(self.metadata())
|
||||
# This is a global check under the vpc service: region, resource_id and tags are not relevant here but we keep them for consistency
|
||||
report.region = vpc_client.region
|
||||
report.resource_id = vpc_client.audited_account
|
||||
report.status = "FAIL"
|
||||
report.status_extended = "VPCs found only in one region"
|
||||
if len(vpc_regions) > 1:
|
||||
report.status = "PASS"
|
||||
report.status_extended = "VPCs found in more than one region."
|
||||
|
||||
findings.append(report)
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ from prowler.providers.aws.services.vpc.vpc_client import vpc_client
|
||||
class vpc_flow_logs_enabled(Check):
|
||||
def execute(self):
|
||||
findings = []
|
||||
for vpc in vpc_client.vpcs:
|
||||
for vpc in vpc_client.vpcs.values():
|
||||
report = Check_Report_AWS(self.metadata())
|
||||
report.region = vpc.region
|
||||
report.resource_tags = vpc.tags
|
||||
|
||||
@@ -17,7 +17,7 @@ class VPC:
|
||||
self.audited_account = audit_info.audited_account
|
||||
self.audit_resources = audit_info.audit_resources
|
||||
self.regional_clients = generate_regional_clients(self.service, audit_info)
|
||||
self.vpcs = []
|
||||
self.vpcs = {}
|
||||
self.vpc_peering_connections = []
|
||||
self.vpc_endpoints = []
|
||||
self.vpc_endpoint_services = []
|
||||
@@ -28,8 +28,13 @@ class VPC:
|
||||
self.__describe_flow_logs__()
|
||||
self.__describe_peering_route_tables__()
|
||||
self.__describe_vpc_endpoint_service_permissions__()
|
||||
self.vpc_subnets = []
|
||||
self.vpc_subnets = {}
|
||||
self.__threading_call__(self.__describe_vpc_subnets__)
|
||||
self.region = (
|
||||
audit_info.profile_region
|
||||
if audit_info.profile_region
|
||||
else list(self.regional_clients.keys())[0]
|
||||
)
|
||||
|
||||
def __get_session__(self):
|
||||
return self.session
|
||||
@@ -52,14 +57,12 @@ class VPC:
|
||||
if not self.audit_resources or (
|
||||
is_resource_filtered(vpc["VpcId"], self.audit_resources)
|
||||
):
|
||||
self.vpcs.append(
|
||||
VPCs(
|
||||
id=vpc["VpcId"],
|
||||
default=vpc["IsDefault"],
|
||||
cidr_block=vpc["CidrBlock"],
|
||||
region=regional_client.region,
|
||||
tags=vpc.get("Tags"),
|
||||
)
|
||||
self.vpcs[vpc["VpcId"]] = VPCs(
|
||||
id=vpc["VpcId"],
|
||||
default=vpc["IsDefault"],
|
||||
cidr_block=vpc["CidrBlock"],
|
||||
region=regional_client.region,
|
||||
tags=vpc.get("Tags"),
|
||||
)
|
||||
except Exception as error:
|
||||
logger.error(
|
||||
@@ -135,7 +138,7 @@ class VPC:
|
||||
def __describe_flow_logs__(self):
|
||||
logger.info("VPC - Describing flow logs...")
|
||||
try:
|
||||
for vpc in self.vpcs:
|
||||
for vpc in self.vpcs.values():
|
||||
regional_client = self.regional_clients[vpc.region]
|
||||
flow_logs = regional_client.describe_flow_logs(
|
||||
Filters=[
|
||||
@@ -289,9 +292,9 @@ class VPC:
|
||||
public=public,
|
||||
tags=subnet.get("Tags"),
|
||||
)
|
||||
self.vpc_subnets.append(object)
|
||||
self.vpc_subnets[subnet["SubnetId"]] = object
|
||||
# Add it to the VPC object
|
||||
for vpc in self.vpcs:
|
||||
for vpc in self.vpcs.values():
|
||||
if vpc.id == subnet["VpcId"]:
|
||||
vpc.subnets.append(object)
|
||||
except Exception as error:
|
||||
|
||||
@@ -5,7 +5,7 @@ from prowler.providers.aws.services.vpc.vpc_client import vpc_client
|
||||
class vpc_subnet_different_az(Check):
|
||||
def execute(self):
|
||||
findings = []
|
||||
for vpc in vpc_client.vpcs:
|
||||
for vpc in vpc_client.vpcs.values():
|
||||
report = Check_Report_AWS(self.metadata())
|
||||
report.region = vpc.region
|
||||
report.resource_tags = vpc.tags
|
||||
|
||||
@@ -5,7 +5,7 @@ from prowler.providers.aws.services.vpc.vpc_client import vpc_client
|
||||
class vpc_subnet_separate_private_public(Check):
|
||||
def execute(self):
|
||||
findings = []
|
||||
for vpc in vpc_client.vpcs:
|
||||
for vpc in vpc_client.vpcs.values():
|
||||
report = Check_Report_AWS(self.metadata())
|
||||
report.region = vpc.region
|
||||
report.resource_tags = vpc.tags
|
||||
|
||||
Reference in New Issue
Block a user