🐛(dns) relax DNS record whitespace checks

Author: sylvinus

src/backend/core/services/dns/check.py

@@ -2,13 +2,21 @@
 DNS checking functionality for mail domains.
 """
 
+import re
 from typing import Dict, List
 
 from core.models import MailDomain
 
 import dns.resolver
 
 
+def normalize_txt_value(value: str) -> str:
+    """
+    Normalize a TXT record value.
+    """
+    return re.sub(r"\s*\;\s*", ";", value.strip('"'))
+
+
 def check_single_record(
     maildomain: MailDomain, expected_record: Dict[str, any]
 ) -> Dict[str, any]:
@@ -46,7 +54,10 @@ def check_single_record(
                     answer.to_text().strip('"').replace('" "', "") for answer in answers
                 ]
             else:
-                found_values = [answer.to_text().strip('"') for answer in answers]
+                found_values = [
+                    normalize_txt_value(answer.to_text()) for answer in answers
+                ]
+            expected_value = normalize_txt_value(expected_value)
         else:
             # For other record types, try to resolve them as-is
             answers = dns.resolver.resolve(query_name, record_type)

src/backend/core/tests/dns/test_check.py

@@ -213,31 +213,72 @@ def test_check_dns_records_multiple_records(self, maildomain_factory):
                     "target": "@",
                     "value": "v=spf1 include:_spf.example.com -all",
                 },
+                {
+                    "type": "TXT",
+                    "target": "_dmarc",
+                    "value": "v=DMARC1; p=reject; adkim=s; aspf=s;",
+                },
+                {
+                    "type": "TXT",
+                    "target": "_dmarc_stripped",
+                    "value": "v=DMARC1;p=reject;adkim=s;aspf=s; ",
+                },
+                {
+                    "type": "TXT",
+                    "target": "_dmarc_missing",
+                    "value": "v=DMARC1;p=reject;adkim=s;aspf=s; ",
+                },
             ]
 
             with patch("core.services.dns.check.dns.resolver.resolve") as mock_resolve:
-                # Mock responses for both records
-                mock_mx_answer = MagicMock()
-                mock_mx_answer.preference = 10
-                mock_mx_answer.exchange = "mx1.example.com"
 
-                mock_txt_answer = MagicMock()
-                mock_txt_answer.to_text.return_value = (
-                    '"v=spf1 include:_spf.example.com -all"'
-                )
-
-                mock_resolve.side_effect = [
-                    [mock_mx_answer],  # MX record response
-                    [mock_txt_answer],  # TXT record response
-                ]
+                def resolve_side_effect(name, record_type):
+                    if name == "_dmarc_missing.example.com":
+                        raise NoAnswer()
+
+                    if record_type == "MX":
+                        mock_mx_answer = MagicMock()
+                        mock_mx_answer.preference = 10
+                        mock_mx_answer.exchange = "mx1.example.com"
+                        return [mock_mx_answer]
+
+                    if record_type == "TXT" and name == "@.example.com":
+                        mock_txt_answer = MagicMock()
+                        mock_txt_answer.to_text.return_value = (
+                            '"v=spf1 include:_spf.example.com -all"'
+                        )
+                        garbage = MagicMock()
+                        garbage.to_text.return_value = "some-garbage"
+                        return [garbage, mock_txt_answer, garbage]
+
+                    if (
+                        record_type == "TXT"
+                        and name == "_dmarc.example.com"
+                        or name == "_dmarc_stripped.example.com"
+                    ):
+                        mock_txt_dmarc_answer = MagicMock()
+                        mock_txt_dmarc_answer.to_text.return_value = (
+                            '"v=DMARC1; p=reject; adkim=s; aspf=s;"'
+                        )
+                        return [mock_txt_dmarc_answer]
+
+                    return []
+
+                mock_resolve.side_effect = resolve_side_effect
 
                 results = check_dns_records(maildomain)
 
-                assert len(results) == 2
+                assert len(results) == 5
                 assert results[0]["type"] == "MX"
-                assert results[0]["_check"]["status"] == "correct"
+                assert results[0]["_check"]["status"] == "correct", results[0]
                 assert results[1]["type"] == "TXT"
-                assert results[1]["_check"]["status"] == "correct"
+                assert results[1]["_check"]["status"] == "correct", results[1]
+                assert results[2]["type"] == "TXT"
+                assert results[2]["_check"]["status"] == "correct", results[2]
+                assert results[3]["type"] == "TXT"
+                assert results[3]["_check"]["status"] == "correct", results[3]
+                assert results[4]["type"] == "TXT"
+                assert results[4]["_check"]["status"] == "missing"
 
     def test_check_dns_records_mixed_status(self, maildomain_factory):
         """Test checking DNS records with mixed status (correct, incorrect, missing)."""