aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman
diff options
context:
space:
mode:
authorJim Popovitch <jimpop@gmail.com>2013-10-20 21:39:23 +0000
committerJim Popovitch <jimpop@gmail.com>2013-10-20 21:39:23 +0000
commita1bf240906a8774ae63f1c3299ebd1079c217cce (patch)
tree0ecad8555294b72ebc5a28d964d19855497101bc /Mailman
parent049bf74c65b72e5584d4f7879057fc33f9fce26b (diff)
downloadmailman2-a1bf240906a8774ae63f1c3299ebd1079c217cce.tar.gz
mailman2-a1bf240906a8774ae63f1c3299ebd1079c217cce.tar.xz
mailman2-a1bf240906a8774ae63f1c3299ebd1079c217cce.zip
Incorporated some feedback from Mark S.
Diffstat (limited to 'Mailman')
-rw-r--r--Mailman/Handlers/Moderate.py16
-rwxr-xr-xMailman/MailList.py2
-rw-r--r--Mailman/Utils.py2
3 files changed, 7 insertions, 13 deletions
diff --git a/Mailman/Handlers/Moderate.py b/Mailman/Handlers/Moderate.py
index 81b554e4..9b5f0600 100644
--- a/Mailman/Handlers/Moderate.py
+++ b/Mailman/Handlers/Moderate.py
@@ -57,13 +57,13 @@ def process(mlist, msg, msgdata):
sender = None
if sender:
if Utils.IsDmarcProhibited(sender):
- # Note that for dmarc_moderation_action, 0==Hold, 1=Reject,
- # 2==Discard
- if mlist.dmarc_moderation_action == 0:
+ # Note that for dmarc_moderation_action, 0 = Accept,
+ # 1 = Hold, 2 = Reject, 3 = Discard
+ if mlist.dmarc_moderation_action == 1:
msgdata['sender'] = sender
Hold.hold_for_approval(mlist, msg, msgdata,
ModeratedMemberPost)
- elif mlist.dmarc_moderation_action == 1:
+ elif mlist.dmarc_moderation_action == 2:
# Reject
text = mlist.dmarc_moderation_notice
if text:
@@ -72,14 +72,8 @@ def process(mlist, msg, msgdata):
# Use the default RejectMessage notice string
text = None
raise Errors.RejectMessage, text
- elif mlist.dmarc_moderation_action == 2:
+ elif mlist.dmarc_moderation_action == 3:
raise Errors.DiscardMessage
- else:
- assert 0, 'bad dmarc_moderation_action'
-
- # sender's domain has a 'p=reject' _dmarc TXT record,
- # we should NOT automatically reflect this email
- return
# If the member's moderation flag is on, then perform the moderation
# action.
diff --git a/Mailman/MailList.py b/Mailman/MailList.py
index a51f4ea6..4a3e92a8 100755
--- a/Mailman/MailList.py
+++ b/Mailman/MailList.py
@@ -388,7 +388,7 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin,
# 2==Discard
self.member_moderation_action = 0
self.member_moderation_notice = ''
- self.dmarc_moderation_action = 0
+ self.dmarc_moderation_action = mm_cfg.DEFAULT_DMARC_MODERATION_ACTION
self.dmarc_moderation_notice = ''
self.accept_these_nonmembers = []
self.hold_these_nonmembers = []
diff --git a/Mailman/Utils.py b/Mailman/Utils.py
index 6c839a3c..ec9174c7 100644
--- a/Mailman/Utils.py
+++ b/Mailman/Utils.py
@@ -1079,7 +1079,7 @@ def IsDmarcProhibited(email):
try:
resolver = dns.resolver.Resolver()
- resolver.timeout = 1
+ resolver.timeout = 3
resolver.lifetime = 5
txt_recs = resolver.query(dmarc_domain, dns.rdatatype.TXT)
except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer):