From 3dfd578ee5a933b816a4a3800cd97fe06a979a82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20De=20la=20Torre=20Vico?= Date: Wed, 15 Jan 2025 14:51:16 +0100 Subject: [PATCH] feat(containerregistry): extract Container Registry resource metadata in automated way (#6530) --- .../containerregistry_admin_user_disabled.py | 9 ++++----- .../containerregistry_not_publicly_accessible.py | 9 ++++----- .../containerregistry_uses_private_link.py | 9 ++++----- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/prowler/providers/azure/services/containerregistry/containerregistry_admin_user_disabled/containerregistry_admin_user_disabled.py b/prowler/providers/azure/services/containerregistry/containerregistry_admin_user_disabled/containerregistry_admin_user_disabled.py index d32b6d2d16..593c925220 100644 --- a/prowler/providers/azure/services/containerregistry/containerregistry_admin_user_disabled/containerregistry_admin_user_disabled.py +++ b/prowler/providers/azure/services/containerregistry/containerregistry_admin_user_disabled/containerregistry_admin_user_disabled.py @@ -9,12 +9,11 @@ class containerregistry_admin_user_disabled(Check): findings = [] for subscription, registries in containerregistry_client.registries.items(): - for registry_id, container_registry_info in registries.items(): - report = Check_Report_Azure(self.metadata()) + for container_registry_info in registries.values(): + report = Check_Report_Azure( + metadata=self.metadata(), resource_metadata=container_registry_info + ) report.subscription = subscription - report.resource_name = container_registry_info.name - report.resource_id = registry_id - report.location = container_registry_info.location report.status = "FAIL" report.status_extended = f"Container Registry {container_registry_info.name} from subscription {subscription} has its admin user enabled." diff --git a/prowler/providers/azure/services/containerregistry/containerregistry_not_publicly_accessible/containerregistry_not_publicly_accessible.py b/prowler/providers/azure/services/containerregistry/containerregistry_not_publicly_accessible/containerregistry_not_publicly_accessible.py index d63d1a5e28..9eb3ce9a61 100644 --- a/prowler/providers/azure/services/containerregistry/containerregistry_not_publicly_accessible/containerregistry_not_publicly_accessible.py +++ b/prowler/providers/azure/services/containerregistry/containerregistry_not_publicly_accessible/containerregistry_not_publicly_accessible.py @@ -9,12 +9,11 @@ class containerregistry_not_publicly_accessible(Check): findings = [] for subscription, registries in containerregistry_client.registries.items(): - for registry_id, container_registry_info in registries.items(): - report = Check_Report_Azure(self.metadata()) + for container_registry_info in registries.values(): + report = Check_Report_Azure( + metadata=self.metadata(), resource_metadata=container_registry_info + ) report.subscription = subscription - report.resource_name = container_registry_info.name - report.resource_id = registry_id - report.location = container_registry_info.location report.status = "FAIL" report.status_extended = f"Container Registry {container_registry_info.name} from subscription {subscription} allows unrestricted network access." diff --git a/prowler/providers/azure/services/containerregistry/containerregistry_uses_private_link/containerregistry_uses_private_link.py b/prowler/providers/azure/services/containerregistry/containerregistry_uses_private_link/containerregistry_uses_private_link.py index 11b705c595..90660ccaf2 100644 --- a/prowler/providers/azure/services/containerregistry/containerregistry_uses_private_link/containerregistry_uses_private_link.py +++ b/prowler/providers/azure/services/containerregistry/containerregistry_uses_private_link/containerregistry_uses_private_link.py @@ -9,12 +9,11 @@ class containerregistry_uses_private_link(Check): findings = [] for subscription, registries in containerregistry_client.registries.items(): - for registry_id, container_registry_info in registries.items(): - report = Check_Report_Azure(self.metadata()) + for container_registry_info in registries.values(): + report = Check_Report_Azure( + metadata=self.metadata(), resource_metadata=container_registry_info + ) report.subscription = subscription - report.resource_name = container_registry_info.name - report.resource_id = registry_id - report.location = container_registry_info.location report.status = "FAIL" report.status_extended = f"Container Registry {container_registry_info.name} from subscription {subscription} does not use a private link."