PR comments

app/config.py

@@ -422,7 +422,7 @@ ZENDESK_HOST = os.environ.get("ZENDESK_HOST")
 ZENDESK_API_TOKEN = os.environ.get("ZENDESK_API_TOKEN")
 ZENDESK_ENABLED = "ZENDESK_ENABLED" in os.environ
 
-ENABLE_DMARC_CHECK = os.environ.get("ENABLE_DMARC_CHECK")
+DMARC_CHECK_ENABLED = "DMARC_CHECK_ENABLED" in os.environ
 
 
 def get_allowed_redirect_domains() -> List[str]:

email_handler.py

@@ -87,7 +87,7 @@ from app.config import (
     OLD_UNSUBSCRIBER,
     ALERT_FROM_ADDRESS_IS_REVERSE_ALIAS,
     ALERT_TO_NOREPLY,
-    ENABLE_DMARC_CHECK,
+    DMARC_CHECK_ENABLED,
 )
 from app.db import Session
 from app.email import status, headers
@@ -544,7 +544,7 @@ def apply_dmarc_policy(alias: Alias, contact: Contact, msg: Message) -> Optional
     newrelic.agent.record_custom_event(
         "Custom/dmarc_check", {"result": dmarc_result.name}
     )
-    if not ENABLE_DMARC_CHECK:
+    if not DMARC_CHECK_ENABLED:
         return None
     if dmarc_result in (
         DmarcCheckResult.quarantine,

tests/test.env

@@ -54,4 +54,4 @@ PGP_SENDER_PRIVATE_KEY_PATH=local_data/private-pgp.asc
 ALIAS_AUTOMATIC_DISABLE=true
 ALLOWED_REDIRECT_DOMAINS=["test.simplelogin.local"]
 
-ENABLE_DMARC_CHECK=true
+DMARC_CHECK_ENABLED=true