aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2021-06-06 10:55:49 -0700
committerMark Sapiro <mark@msapiro.net>2021-06-06 10:55:49 -0700
commit61bc9dd01f3bafa9c5f9687b34fb20e9beace5cd (patch)
tree0bbdbc21ba9b5efdd3319c7789c66142f567af9f
parent5a9f8b6ae30f93bdff8f7a198f59d9ef74165faa (diff)
downloadmailman2-61bc9dd01f3bafa9c5f9687b34fb20e9beace5cd.tar.gz
mailman2-61bc9dd01f3bafa9c5f9687b34fb20e9beace5cd.tar.xz
mailman2-61bc9dd01f3bafa9c5f9687b34fb20e9beace5cd.zip
DMARC policy ignores domains with multiple DMARC records.
-rw-r--r--Mailman/Utils.py3
-rw-r--r--NEWS3
2 files changed, 5 insertions, 1 deletions
diff --git a/Mailman/Utils.py b/Mailman/Utils.py
index 2615229b..c61f7e2c 100644
--- a/Mailman/Utils.py
+++ b/Mailman/Utils.py
@@ -1380,8 +1380,9 @@ def _DMARCProhibited(mlist, email, dmarc_domain, org=False):
if len(dmarcs) > 1:
syslog('error',
"""RRset of TXT records for %s has %d v=DMARC1 entries;
- testing them all""",
+ ignoring them per RFC 7849""",
dmarc_domain, len(dmarcs))
+ return False
for entry in dmarcs:
mo = re.search(r'\bsp=(\w*)\b', entry, re.IGNORECASE)
if org and mo:
diff --git a/NEWS b/NEWS
index a1cf751f..31c6925b 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,9 @@ Here is a history of user visible changes to Mailman.
- Delivery disabled by bounce notices to admins now have 'disabled'
properly translated. (LP: #1922843)
+ - DMARC policy discovery ignores domains with multiple DMARC records per
+ RFC 7849, (LP: 1931029)
+
2.1.34 (26-Jun-2020)
i18n