------------------------------------------------------------
revno: 1336
committer: Mark Sapiro <m...@msapiro.net>
branch nick: 2.2
timestamp: Fri 2014-05-02 20:25:48 -0700
message:
Make dmarc_quarantine_moderaction_action a list setting.
modified:
Mailman/Defaults.py.in
Mailman/Gui/Privacy.py
Mailman/Handlers/Moderate.py
Mailman/MailList.py
Mailman/Utils.py
Mailman/Version.py
Mailman/versions.py
NEWS
--
lp:mailman/2.2
https://code.launchpad.net/~mailman-coders/mailman/2.2
Your team Mailman Checkins is subscribed to branch lp:mailman/2.2.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.2/+edit-subscription
=== modified file 'Mailman/Defaults.py.in'
--- Mailman/Defaults.py.in 2014-05-02 18:43:12 +0000
+++ Mailman/Defaults.py.in 2014-05-03 03:25:48 +0000
@@ -1061,8 +1061,9 @@
DEFAULT_FORWARD_AUTO_DISCARDS = Yes
# Shall dmarc_moderation_action be applied to messages From: domains with
-# a DMARC policy of quarantine as well as reject?
-DMARC_QUARANTINE_MODERATION_ACTION = Yes
+# a DMARC policy of quarantine as well as reject? This sets the default for
+# the list setting that controls it.
+DEFAULT_DMARC_QUARANTINE_MODERATION_ACTION = Yes
# Default action for posts whose From: address domain has a DMARC policy of
# reject or quarantine. See DEFAULT_FROM_IS_LIST below. Whatever is set as
=== modified file 'Mailman/Gui/Privacy.py'
--- Mailman/Gui/Privacy.py 2014-04-21 20:11:13 +0000
+++ Mailman/Gui/Privacy.py 2014-05-03 03:25:48 +0000
@@ -168,7 +168,7 @@
adminurl = mlist.GetScriptURL('admin', absolute=1)
- if mm_cfg.DMARC_QUARANTINE_MODERATION_ACTION:
+ if mlist.dmarc_quarantine_moderation_action:
quarantine = _('/Quarantine')
else:
quarantine = ''
@@ -278,6 +278,23 @@
if the message is From: an affected domain and the setting is
other than Accept.""")),
+ ('dmarc_quarantine_moderation_action', mm_cfg.Radio,
+ (_('No'), _('Yes')), 0,
+ _("""Shall the above dmarc_moderation_action apply to messages
+ From: domains with DMARC p=quarantine as well as p=reject"""),
+
+ _("""<ul><li><b>No</b> -- this applies dmarc_moderation_action to
+ only those posts From: a domain with DMARC p=reject. This is
+ appropriate if you are concerned about bounced messages, but
+ want to apply dmarc_moderation_action to as few messages as
+ possible.
+ <p><li><b>Yes</b> -- this applies dmarc_moderation_action to
+ posts From: a domain with DMARC p=reject or p=quarantine.
+ </ul><p>If a message is From: a domain with DMARC p=quarantine
+ and dmarc_moderation_action is not applied (this set to No)
+ the message will likely not bounce, but will be delivered to
+ recipients' spam folders or other hard to find places.""")),
+
('dmarc_moderation_notice', mm_cfg.Text, (10, WIDTH), 1,
_("""Text to include in any
<a href="?VARHELP=privacy/sender/dmarc_moderation_action"
@@ -449,7 +466,7 @@
case, each rule is matched in turn, with processing stopped after
the first match.
- Note that headers are collected from all the attachments
+ Note that headers are collected from all the attachments
(except for the mailman administrivia message) and
matched against the regular expressions. With this feature,
you can effectively sort out messages with dangerous file
=== modified file 'Mailman/Handlers/Moderate.py'
--- Mailman/Handlers/Moderate.py 2014-05-02 18:43:12 +0000
+++ Mailman/Handlers/Moderate.py 2014-05-03 03:25:48 +0000
@@ -54,7 +54,7 @@
msgdata['from_is_list'] = 0
dn, addr = parseaddr(msg.get('from'))
if addr and mlist.dmarc_moderation_action > 0:
- if Utils.IsDMARCProhibited(addr):
+ if Utils.IsDMARCProhibited(mlist, addr):
# Note that for dmarc_moderation_action, 0 = Accept,
# 1 = Munge, 2 = Wrap, 3 = Reject, 4 = Discard
if mlist.dmarc_moderation_action == 1:
=== modified file 'Mailman/MailList.py'
--- Mailman/MailList.py 2014-04-16 21:45:55 +0000
+++ Mailman/MailList.py 2014-05-03 03:25:48 +0000
@@ -392,6 +392,8 @@
self.member_moderation_action = 0
self.member_moderation_notice = ''
self.dmarc_moderation_action = mm_cfg.DEFAULT_DMARC_MODERATION_ACTION
+ self.dmarc_quarantine_moderation_action = (
+ mm_cfg.DEFAULT_DMARC_QUARANTINE_MODERATION_ACTION)
self.dmarc_moderation_notice = ''
self.accept_these_nonmembers = []
self.hold_these_nonmembers = []
=== modified file 'Mailman/Utils.py'
--- Mailman/Utils.py 2014-05-02 18:43:12 +0000
+++ Mailman/Utils.py 2014-05-03 03:25:48 +0000
@@ -1124,7 +1124,7 @@
# This takes an email address, and returns True if DMARC policy is p=reject
# or possibly quarantine.
-def IsDMARCProhibited(email):
+def IsDMARCProhibited(mlist, email):
if not dns_resolver:
return False
@@ -1198,7 +1198,7 @@
email, dmarc_domain, name, entry)
return True
- if (mm_cfg.DMARC_QUARANTINE_MODERATION_ACTION and
+ if (mlist.dmarc_quarantine_moderation_action and
re.search(r'\bp=quarantine\b', entry, re.IGNORECASE)):
syslog('vette',
'DMARC lookup for %s (%s) found p=quarantine in %s = %s',
@@ -1207,4 +1207,3 @@
return False
-
=== modified file 'Mailman/Version.py'
--- Mailman/Version.py 2014-04-15 20:55:52 +0000
+++ Mailman/Version.py 2014-05-03 03:25:48 +0000
@@ -37,7 +37,7 @@
(REL_LEVEL << 4) | (REL_SERIAL << 0))
# config.pck schema version number
-DATA_FILE_VERSION = 104
+DATA_FILE_VERSION = 105
# qfile/*.db schema version number
QFILE_SCHEMA_VERSION = 3
=== modified file 'Mailman/versions.py'
--- Mailman/versions.py 2014-04-15 20:55:52 +0000
+++ Mailman/versions.py 2014-05-03 03:25:48 +0000
@@ -400,7 +400,9 @@
add_only_if_missing('member_moderation_action', 0)
add_only_if_missing('member_moderation_notice', '')
add_only_if_missing('dmarc_moderation_action',
- mm_cfg.DEFAULT_DMARC_MODERATION_ACTION)
+ mm_cfg.DEFAULT_DMARC_MODERATION_ACTION)
+ add_only_if_missing('dmarc_quarantine_moderation_action',
+ mm_cfg.DEFAULT_DMARC_QUARANTINE_MODERATION_ACTION)
add_only_if_missing('dmarc_moderation_notice', '')
add_only_if_missing('new_member_options',
mm_cfg.DEFAULT_NEW_MEMBER_OPTIONS)
=== modified file 'NEWS'
--- NEWS 2014-05-02 18:43:12 +0000
+++ NEWS 2014-05-03 03:25:48 +0000
@@ -72,9 +72,11 @@
default for this, and the list admin UI is not able to set an action
which is 'less' than the default. The prior ALLOW_FROM_IS_LIST setting
has been removed and is effectively always Yes. There is a new
- DMARC_QUARANTINE_MODERATION_ACTION configuration setting which defaults
- to Yes but can be set to No to exclude domains with DMARC policy of
- quarantine from dmarc_moderation_action.
+ dmarc_quarantine_moderation_action list setting with default set by a
+ new DEFAULT_DMARC_QUARANTINE_MODERATION_ACTION configuration setting
+ which in turn defaults to Yes. The list setting can be set to No to
+ exclude domains with DMARC policy of quarantine from
+ dmarc_moderation_action.
dmarc_moderation_action and from_is_list interact in the following way.
If the message is From: a domain to which dmarc_moderation_action applies
_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe:
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
