diff --git a/prowler/providers/azure/services/keyvault/keyvault_key_expiration_set_in_non_rbac/keyvault_key_expiration_set_in_non_rbac.py b/prowler/providers/azure/services/keyvault/keyvault_key_expiration_set_in_non_rbac/keyvault_key_expiration_set_in_non_rbac.py index 3841b1eef5..7f8dcf723f 100644 --- a/prowler/providers/azure/services/keyvault/keyvault_key_expiration_set_in_non_rbac/keyvault_key_expiration_set_in_non_rbac.py +++ b/prowler/providers/azure/services/keyvault/keyvault_key_expiration_set_in_non_rbac/keyvault_key_expiration_set_in_non_rbac.py @@ -8,12 +8,11 @@ class keyvault_key_expiration_set_in_non_rbac(Check): for subscription, key_vaults in keyvault_client.key_vaults.items(): for keyvault in key_vaults: if not keyvault.properties.enable_rbac_authorization and keyvault.keys: - report = Check_Report_Azure(self.metadata()) + report = Check_Report_Azure( + metadata=self.metadata(), resource_metadata=keyvault + ) report.subscription = subscription - report.resource_name = keyvault.name - report.resource_id = keyvault.id report.status = "PASS" - report.location = keyvault.location report.status_extended = f"Keyvault {keyvault.name} from subscription {subscription} has all the keys with expiration date set." has_key_without_expiration = False for key in keyvault.keys: diff --git a/prowler/providers/azure/services/keyvault/keyvault_key_rotation_enabled/keyvault_key_rotation_enabled.py b/prowler/providers/azure/services/keyvault/keyvault_key_rotation_enabled/keyvault_key_rotation_enabled.py index 84cc98967a..df8c6dabdf 100644 --- a/prowler/providers/azure/services/keyvault/keyvault_key_rotation_enabled/keyvault_key_rotation_enabled.py +++ b/prowler/providers/azure/services/keyvault/keyvault_key_rotation_enabled/keyvault_key_rotation_enabled.py @@ -8,11 +8,10 @@ class keyvault_key_rotation_enabled(Check): for subscription, key_vaults in keyvault_client.key_vaults.items(): for keyvault in key_vaults: if keyvault.keys: - report = Check_Report_Azure(self.metadata()) + report = Check_Report_Azure( + metadata=self.metadata(), resource_metadata=keyvault + ) report.subscription = subscription - report.resource_name = keyvault.name - report.resource_id = keyvault.id - report.location = keyvault.location for key in keyvault.keys: if ( key.rotation_policy diff --git a/prowler/providers/azure/services/keyvault/keyvault_logging_enabled/keyvault_logging_enabled.py b/prowler/providers/azure/services/keyvault/keyvault_logging_enabled/keyvault_logging_enabled.py index 3041916a51..2316c658e3 100644 --- a/prowler/providers/azure/services/keyvault/keyvault_logging_enabled/keyvault_logging_enabled.py +++ b/prowler/providers/azure/services/keyvault/keyvault_logging_enabled/keyvault_logging_enabled.py @@ -6,28 +6,23 @@ class keyvault_logging_enabled(Check): def execute(self) -> Check_Report_Azure: findings = [] - for subscription, key_vaults in keyvault_client.key_vaults.items(): + for subscription_name, key_vaults in keyvault_client.key_vaults.items(): for keyvault in key_vaults: - keyvault_name = keyvault.name - subscription_name = subscription + report = Check_Report_Azure( + metadata=self.metadata(), resource_metadata=keyvault + ) + report.subscription = subscription_name if not keyvault.monitor_diagnostic_settings: - report = Check_Report_Azure(self.metadata()) report.status = "FAIL" - report.subscription = subscription_name - report.resource_name = keyvault.name - report.resource_id = keyvault.id - report.location = keyvault.location - report.status_extended = f"There are no diagnostic settings capturing audit logs for Key Vault {keyvault_name} in subscription {subscription_name}." + report.status_extended = f"There are no diagnostic settings capturing audit logs for Key Vault {keyvault.name} in subscription {subscription_name}." findings.append(report) else: for diagnostic_setting in keyvault.monitor_diagnostic_settings: - report = Check_Report_Azure(self.metadata()) - report.subscription = subscription_name report.resource_name = diagnostic_setting.name report.resource_id = diagnostic_setting.id report.location = keyvault.location report.status = "FAIL" - report.status_extended = f"Diagnostic setting {diagnostic_setting.name} for Key Vault {keyvault_name} in subscription {subscription_name} does not have audit logging." + report.status_extended = f"Diagnostic setting {diagnostic_setting.name} for Key Vault {keyvault.name} in subscription {subscription_name} does not have audit logging." audit = False allLogs = False for log in diagnostic_setting.logs: @@ -37,7 +32,7 @@ class keyvault_logging_enabled(Check): allLogs = True if audit and allLogs: report.status = "PASS" - report.status_extended = f"Diagnostic setting {diagnostic_setting.name} for Key Vault {keyvault_name} in subscription {subscription_name} has audit logging." + report.status_extended = f"Diagnostic setting {diagnostic_setting.name} for Key Vault {keyvault.name} in subscription {subscription_name} has audit logging." break findings.append(report) diff --git a/prowler/providers/azure/services/keyvault/keyvault_non_rbac_secret_expiration_set/keyvault_non_rbac_secret_expiration_set.py b/prowler/providers/azure/services/keyvault/keyvault_non_rbac_secret_expiration_set/keyvault_non_rbac_secret_expiration_set.py index b102042b7f..e6ad55f9bd 100644 --- a/prowler/providers/azure/services/keyvault/keyvault_non_rbac_secret_expiration_set/keyvault_non_rbac_secret_expiration_set.py +++ b/prowler/providers/azure/services/keyvault/keyvault_non_rbac_secret_expiration_set/keyvault_non_rbac_secret_expiration_set.py @@ -11,11 +11,10 @@ class keyvault_non_rbac_secret_expiration_set(Check): not keyvault.properties.enable_rbac_authorization and keyvault.secrets ): - report = Check_Report_Azure(self.metadata()) + report = Check_Report_Azure( + metadata=self.metadata(), resource_metadata=keyvault + ) report.subscription = subscription - report.resource_name = keyvault.name - report.resource_id = keyvault.id - report.location = keyvault.location report.status = "PASS" report.status_extended = f"Keyvault {keyvault.name} from subscription {subscription} has all the secrets with expiration date set." has_secret_without_expiration = False diff --git a/prowler/providers/azure/services/keyvault/keyvault_private_endpoints/keyvault_private_endpoints.py b/prowler/providers/azure/services/keyvault/keyvault_private_endpoints/keyvault_private_endpoints.py index ecfc1f549c..e6100dade3 100644 --- a/prowler/providers/azure/services/keyvault/keyvault_private_endpoints/keyvault_private_endpoints.py +++ b/prowler/providers/azure/services/keyvault/keyvault_private_endpoints/keyvault_private_endpoints.py @@ -7,11 +7,10 @@ class keyvault_private_endpoints(Check): findings = [] for subscription, key_vaults in keyvault_client.key_vaults.items(): for keyvault in key_vaults: - report = Check_Report_Azure(self.metadata()) + report = Check_Report_Azure( + metadata=self.metadata(), resource_metadata=keyvault + ) report.subscription = subscription - report.resource_name = keyvault.name - report.resource_id = keyvault.id - report.location = keyvault.location report.status = "FAIL" report.status_extended = f"Keyvault {keyvault.name} from subscription {subscription} is not using private endpoints." if ( diff --git a/prowler/providers/azure/services/keyvault/keyvault_rbac_enabled/keyvault_rbac_enabled.py b/prowler/providers/azure/services/keyvault/keyvault_rbac_enabled/keyvault_rbac_enabled.py index e9524211f9..2cdde049df 100644 --- a/prowler/providers/azure/services/keyvault/keyvault_rbac_enabled/keyvault_rbac_enabled.py +++ b/prowler/providers/azure/services/keyvault/keyvault_rbac_enabled/keyvault_rbac_enabled.py @@ -7,11 +7,10 @@ class keyvault_rbac_enabled(Check): findings = [] for subscription, key_vaults in keyvault_client.key_vaults.items(): for keyvault in key_vaults: - report = Check_Report_Azure(self.metadata()) + report = Check_Report_Azure( + metadata=self.metadata(), resource_metadata=keyvault + ) report.subscription = subscription - report.resource_name = keyvault.name - report.resource_id = keyvault.id - report.location = keyvault.location report.status = "FAIL" report.status_extended = f"Keyvault {keyvault.name} from subscription {subscription} is not using RBAC for access control." if ( diff --git a/prowler/providers/azure/services/keyvault/keyvault_rbac_key_expiration_set/keyvault_rbac_key_expiration_set.py b/prowler/providers/azure/services/keyvault/keyvault_rbac_key_expiration_set/keyvault_rbac_key_expiration_set.py index 0c8f708273..87d40c4c23 100644 --- a/prowler/providers/azure/services/keyvault/keyvault_rbac_key_expiration_set/keyvault_rbac_key_expiration_set.py +++ b/prowler/providers/azure/services/keyvault/keyvault_rbac_key_expiration_set/keyvault_rbac_key_expiration_set.py @@ -8,11 +8,10 @@ class keyvault_rbac_key_expiration_set(Check): for subscription, key_vaults in keyvault_client.key_vaults.items(): for keyvault in key_vaults: if keyvault.properties.enable_rbac_authorization and keyvault.keys: - report = Check_Report_Azure(self.metadata()) + report = Check_Report_Azure( + metadata=self.metadata(), resource_metadata=keyvault + ) report.subscription = subscription - report.resource_name = keyvault.name - report.resource_id = keyvault.id - report.location = keyvault.location report.status = "PASS" report.status_extended = f"Keyvault {keyvault.name} from subscription {subscription} has all the keys with expiration date set." has_key_without_expiration = False diff --git a/prowler/providers/azure/services/keyvault/keyvault_rbac_secret_expiration_set/keyvault_rbac_secret_expiration_set.py b/prowler/providers/azure/services/keyvault/keyvault_rbac_secret_expiration_set/keyvault_rbac_secret_expiration_set.py index ccc5691a07..cfe00d2f32 100644 --- a/prowler/providers/azure/services/keyvault/keyvault_rbac_secret_expiration_set/keyvault_rbac_secret_expiration_set.py +++ b/prowler/providers/azure/services/keyvault/keyvault_rbac_secret_expiration_set/keyvault_rbac_secret_expiration_set.py @@ -8,11 +8,10 @@ class keyvault_rbac_secret_expiration_set(Check): for subscription, key_vaults in keyvault_client.key_vaults.items(): for keyvault in key_vaults: if keyvault.properties.enable_rbac_authorization and keyvault.secrets: - report = Check_Report_Azure(self.metadata()) + report = Check_Report_Azure( + metadata=self.metadata(), resource_metadata=keyvault + ) report.subscription = subscription - report.resource_name = keyvault.name - report.resource_id = keyvault.id - report.location = keyvault.location report.status = "PASS" report.status_extended = f"Keyvault {keyvault.name} from subscription {subscription} has all the secrets with expiration date set." has_secret_without_expiration = False diff --git a/prowler/providers/azure/services/keyvault/keyvault_recoverable/keyvault_recoverable.py b/prowler/providers/azure/services/keyvault/keyvault_recoverable/keyvault_recoverable.py index 0863ccdd9c..239893d17d 100644 --- a/prowler/providers/azure/services/keyvault/keyvault_recoverable/keyvault_recoverable.py +++ b/prowler/providers/azure/services/keyvault/keyvault_recoverable/keyvault_recoverable.py @@ -7,11 +7,10 @@ class keyvault_recoverable(Check): findings = [] for subscription, key_vaults in keyvault_client.key_vaults.items(): for keyvault in key_vaults: - report = Check_Report_Azure(self.metadata()) + report = Check_Report_Azure( + metadata=self.metadata(), resource_metadata=keyvault + ) report.subscription = subscription - report.resource_name = keyvault.name - report.resource_id = keyvault.id - report.location = keyvault.location report.status = "FAIL" report.status_extended = f"Keyvault {keyvault.name} from subscription {subscription} is not recoverable." if ( diff --git a/prowler/providers/azure/services/keyvault/keyvault_service.py b/prowler/providers/azure/services/keyvault/keyvault_service.py index 1cb153100f..d030d655a8 100644 --- a/prowler/providers/azure/services/keyvault/keyvault_service.py +++ b/prowler/providers/azure/services/keyvault/keyvault_service.py @@ -16,7 +16,6 @@ from prowler.providers.azure.services.monitor.monitor_client import monitor_clie from prowler.providers.azure.services.monitor.monitor_service import DiagnosticSetting -########################## KeyVault class KeyVault(AzureService): def __init__(self, provider: AzureProvider): super().__init__(KeyVaultManagementClient, provider)