diff options
| -rw-r--r-- | src/mailman/docs/NEWS.rst | 3 | ||||
| -rw-r--r-- | src/mailman/rules/moderation.py | 4 | ||||
| -rw-r--r-- | src/mailman/rules/tests/test_moderation.py | 78 |
3 files changed, 85 insertions, 0 deletions
diff --git a/src/mailman/docs/NEWS.rst b/src/mailman/docs/NEWS.rst index 73728d5b2..37789526d 100644 --- a/src/mailman/docs/NEWS.rst +++ b/src/mailman/docs/NEWS.rst @@ -64,6 +64,9 @@ Bugs docstring for `display_name`. (LP: #1181498) * Fix importation from MM2.1 to MM3 of the archive policy. Given by Aurélien Bompard. (LP: #1227658) + * Fix non-member moderation rule to prefer a member sender if both members + and non-members are in the message's sender list. Given by Aurélien + Bompard. (LP: #1291452) 3.0 beta 3 -- "Here Again" diff --git a/src/mailman/rules/moderation.py b/src/mailman/rules/moderation.py index 153042ca9..46ed242fa 100644 --- a/src/mailman/rules/moderation.py +++ b/src/mailman/rules/moderation.py @@ -87,6 +87,10 @@ class NonmemberModeration: assert address is not None, ( 'Posting address is not registered: {0}'.format(sender)) mlist.subscribe(address, MemberRole.nonmember) + ## # If a member is found, the member-moderation rule takes precedence. + for sender in msg.senders: + if mlist.members.get_member(sender) is not None: + return False # Do nonmember moderation check. for sender in msg.senders: nonmember = mlist.nonmembers.get_member(sender) diff --git a/src/mailman/rules/tests/test_moderation.py b/src/mailman/rules/tests/test_moderation.py new file mode 100644 index 000000000..c0c3cf417 --- /dev/null +++ b/src/mailman/rules/tests/test_moderation.py @@ -0,0 +1,78 @@ +# Copyright (C) 2014 by the Free Software Foundation, Inc. +# +# This file is part of GNU Mailman. +# +# GNU Mailman is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along with +# GNU Mailman. If not, see <http://www.gnu.org/licenses/>. + +"""Test the `member-moderation` and `nonmember-moderation` rules.""" + +from __future__ import absolute_import, print_function, unicode_literals + +__metaclass__ = type +__all__ = [ + 'TestModeration', + ] + + +import unittest + +from mailman.app.lifecycle import create_list +from mailman.interfaces.member import MemberRole +from mailman.interfaces.usermanager import IUserManager +from mailman.rules import moderation +from mailman.testing.helpers import specialized_message_from_string as mfs +from mailman.testing.layers import ConfigLayer +from zope.component import getUtility + + + +class TestModeration(unittest.TestCase): + """Test the approved handler.""" + + layer = ConfigLayer + + def setUp(self): + self._mlist = create_list('test@example.com') + + def test_member_and_nonmember(self): + user_manager = getUtility(IUserManager) + anne = user_manager.create_address('anne@example.com') + user_manager.create_address('bill@example.com') + self._mlist.subscribe(anne, MemberRole.member) + rule = moderation.NonmemberModeration() + msg = mfs("""\ +From: anne@example.com +Sender: bill@example.com +To: test@example.com +Subject: A test message +Message-ID: <ant> +MIME-Version: 1.0 + +A message body. +""") + # Both Anne and Bill are in the message's senders list. + self.assertIn('anne@example.com', msg.senders) + self.assertIn('bill@example.com', msg.senders) + # The NonmemberModeration rule should *not* hit, because even though + # Bill is in the list of senders he is not a member of the mailing + # list. Anne is also in the list of senders and she *is* a member, so + # she takes precedence. + result = rule.check(self._mlist, msg, {}) + self.assertFalse(result, 'NonmemberModeration rule should not hit') + # After the rule runs, Bill becomes a non-member. + bill_member = self._mlist.nonmembers.get_member('bill@example.com') + self.assertIsNotNone(bill_member) + # Bill is not a member. + bill_member = self._mlist.members.get_member('bill@example.com') + self.assertIsNone(bill_member) |