diff --git a/prowler/CHANGELOG.md b/prowler/CHANGELOG.md index ff1f28ce6f..ae3f1d6a86 100644 --- a/prowler/CHANGELOG.md +++ b/prowler/CHANGELOG.md @@ -17,6 +17,10 @@ All notable changes to the **Prowler SDK** are documented in this file. - `entra_emergency_access_exclusion` check for M365 provider now scopes the exclusion requirement to enabled Conditional Access policies with a `Block` grant control instead of every enabled policy, focusing on the lockout-relevant policy set [(#10849)](https://github.com/prowler-cloud/prowler/pull/10849) - AWS IAM customer-managed policy checks no longer emit `FAIL` on unattached policies unless `--scan-unused-services` is enabled [(#11150)](https://github.com/prowler-cloud/prowler/pull/11150) +### 🐞 Fixed + +- Google Workspace Gmail checks sharing a single resource row, causing the service field to be overwritten by the last check executed [(#11169)](https://github.com/prowler-cloud/prowler/pull/11169) + --- ## [5.26.2] (Prowler UNRELEASED) diff --git a/prowler/providers/googleworkspace/services/gmail/gmail_anomalous_attachment_protection_enabled/gmail_anomalous_attachment_protection_enabled.py b/prowler/providers/googleworkspace/services/gmail/gmail_anomalous_attachment_protection_enabled/gmail_anomalous_attachment_protection_enabled.py index 5bbb732f06..b8895d4e21 100644 --- a/prowler/providers/googleworkspace/services/gmail/gmail_anomalous_attachment_protection_enabled/gmail_anomalous_attachment_protection_enabled.py +++ b/prowler/providers/googleworkspace/services/gmail/gmail_anomalous_attachment_protection_enabled/gmail_anomalous_attachment_protection_enabled.py @@ -18,7 +18,10 @@ class gmail_anomalous_attachment_protection_enabled(Check): if gmail_client.policies_fetched: report = CheckReportGoogleWorkspace( metadata=self.metadata(), - resource=gmail_client.provider.domain_resource, + resource=gmail_client.policies, + resource_id="gmailPolicies", + resource_name="Gmail Policies", + customer_id=gmail_client.provider.identity.customer_id, ) enabled = gmail_client.policies.enable_anomalous_attachment_protection diff --git a/prowler/providers/googleworkspace/services/gmail/gmail_auto_forwarding_disabled/gmail_auto_forwarding_disabled.py b/prowler/providers/googleworkspace/services/gmail/gmail_auto_forwarding_disabled/gmail_auto_forwarding_disabled.py index 9930089eb7..65cd6f1fcb 100644 --- a/prowler/providers/googleworkspace/services/gmail/gmail_auto_forwarding_disabled/gmail_auto_forwarding_disabled.py +++ b/prowler/providers/googleworkspace/services/gmail/gmail_auto_forwarding_disabled/gmail_auto_forwarding_disabled.py @@ -18,7 +18,10 @@ class gmail_auto_forwarding_disabled(Check): if gmail_client.policies_fetched: report = CheckReportGoogleWorkspace( metadata=self.metadata(), - resource=gmail_client.provider.domain_resource, + resource=gmail_client.policies, + resource_id="gmailPolicies", + resource_name="Gmail Policies", + customer_id=gmail_client.provider.identity.customer_id, ) forwarding_enabled = gmail_client.policies.enable_auto_forwarding diff --git a/prowler/providers/googleworkspace/services/gmail/gmail_comprehensive_mail_storage_enabled/gmail_comprehensive_mail_storage_enabled.py b/prowler/providers/googleworkspace/services/gmail/gmail_comprehensive_mail_storage_enabled/gmail_comprehensive_mail_storage_enabled.py index dd0b61760a..704e5a391a 100644 --- a/prowler/providers/googleworkspace/services/gmail/gmail_comprehensive_mail_storage_enabled/gmail_comprehensive_mail_storage_enabled.py +++ b/prowler/providers/googleworkspace/services/gmail/gmail_comprehensive_mail_storage_enabled/gmail_comprehensive_mail_storage_enabled.py @@ -18,7 +18,10 @@ class gmail_comprehensive_mail_storage_enabled(Check): if gmail_client.policies_fetched: report = CheckReportGoogleWorkspace( metadata=self.metadata(), - resource=gmail_client.provider.domain_resource, + resource=gmail_client.policies, + resource_id="gmailPolicies", + resource_name="Gmail Policies", + customer_id=gmail_client.provider.identity.customer_id, ) storage_enabled = gmail_client.policies.comprehensive_mail_storage_enabled diff --git a/prowler/providers/googleworkspace/services/gmail/gmail_domain_spoofing_protection_enabled/gmail_domain_spoofing_protection_enabled.py b/prowler/providers/googleworkspace/services/gmail/gmail_domain_spoofing_protection_enabled/gmail_domain_spoofing_protection_enabled.py index fe275d4564..d3a6bc94c1 100644 --- a/prowler/providers/googleworkspace/services/gmail/gmail_domain_spoofing_protection_enabled/gmail_domain_spoofing_protection_enabled.py +++ b/prowler/providers/googleworkspace/services/gmail/gmail_domain_spoofing_protection_enabled/gmail_domain_spoofing_protection_enabled.py @@ -18,7 +18,10 @@ class gmail_domain_spoofing_protection_enabled(Check): if gmail_client.policies_fetched: report = CheckReportGoogleWorkspace( metadata=self.metadata(), - resource=gmail_client.provider.domain_resource, + resource=gmail_client.policies, + resource_id="gmailPolicies", + resource_name="Gmail Policies", + customer_id=gmail_client.provider.identity.customer_id, ) enabled = gmail_client.policies.detect_domain_name_spoofing diff --git a/prowler/providers/googleworkspace/services/gmail/gmail_employee_name_spoofing_protection_enabled/gmail_employee_name_spoofing_protection_enabled.py b/prowler/providers/googleworkspace/services/gmail/gmail_employee_name_spoofing_protection_enabled/gmail_employee_name_spoofing_protection_enabled.py index f5131842dd..ea6283c940 100644 --- a/prowler/providers/googleworkspace/services/gmail/gmail_employee_name_spoofing_protection_enabled/gmail_employee_name_spoofing_protection_enabled.py +++ b/prowler/providers/googleworkspace/services/gmail/gmail_employee_name_spoofing_protection_enabled/gmail_employee_name_spoofing_protection_enabled.py @@ -18,7 +18,10 @@ class gmail_employee_name_spoofing_protection_enabled(Check): if gmail_client.policies_fetched: report = CheckReportGoogleWorkspace( metadata=self.metadata(), - resource=gmail_client.provider.domain_resource, + resource=gmail_client.policies, + resource_id="gmailPolicies", + resource_name="Gmail Policies", + customer_id=gmail_client.provider.identity.customer_id, ) enabled = gmail_client.policies.detect_employee_name_spoofing diff --git a/prowler/providers/googleworkspace/services/gmail/gmail_encrypted_attachment_protection_enabled/gmail_encrypted_attachment_protection_enabled.py b/prowler/providers/googleworkspace/services/gmail/gmail_encrypted_attachment_protection_enabled/gmail_encrypted_attachment_protection_enabled.py index 6a98dd0088..30a58cb4b4 100644 --- a/prowler/providers/googleworkspace/services/gmail/gmail_encrypted_attachment_protection_enabled/gmail_encrypted_attachment_protection_enabled.py +++ b/prowler/providers/googleworkspace/services/gmail/gmail_encrypted_attachment_protection_enabled/gmail_encrypted_attachment_protection_enabled.py @@ -18,7 +18,10 @@ class gmail_encrypted_attachment_protection_enabled(Check): if gmail_client.policies_fetched: report = CheckReportGoogleWorkspace( metadata=self.metadata(), - resource=gmail_client.provider.domain_resource, + resource=gmail_client.policies, + resource_id="gmailPolicies", + resource_name="Gmail Policies", + customer_id=gmail_client.provider.identity.customer_id, ) enabled = gmail_client.policies.enable_encrypted_attachment_protection diff --git a/prowler/providers/googleworkspace/services/gmail/gmail_enhanced_pre_delivery_scanning_enabled/gmail_enhanced_pre_delivery_scanning_enabled.py b/prowler/providers/googleworkspace/services/gmail/gmail_enhanced_pre_delivery_scanning_enabled/gmail_enhanced_pre_delivery_scanning_enabled.py index ab27fd837f..33e5a58f9b 100644 --- a/prowler/providers/googleworkspace/services/gmail/gmail_enhanced_pre_delivery_scanning_enabled/gmail_enhanced_pre_delivery_scanning_enabled.py +++ b/prowler/providers/googleworkspace/services/gmail/gmail_enhanced_pre_delivery_scanning_enabled/gmail_enhanced_pre_delivery_scanning_enabled.py @@ -18,7 +18,10 @@ class gmail_enhanced_pre_delivery_scanning_enabled(Check): if gmail_client.policies_fetched: report = CheckReportGoogleWorkspace( metadata=self.metadata(), - resource=gmail_client.provider.domain_resource, + resource=gmail_client.policies, + resource_id="gmailPolicies", + resource_name="Gmail Policies", + customer_id=gmail_client.provider.identity.customer_id, ) scanning_enabled = ( diff --git a/prowler/providers/googleworkspace/services/gmail/gmail_external_image_scanning_enabled/gmail_external_image_scanning_enabled.py b/prowler/providers/googleworkspace/services/gmail/gmail_external_image_scanning_enabled/gmail_external_image_scanning_enabled.py index b9731fac42..c71de1459a 100644 --- a/prowler/providers/googleworkspace/services/gmail/gmail_external_image_scanning_enabled/gmail_external_image_scanning_enabled.py +++ b/prowler/providers/googleworkspace/services/gmail/gmail_external_image_scanning_enabled/gmail_external_image_scanning_enabled.py @@ -18,7 +18,10 @@ class gmail_external_image_scanning_enabled(Check): if gmail_client.policies_fetched: report = CheckReportGoogleWorkspace( metadata=self.metadata(), - resource=gmail_client.provider.domain_resource, + resource=gmail_client.policies, + resource_id="gmailPolicies", + resource_name="Gmail Policies", + customer_id=gmail_client.provider.identity.customer_id, ) scanning_enabled = gmail_client.policies.enable_external_image_scanning diff --git a/prowler/providers/googleworkspace/services/gmail/gmail_groups_spoofing_protection_enabled/gmail_groups_spoofing_protection_enabled.py b/prowler/providers/googleworkspace/services/gmail/gmail_groups_spoofing_protection_enabled/gmail_groups_spoofing_protection_enabled.py index 866a53989d..fd4238239f 100644 --- a/prowler/providers/googleworkspace/services/gmail/gmail_groups_spoofing_protection_enabled/gmail_groups_spoofing_protection_enabled.py +++ b/prowler/providers/googleworkspace/services/gmail/gmail_groups_spoofing_protection_enabled/gmail_groups_spoofing_protection_enabled.py @@ -18,7 +18,10 @@ class gmail_groups_spoofing_protection_enabled(Check): if gmail_client.policies_fetched: report = CheckReportGoogleWorkspace( metadata=self.metadata(), - resource=gmail_client.provider.domain_resource, + resource=gmail_client.policies, + resource_id="gmailPolicies", + resource_name="Gmail Policies", + customer_id=gmail_client.provider.identity.customer_id, ) enabled = gmail_client.policies.detect_groups_spoofing diff --git a/prowler/providers/googleworkspace/services/gmail/gmail_inbound_domain_spoofing_protection_enabled/gmail_inbound_domain_spoofing_protection_enabled.py b/prowler/providers/googleworkspace/services/gmail/gmail_inbound_domain_spoofing_protection_enabled/gmail_inbound_domain_spoofing_protection_enabled.py index f637759a55..b9a22cadc6 100644 --- a/prowler/providers/googleworkspace/services/gmail/gmail_inbound_domain_spoofing_protection_enabled/gmail_inbound_domain_spoofing_protection_enabled.py +++ b/prowler/providers/googleworkspace/services/gmail/gmail_inbound_domain_spoofing_protection_enabled/gmail_inbound_domain_spoofing_protection_enabled.py @@ -18,7 +18,10 @@ class gmail_inbound_domain_spoofing_protection_enabled(Check): if gmail_client.policies_fetched: report = CheckReportGoogleWorkspace( metadata=self.metadata(), - resource=gmail_client.provider.domain_resource, + resource=gmail_client.policies, + resource_id="gmailPolicies", + resource_name="Gmail Policies", + customer_id=gmail_client.provider.identity.customer_id, ) enabled = gmail_client.policies.detect_inbound_domain_spoofing diff --git a/prowler/providers/googleworkspace/services/gmail/gmail_mail_delegation_disabled/gmail_mail_delegation_disabled.py b/prowler/providers/googleworkspace/services/gmail/gmail_mail_delegation_disabled/gmail_mail_delegation_disabled.py index 65cf54733b..5e32e58b99 100644 --- a/prowler/providers/googleworkspace/services/gmail/gmail_mail_delegation_disabled/gmail_mail_delegation_disabled.py +++ b/prowler/providers/googleworkspace/services/gmail/gmail_mail_delegation_disabled/gmail_mail_delegation_disabled.py @@ -18,7 +18,10 @@ class gmail_mail_delegation_disabled(Check): if gmail_client.policies_fetched: report = CheckReportGoogleWorkspace( metadata=self.metadata(), - resource=gmail_client.provider.domain_resource, + resource=gmail_client.policies, + resource_id="gmailPolicies", + resource_name="Gmail Policies", + customer_id=gmail_client.provider.identity.customer_id, ) delegation_enabled = gmail_client.policies.enable_mail_delegation diff --git a/prowler/providers/googleworkspace/services/gmail/gmail_per_user_outbound_gateway_disabled/gmail_per_user_outbound_gateway_disabled.py b/prowler/providers/googleworkspace/services/gmail/gmail_per_user_outbound_gateway_disabled/gmail_per_user_outbound_gateway_disabled.py index 95c5e6996f..3f384de1d0 100644 --- a/prowler/providers/googleworkspace/services/gmail/gmail_per_user_outbound_gateway_disabled/gmail_per_user_outbound_gateway_disabled.py +++ b/prowler/providers/googleworkspace/services/gmail/gmail_per_user_outbound_gateway_disabled/gmail_per_user_outbound_gateway_disabled.py @@ -18,7 +18,10 @@ class gmail_per_user_outbound_gateway_disabled(Check): if gmail_client.policies_fetched: report = CheckReportGoogleWorkspace( metadata=self.metadata(), - resource=gmail_client.provider.domain_resource, + resource=gmail_client.policies, + resource_id="gmailPolicies", + resource_name="Gmail Policies", + customer_id=gmail_client.provider.identity.customer_id, ) gateway_allowed = gmail_client.policies.allow_per_user_outbound_gateway diff --git a/prowler/providers/googleworkspace/services/gmail/gmail_pop_imap_access_disabled/gmail_pop_imap_access_disabled.py b/prowler/providers/googleworkspace/services/gmail/gmail_pop_imap_access_disabled/gmail_pop_imap_access_disabled.py index 17f7de3658..18b5034e31 100644 --- a/prowler/providers/googleworkspace/services/gmail/gmail_pop_imap_access_disabled/gmail_pop_imap_access_disabled.py +++ b/prowler/providers/googleworkspace/services/gmail/gmail_pop_imap_access_disabled/gmail_pop_imap_access_disabled.py @@ -18,7 +18,10 @@ class gmail_pop_imap_access_disabled(Check): if gmail_client.policies_fetched: report = CheckReportGoogleWorkspace( metadata=self.metadata(), - resource=gmail_client.provider.domain_resource, + resource=gmail_client.policies, + resource_id="gmailPolicies", + resource_name="Gmail Policies", + customer_id=gmail_client.provider.identity.customer_id, ) pop_enabled = gmail_client.policies.enable_pop_access diff --git a/prowler/providers/googleworkspace/services/gmail/gmail_script_attachment_protection_enabled/gmail_script_attachment_protection_enabled.py b/prowler/providers/googleworkspace/services/gmail/gmail_script_attachment_protection_enabled/gmail_script_attachment_protection_enabled.py index ec34df7cee..1dd2ed59d1 100644 --- a/prowler/providers/googleworkspace/services/gmail/gmail_script_attachment_protection_enabled/gmail_script_attachment_protection_enabled.py +++ b/prowler/providers/googleworkspace/services/gmail/gmail_script_attachment_protection_enabled/gmail_script_attachment_protection_enabled.py @@ -18,7 +18,10 @@ class gmail_script_attachment_protection_enabled(Check): if gmail_client.policies_fetched: report = CheckReportGoogleWorkspace( metadata=self.metadata(), - resource=gmail_client.provider.domain_resource, + resource=gmail_client.policies, + resource_id="gmailPolicies", + resource_name="Gmail Policies", + customer_id=gmail_client.provider.identity.customer_id, ) enabled = gmail_client.policies.enable_script_attachment_protection diff --git a/prowler/providers/googleworkspace/services/gmail/gmail_shortener_scanning_enabled/gmail_shortener_scanning_enabled.py b/prowler/providers/googleworkspace/services/gmail/gmail_shortener_scanning_enabled/gmail_shortener_scanning_enabled.py index f9bfef5112..01411dcc04 100644 --- a/prowler/providers/googleworkspace/services/gmail/gmail_shortener_scanning_enabled/gmail_shortener_scanning_enabled.py +++ b/prowler/providers/googleworkspace/services/gmail/gmail_shortener_scanning_enabled/gmail_shortener_scanning_enabled.py @@ -18,7 +18,10 @@ class gmail_shortener_scanning_enabled(Check): if gmail_client.policies_fetched: report = CheckReportGoogleWorkspace( metadata=self.metadata(), - resource=gmail_client.provider.domain_resource, + resource=gmail_client.policies, + resource_id="gmailPolicies", + resource_name="Gmail Policies", + customer_id=gmail_client.provider.identity.customer_id, ) scanning_enabled = gmail_client.policies.enable_shortener_scanning diff --git a/prowler/providers/googleworkspace/services/gmail/gmail_unauthenticated_email_protection_enabled/gmail_unauthenticated_email_protection_enabled.py b/prowler/providers/googleworkspace/services/gmail/gmail_unauthenticated_email_protection_enabled/gmail_unauthenticated_email_protection_enabled.py index 86d2339bff..44ff6fa24d 100644 --- a/prowler/providers/googleworkspace/services/gmail/gmail_unauthenticated_email_protection_enabled/gmail_unauthenticated_email_protection_enabled.py +++ b/prowler/providers/googleworkspace/services/gmail/gmail_unauthenticated_email_protection_enabled/gmail_unauthenticated_email_protection_enabled.py @@ -18,7 +18,10 @@ class gmail_unauthenticated_email_protection_enabled(Check): if gmail_client.policies_fetched: report = CheckReportGoogleWorkspace( metadata=self.metadata(), - resource=gmail_client.provider.domain_resource, + resource=gmail_client.policies, + resource_id="gmailPolicies", + resource_name="Gmail Policies", + customer_id=gmail_client.provider.identity.customer_id, ) enabled = gmail_client.policies.detect_unauthenticated_emails diff --git a/prowler/providers/googleworkspace/services/gmail/gmail_untrusted_link_warnings_enabled/gmail_untrusted_link_warnings_enabled.py b/prowler/providers/googleworkspace/services/gmail/gmail_untrusted_link_warnings_enabled/gmail_untrusted_link_warnings_enabled.py index 82cc9a1153..a62480de3b 100644 --- a/prowler/providers/googleworkspace/services/gmail/gmail_untrusted_link_warnings_enabled/gmail_untrusted_link_warnings_enabled.py +++ b/prowler/providers/googleworkspace/services/gmail/gmail_untrusted_link_warnings_enabled/gmail_untrusted_link_warnings_enabled.py @@ -18,7 +18,10 @@ class gmail_untrusted_link_warnings_enabled(Check): if gmail_client.policies_fetched: report = CheckReportGoogleWorkspace( metadata=self.metadata(), - resource=gmail_client.provider.domain_resource, + resource=gmail_client.policies, + resource_id="gmailPolicies", + resource_name="Gmail Policies", + customer_id=gmail_client.provider.identity.customer_id, ) warnings_enabled = ( diff --git a/tests/providers/googleworkspace/services/gmail/gmail_anomalous_attachment_protection_enabled/gmail_anomalous_attachment_protection_enabled_test.py b/tests/providers/googleworkspace/services/gmail/gmail_anomalous_attachment_protection_enabled/gmail_anomalous_attachment_protection_enabled_test.py index c0b5ac2dbc..a57bee1ff1 100644 --- a/tests/providers/googleworkspace/services/gmail/gmail_anomalous_attachment_protection_enabled/gmail_anomalous_attachment_protection_enabled_test.py +++ b/tests/providers/googleworkspace/services/gmail/gmail_anomalous_attachment_protection_enabled/gmail_anomalous_attachment_protection_enabled_test.py @@ -3,7 +3,6 @@ from unittest.mock import patch from prowler.providers.googleworkspace.services.gmail.gmail_service import GmailPolicies from tests.providers.googleworkspace.googleworkspace_fixtures import ( CUSTOMER_ID, - DOMAIN, set_mocked_googleworkspace_provider, ) @@ -38,7 +37,7 @@ class TestGmailAnomalousAttachmentProtectionEnabled: assert len(findings) == 1 assert findings[0].status == "PASS" assert "WARNING" in findings[0].status_extended - assert findings[0].resource_name == DOMAIN + assert findings[0].resource_name == "Gmail Policies" assert findings[0].customer_id == CUSTOMER_ID def test_fail_no_action(self): diff --git a/tests/providers/googleworkspace/services/gmail/gmail_auto_forwarding_disabled/gmail_auto_forwarding_disabled_test.py b/tests/providers/googleworkspace/services/gmail/gmail_auto_forwarding_disabled/gmail_auto_forwarding_disabled_test.py index 462f8b4f05..2de8a79b9b 100644 --- a/tests/providers/googleworkspace/services/gmail/gmail_auto_forwarding_disabled/gmail_auto_forwarding_disabled_test.py +++ b/tests/providers/googleworkspace/services/gmail/gmail_auto_forwarding_disabled/gmail_auto_forwarding_disabled_test.py @@ -3,7 +3,6 @@ from unittest.mock import patch from prowler.providers.googleworkspace.services.gmail.gmail_service import GmailPolicies from tests.providers.googleworkspace.googleworkspace_fixtures import ( CUSTOMER_ID, - DOMAIN, set_mocked_googleworkspace_provider, ) @@ -35,10 +34,13 @@ class TestGmailAutoForwardingDisabled: assert len(findings) == 1 assert findings[0].status == "PASS" assert "disabled" in findings[0].status_extended - assert findings[0].resource_name == DOMAIN - assert findings[0].resource_id == CUSTOMER_ID + assert findings[0].resource_name == "Gmail Policies" + assert findings[0].resource_id == "gmailPolicies" assert findings[0].customer_id == CUSTOMER_ID - assert findings[0].resource == mock_provider.domain_resource.dict() + assert ( + findings[0].resource + == GmailPolicies(enable_auto_forwarding=False).dict() + ) def test_fail_disabled(self): mock_provider = set_mocked_googleworkspace_provider() diff --git a/tests/providers/googleworkspace/services/gmail/gmail_comprehensive_mail_storage_enabled/gmail_comprehensive_mail_storage_enabled_test.py b/tests/providers/googleworkspace/services/gmail/gmail_comprehensive_mail_storage_enabled/gmail_comprehensive_mail_storage_enabled_test.py index 8c2525e819..1dde307b71 100644 --- a/tests/providers/googleworkspace/services/gmail/gmail_comprehensive_mail_storage_enabled/gmail_comprehensive_mail_storage_enabled_test.py +++ b/tests/providers/googleworkspace/services/gmail/gmail_comprehensive_mail_storage_enabled/gmail_comprehensive_mail_storage_enabled_test.py @@ -3,7 +3,6 @@ from unittest.mock import patch from prowler.providers.googleworkspace.services.gmail.gmail_service import GmailPolicies from tests.providers.googleworkspace.googleworkspace_fixtures import ( CUSTOMER_ID, - DOMAIN, set_mocked_googleworkspace_provider, ) @@ -37,7 +36,7 @@ class TestGmailComprehensiveMailStorageEnabled: assert len(findings) == 1 assert findings[0].status == "PASS" assert "enabled" in findings[0].status_extended - assert findings[0].resource_name == DOMAIN + assert findings[0].resource_name == "Gmail Policies" assert findings[0].customer_id == CUSTOMER_ID def test_fail_disabled(self): diff --git a/tests/providers/googleworkspace/services/gmail/gmail_domain_spoofing_protection_enabled/gmail_domain_spoofing_protection_enabled_test.py b/tests/providers/googleworkspace/services/gmail/gmail_domain_spoofing_protection_enabled/gmail_domain_spoofing_protection_enabled_test.py index db16061744..de18c6d9c6 100644 --- a/tests/providers/googleworkspace/services/gmail/gmail_domain_spoofing_protection_enabled/gmail_domain_spoofing_protection_enabled_test.py +++ b/tests/providers/googleworkspace/services/gmail/gmail_domain_spoofing_protection_enabled/gmail_domain_spoofing_protection_enabled_test.py @@ -3,7 +3,6 @@ from unittest.mock import patch from prowler.providers.googleworkspace.services.gmail.gmail_service import GmailPolicies from tests.providers.googleworkspace.googleworkspace_fixtures import ( CUSTOMER_ID, - DOMAIN, set_mocked_googleworkspace_provider, ) @@ -38,7 +37,7 @@ class TestGmailDomainSpoofingProtectionEnabled: assert len(findings) == 1 assert findings[0].status == "PASS" assert "SPAM_FOLDER" in findings[0].status_extended - assert findings[0].resource_name == DOMAIN + assert findings[0].resource_name == "Gmail Policies" assert findings[0].customer_id == CUSTOMER_ID def test_fail_no_action(self): diff --git a/tests/providers/googleworkspace/services/gmail/gmail_employee_name_spoofing_protection_enabled/gmail_employee_name_spoofing_protection_enabled_test.py b/tests/providers/googleworkspace/services/gmail/gmail_employee_name_spoofing_protection_enabled/gmail_employee_name_spoofing_protection_enabled_test.py index d8a204a6de..d30284b852 100644 --- a/tests/providers/googleworkspace/services/gmail/gmail_employee_name_spoofing_protection_enabled/gmail_employee_name_spoofing_protection_enabled_test.py +++ b/tests/providers/googleworkspace/services/gmail/gmail_employee_name_spoofing_protection_enabled/gmail_employee_name_spoofing_protection_enabled_test.py @@ -3,7 +3,6 @@ from unittest.mock import patch from prowler.providers.googleworkspace.services.gmail.gmail_service import GmailPolicies from tests.providers.googleworkspace.googleworkspace_fixtures import ( CUSTOMER_ID, - DOMAIN, set_mocked_googleworkspace_provider, ) @@ -38,7 +37,7 @@ class TestGmailEmployeeNameSpoofingProtectionEnabled: assert len(findings) == 1 assert findings[0].status == "PASS" assert "SPAM_FOLDER" in findings[0].status_extended - assert findings[0].resource_name == DOMAIN + assert findings[0].resource_name == "Gmail Policies" assert findings[0].customer_id == CUSTOMER_ID def test_fail_no_action(self): diff --git a/tests/providers/googleworkspace/services/gmail/gmail_encrypted_attachment_protection_enabled/gmail_encrypted_attachment_protection_enabled_test.py b/tests/providers/googleworkspace/services/gmail/gmail_encrypted_attachment_protection_enabled/gmail_encrypted_attachment_protection_enabled_test.py index 5b86095b0d..cc41ff3f66 100644 --- a/tests/providers/googleworkspace/services/gmail/gmail_encrypted_attachment_protection_enabled/gmail_encrypted_attachment_protection_enabled_test.py +++ b/tests/providers/googleworkspace/services/gmail/gmail_encrypted_attachment_protection_enabled/gmail_encrypted_attachment_protection_enabled_test.py @@ -3,7 +3,6 @@ from unittest.mock import patch from prowler.providers.googleworkspace.services.gmail.gmail_service import GmailPolicies from tests.providers.googleworkspace.googleworkspace_fixtures import ( CUSTOMER_ID, - DOMAIN, set_mocked_googleworkspace_provider, ) @@ -38,7 +37,7 @@ class TestGmailEncryptedAttachmentProtectionEnabled: assert len(findings) == 1 assert findings[0].status == "PASS" assert "QUARANTINE" in findings[0].status_extended - assert findings[0].resource_name == DOMAIN + assert findings[0].resource_name == "Gmail Policies" assert findings[0].customer_id == CUSTOMER_ID def test_fail_no_action(self): diff --git a/tests/providers/googleworkspace/services/gmail/gmail_enhanced_pre_delivery_scanning_enabled/gmail_enhanced_pre_delivery_scanning_enabled_test.py b/tests/providers/googleworkspace/services/gmail/gmail_enhanced_pre_delivery_scanning_enabled/gmail_enhanced_pre_delivery_scanning_enabled_test.py index 140a41ec99..823f7ee899 100644 --- a/tests/providers/googleworkspace/services/gmail/gmail_enhanced_pre_delivery_scanning_enabled/gmail_enhanced_pre_delivery_scanning_enabled_test.py +++ b/tests/providers/googleworkspace/services/gmail/gmail_enhanced_pre_delivery_scanning_enabled/gmail_enhanced_pre_delivery_scanning_enabled_test.py @@ -3,7 +3,6 @@ from unittest.mock import patch from prowler.providers.googleworkspace.services.gmail.gmail_service import GmailPolicies from tests.providers.googleworkspace.googleworkspace_fixtures import ( CUSTOMER_ID, - DOMAIN, set_mocked_googleworkspace_provider, ) @@ -37,7 +36,7 @@ class TestGmailEnhancedPreDeliveryScanningEnabled: assert len(findings) == 1 assert findings[0].status == "PASS" assert "enabled" in findings[0].status_extended - assert findings[0].resource_name == DOMAIN + assert findings[0].resource_name == "Gmail Policies" assert findings[0].customer_id == CUSTOMER_ID def test_fail_disabled(self): diff --git a/tests/providers/googleworkspace/services/gmail/gmail_external_image_scanning_enabled/gmail_external_image_scanning_enabled_test.py b/tests/providers/googleworkspace/services/gmail/gmail_external_image_scanning_enabled/gmail_external_image_scanning_enabled_test.py index a720df1c43..17b0bf7624 100644 --- a/tests/providers/googleworkspace/services/gmail/gmail_external_image_scanning_enabled/gmail_external_image_scanning_enabled_test.py +++ b/tests/providers/googleworkspace/services/gmail/gmail_external_image_scanning_enabled/gmail_external_image_scanning_enabled_test.py @@ -3,7 +3,6 @@ from unittest.mock import patch from prowler.providers.googleworkspace.services.gmail.gmail_service import GmailPolicies from tests.providers.googleworkspace.googleworkspace_fixtures import ( CUSTOMER_ID, - DOMAIN, set_mocked_googleworkspace_provider, ) @@ -35,7 +34,7 @@ class TestGmailExternalImageScanningEnabled: assert len(findings) == 1 assert findings[0].status == "PASS" assert "enabled" in findings[0].status_extended - assert findings[0].resource_name == DOMAIN + assert findings[0].resource_name == "Gmail Policies" assert findings[0].customer_id == CUSTOMER_ID def test_fail_disabled(self): diff --git a/tests/providers/googleworkspace/services/gmail/gmail_groups_spoofing_protection_enabled/gmail_groups_spoofing_protection_enabled_test.py b/tests/providers/googleworkspace/services/gmail/gmail_groups_spoofing_protection_enabled/gmail_groups_spoofing_protection_enabled_test.py index 704fc8d2bb..b06092ebe5 100644 --- a/tests/providers/googleworkspace/services/gmail/gmail_groups_spoofing_protection_enabled/gmail_groups_spoofing_protection_enabled_test.py +++ b/tests/providers/googleworkspace/services/gmail/gmail_groups_spoofing_protection_enabled/gmail_groups_spoofing_protection_enabled_test.py @@ -3,7 +3,6 @@ from unittest.mock import patch from prowler.providers.googleworkspace.services.gmail.gmail_service import GmailPolicies from tests.providers.googleworkspace.googleworkspace_fixtures import ( CUSTOMER_ID, - DOMAIN, set_mocked_googleworkspace_provider, ) @@ -39,7 +38,7 @@ class TestGmailGroupsSpoofingProtectionEnabled: assert findings[0].status == "PASS" assert "all groups" in findings[0].status_extended assert "SPAM_FOLDER" in findings[0].status_extended - assert findings[0].resource_name == DOMAIN + assert findings[0].resource_name == "Gmail Policies" assert findings[0].customer_id == CUSTOMER_ID def test_pass_private_groups_only(self): diff --git a/tests/providers/googleworkspace/services/gmail/gmail_inbound_domain_spoofing_protection_enabled/gmail_inbound_domain_spoofing_protection_enabled_test.py b/tests/providers/googleworkspace/services/gmail/gmail_inbound_domain_spoofing_protection_enabled/gmail_inbound_domain_spoofing_protection_enabled_test.py index bae9d42b49..b319b8fdb1 100644 --- a/tests/providers/googleworkspace/services/gmail/gmail_inbound_domain_spoofing_protection_enabled/gmail_inbound_domain_spoofing_protection_enabled_test.py +++ b/tests/providers/googleworkspace/services/gmail/gmail_inbound_domain_spoofing_protection_enabled/gmail_inbound_domain_spoofing_protection_enabled_test.py @@ -3,7 +3,6 @@ from unittest.mock import patch from prowler.providers.googleworkspace.services.gmail.gmail_service import GmailPolicies from tests.providers.googleworkspace.googleworkspace_fixtures import ( CUSTOMER_ID, - DOMAIN, set_mocked_googleworkspace_provider, ) @@ -38,7 +37,7 @@ class TestGmailInboundDomainSpoofingProtectionEnabled: assert len(findings) == 1 assert findings[0].status == "PASS" assert "QUARANTINE" in findings[0].status_extended - assert findings[0].resource_name == DOMAIN + assert findings[0].resource_name == "Gmail Policies" assert findings[0].customer_id == CUSTOMER_ID def test_fail_no_action(self): diff --git a/tests/providers/googleworkspace/services/gmail/gmail_mail_delegation_disabled/gmail_mail_delegation_disabled_test.py b/tests/providers/googleworkspace/services/gmail/gmail_mail_delegation_disabled/gmail_mail_delegation_disabled_test.py index f42062cc7e..e471d030ff 100644 --- a/tests/providers/googleworkspace/services/gmail/gmail_mail_delegation_disabled/gmail_mail_delegation_disabled_test.py +++ b/tests/providers/googleworkspace/services/gmail/gmail_mail_delegation_disabled/gmail_mail_delegation_disabled_test.py @@ -3,7 +3,6 @@ from unittest.mock import patch from prowler.providers.googleworkspace.services.gmail.gmail_service import GmailPolicies from tests.providers.googleworkspace.googleworkspace_fixtures import ( CUSTOMER_ID, - DOMAIN, set_mocked_googleworkspace_provider, ) @@ -35,7 +34,7 @@ class TestGmailMailDelegationDisabled: assert len(findings) == 1 assert findings[0].status == "PASS" assert "disabled" in findings[0].status_extended - assert findings[0].resource_name == DOMAIN + assert findings[0].resource_name == "Gmail Policies" assert findings[0].customer_id == CUSTOMER_ID def test_fail_delegation_enabled(self): diff --git a/tests/providers/googleworkspace/services/gmail/gmail_per_user_outbound_gateway_disabled/gmail_per_user_outbound_gateway_disabled_test.py b/tests/providers/googleworkspace/services/gmail/gmail_per_user_outbound_gateway_disabled/gmail_per_user_outbound_gateway_disabled_test.py index 12c1267a07..2fe105df42 100644 --- a/tests/providers/googleworkspace/services/gmail/gmail_per_user_outbound_gateway_disabled/gmail_per_user_outbound_gateway_disabled_test.py +++ b/tests/providers/googleworkspace/services/gmail/gmail_per_user_outbound_gateway_disabled/gmail_per_user_outbound_gateway_disabled_test.py @@ -3,7 +3,6 @@ from unittest.mock import patch from prowler.providers.googleworkspace.services.gmail.gmail_service import GmailPolicies from tests.providers.googleworkspace.googleworkspace_fixtures import ( CUSTOMER_ID, - DOMAIN, set_mocked_googleworkspace_provider, ) @@ -35,7 +34,7 @@ class TestGmailPerUserOutboundGatewayDisabled: assert len(findings) == 1 assert findings[0].status == "PASS" assert "disabled" in findings[0].status_extended - assert findings[0].resource_name == DOMAIN + assert findings[0].resource_name == "Gmail Policies" assert findings[0].customer_id == CUSTOMER_ID def test_fail_disabled(self): diff --git a/tests/providers/googleworkspace/services/gmail/gmail_pop_imap_access_disabled/gmail_pop_imap_access_disabled_test.py b/tests/providers/googleworkspace/services/gmail/gmail_pop_imap_access_disabled/gmail_pop_imap_access_disabled_test.py index 58c939b4f6..d5f87ac2c8 100644 --- a/tests/providers/googleworkspace/services/gmail/gmail_pop_imap_access_disabled/gmail_pop_imap_access_disabled_test.py +++ b/tests/providers/googleworkspace/services/gmail/gmail_pop_imap_access_disabled/gmail_pop_imap_access_disabled_test.py @@ -3,7 +3,6 @@ from unittest.mock import patch from prowler.providers.googleworkspace.services.gmail.gmail_service import GmailPolicies from tests.providers.googleworkspace.googleworkspace_fixtures import ( CUSTOMER_ID, - DOMAIN, set_mocked_googleworkspace_provider, ) @@ -37,7 +36,7 @@ class TestGmailPopImapAccessDisabled: assert len(findings) == 1 assert findings[0].status == "PASS" assert "disabled" in findings[0].status_extended - assert findings[0].resource_name == DOMAIN + assert findings[0].resource_name == "Gmail Policies" assert findings[0].customer_id == CUSTOMER_ID def test_fail_both_enabled(self): diff --git a/tests/providers/googleworkspace/services/gmail/gmail_script_attachment_protection_enabled/gmail_script_attachment_protection_enabled_test.py b/tests/providers/googleworkspace/services/gmail/gmail_script_attachment_protection_enabled/gmail_script_attachment_protection_enabled_test.py index 25333e195b..9f04178457 100644 --- a/tests/providers/googleworkspace/services/gmail/gmail_script_attachment_protection_enabled/gmail_script_attachment_protection_enabled_test.py +++ b/tests/providers/googleworkspace/services/gmail/gmail_script_attachment_protection_enabled/gmail_script_attachment_protection_enabled_test.py @@ -3,7 +3,6 @@ from unittest.mock import patch from prowler.providers.googleworkspace.services.gmail.gmail_service import GmailPolicies from tests.providers.googleworkspace.googleworkspace_fixtures import ( CUSTOMER_ID, - DOMAIN, set_mocked_googleworkspace_provider, ) @@ -38,7 +37,7 @@ class TestGmailScriptAttachmentProtectionEnabled: assert len(findings) == 1 assert findings[0].status == "PASS" assert "QUARANTINE" in findings[0].status_extended - assert findings[0].resource_name == DOMAIN + assert findings[0].resource_name == "Gmail Policies" assert findings[0].customer_id == CUSTOMER_ID def test_fail_no_action(self): diff --git a/tests/providers/googleworkspace/services/gmail/gmail_shortener_scanning_enabled/gmail_shortener_scanning_enabled_test.py b/tests/providers/googleworkspace/services/gmail/gmail_shortener_scanning_enabled/gmail_shortener_scanning_enabled_test.py index adfde86db6..11fbe29098 100644 --- a/tests/providers/googleworkspace/services/gmail/gmail_shortener_scanning_enabled/gmail_shortener_scanning_enabled_test.py +++ b/tests/providers/googleworkspace/services/gmail/gmail_shortener_scanning_enabled/gmail_shortener_scanning_enabled_test.py @@ -3,7 +3,6 @@ from unittest.mock import patch from prowler.providers.googleworkspace.services.gmail.gmail_service import GmailPolicies from tests.providers.googleworkspace.googleworkspace_fixtures import ( CUSTOMER_ID, - DOMAIN, set_mocked_googleworkspace_provider, ) @@ -35,7 +34,7 @@ class TestGmailShortenerScanningEnabled: assert len(findings) == 1 assert findings[0].status == "PASS" assert "enabled" in findings[0].status_extended - assert findings[0].resource_name == DOMAIN + assert findings[0].resource_name == "Gmail Policies" assert findings[0].customer_id == CUSTOMER_ID def test_fail_disabled(self): diff --git a/tests/providers/googleworkspace/services/gmail/gmail_unauthenticated_email_protection_enabled/gmail_unauthenticated_email_protection_enabled_test.py b/tests/providers/googleworkspace/services/gmail/gmail_unauthenticated_email_protection_enabled/gmail_unauthenticated_email_protection_enabled_test.py index 90d9beefcc..3a8fd0d337 100644 --- a/tests/providers/googleworkspace/services/gmail/gmail_unauthenticated_email_protection_enabled/gmail_unauthenticated_email_protection_enabled_test.py +++ b/tests/providers/googleworkspace/services/gmail/gmail_unauthenticated_email_protection_enabled/gmail_unauthenticated_email_protection_enabled_test.py @@ -3,7 +3,6 @@ from unittest.mock import patch from prowler.providers.googleworkspace.services.gmail.gmail_service import GmailPolicies from tests.providers.googleworkspace.googleworkspace_fixtures import ( CUSTOMER_ID, - DOMAIN, set_mocked_googleworkspace_provider, ) @@ -38,7 +37,7 @@ class TestGmailUnauthenticatedEmailProtectionEnabled: assert len(findings) == 1 assert findings[0].status == "PASS" assert "WARNING" in findings[0].status_extended - assert findings[0].resource_name == DOMAIN + assert findings[0].resource_name == "Gmail Policies" assert findings[0].customer_id == CUSTOMER_ID def test_fail_no_action(self): diff --git a/tests/providers/googleworkspace/services/gmail/gmail_untrusted_link_warnings_enabled/gmail_untrusted_link_warnings_enabled_test.py b/tests/providers/googleworkspace/services/gmail/gmail_untrusted_link_warnings_enabled/gmail_untrusted_link_warnings_enabled_test.py index 9146f699c2..70fc539836 100644 --- a/tests/providers/googleworkspace/services/gmail/gmail_untrusted_link_warnings_enabled/gmail_untrusted_link_warnings_enabled_test.py +++ b/tests/providers/googleworkspace/services/gmail/gmail_untrusted_link_warnings_enabled/gmail_untrusted_link_warnings_enabled_test.py @@ -3,7 +3,6 @@ from unittest.mock import patch from prowler.providers.googleworkspace.services.gmail.gmail_service import GmailPolicies from tests.providers.googleworkspace.googleworkspace_fixtures import ( CUSTOMER_ID, - DOMAIN, set_mocked_googleworkspace_provider, ) @@ -37,7 +36,7 @@ class TestGmailUntrustedLinkWarningsEnabled: assert len(findings) == 1 assert findings[0].status == "PASS" assert "enabled" in findings[0].status_extended - assert findings[0].resource_name == DOMAIN + assert findings[0].resource_name == "Gmail Policies" assert findings[0].customer_id == CUSTOMER_ID def test_fail_disabled(self):