diff options
Diffstat (limited to 'Mailman')
| -rw-r--r-- | Mailman/Handlers/SpamDetect.py | 1 | ||||
| -rw-r--r-- | Mailman/Utils.py | 16 | ||||
| -rw-r--r-- | Mailman/Version.py | 4 |
3 files changed, 17 insertions, 4 deletions
diff --git a/Mailman/Handlers/SpamDetect.py b/Mailman/Handlers/SpamDetect.py index aaddff5f..257cdb24 100644 --- a/Mailman/Handlers/SpamDetect.py +++ b/Mailman/Handlers/SpamDetect.py @@ -117,6 +117,7 @@ def process(mlist, msg, msgdata): if text: text = Utils.wrap(text) else: + listowner = mlist.GetOwnerEmail() text = Utils.wrap(_( """You are not allowed to post to this mailing list From: a domain which publishes a DMARC policy of reject or quarantine, and your message has been diff --git a/Mailman/Utils.py b/Mailman/Utils.py index 75481563..9dbd0b55 100644 --- a/Mailman/Utils.py +++ b/Mailman/Utils.py @@ -1267,11 +1267,23 @@ def _DMARCProhibited(mlist, email, dmarc_domain, org=False): txt_recs = resolver.query(dmarc_domain, dns.rdatatype.TXT) except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer): return 'continue' + except (dns.resolver.NoNameservers): + syslog('error', + 'DNSException: No Nameservers available for %s (%s)', + email, dmarc_domain) + # Typically this means a dnssec validation error. Clients that don't + # perform validation *may* successfully see a _dmarc RR whereas a + # validating mailman server won't see the _dmarc RR. We should + # mitigate this email to be safe. + return True except DNSException, e: syslog('error', 'DNSException: Unable to query DMARC policy for %s (%s). %s', - email, dmarc_domain, e.__doc__) - return 'continue' + email, dmarc_domain, e.__doc__) + # While we can't be sure what caused the error, there is potentially + # a DMARC policy record that we missed and that a receiver of the mail + # might see. Thus, we should err on the side of caution and mitigate. + return True else: # Be as robust as possible in parsing the result. results_by_name = {} diff --git a/Mailman/Version.py b/Mailman/Version.py index 48fea21d..28ac4daf 100644 --- a/Mailman/Version.py +++ b/Mailman/Version.py @@ -16,7 +16,7 @@ # USA. # Mailman version -VERSION = '2.1.24' +VERSION = '2.1.25' # And as a hex number in the manner of PY_VERSION_HEX ALPHA = 0xa @@ -28,7 +28,7 @@ FINAL = 0xf MAJOR_REV = 2 MINOR_REV = 1 -MICRO_REV = 24 +MICRO_REV = 25 REL_LEVEL = FINAL # at most 15 beta releases! REL_SERIAL = 0 |