aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2013-11-18 20:52:17 -0800
committerMark Sapiro <mark@msapiro.net>2013-11-18 20:52:17 -0800
commit4fe3dcd8a64ce0d2d55b88066460a3f4381e1286 (patch)
tree8499ad19bdba2d5720e41286875d95fbb8598a47
parentded18dda2b2f9ba00f8780b4eba6c398c5bff838 (diff)
downloadmailman2-4fe3dcd8a64ce0d2d55b88066460a3f4381e1286.tar.gz
mailman2-4fe3dcd8a64ce0d2d55b88066460a3f4381e1286.tar.xz
mailman2-4fe3dcd8a64ce0d2d55b88066460a3f4381e1286.zip
- Handling of posts gated from usenet to a list via the Mail <-> News
gateway is changed. Formerly, no list membership, moderation or *_these_nonmembers checks were done. Now, if the sender of the usenet post is a moderated member or a nonmember matching a *_these_nonmembers filter, those checks will be done and actions applied. Nonmember posts from senders not matching a *_these_nonmembers filter are still accepted as before. (LP: #1252575)
-rw-r--r--Mailman/Handlers/Moderate.py6
-rwxr-xr-xNEWS8
2 files changed, 11 insertions, 3 deletions
diff --git a/Mailman/Handlers/Moderate.py b/Mailman/Handlers/Moderate.py
index 199c97ac..42dffb88 100644
--- a/Mailman/Handlers/Moderate.py
+++ b/Mailman/Handlers/Moderate.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2011 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -47,7 +47,7 @@ class ModeratedMemberPost(Hold.ModeratedPost):
def process(mlist, msg, msgdata):
- if msgdata.get('approved') or msgdata.get('fromusenet'):
+ if msgdata.get('approved'):
return
# First of all, is the poster a member or not?
for sender in msg.get_senders():
@@ -105,7 +105,7 @@ def process(mlist, msg, msgdata):
# moderation configuration variables. Handle by way of generic non-member
# action.
assert 0 <= mlist.generic_nonmember_action <= 4
- if mlist.generic_nonmember_action == 0:
+ if mlist.generic_nonmember_action == 0 or msgdata.get('fromusenet'):
# Accept
return
elif mlist.generic_nonmember_action == 1:
diff --git a/NEWS b/NEWS
index 2b23931a..af4ff973 100755
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,14 @@ Here is a history of user visible changes to Mailman.
New Features
+ - Handling of posts gated from usenet to a list via the Mail <-> News
+ gateway is changed. Formerly, no list membership, moderation or
+ *_these_nonmembers checks were done. Now, if the sender of the usenet
+ post is a moderated member or a nonmember matching a *_these_nonmembers
+ filter, those checks will be done and actions applied. Nonmember posts
+ from senders not matching a *_these_nonmembers filter are still accepted
+ as before. (LP: #1252575)
+
- There is a new mm_cfg.py setting ANONYMOUS_LIST_KEEP_HEADERS. Since it
is not possible to know which non-standard headers in a message might
reveal sender information, we now remove all headers from incoming posts