diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mailman/chains/accept.py | 3 | ||||
| -rw-r--r-- | src/mailman/chains/owner.py | 56 | ||||
| -rw-r--r-- | src/mailman/chains/tests/test_owner.py | 75 | ||||
| -rw-r--r-- | src/mailman/docs/NEWS.rst | 2 |
4 files changed, 134 insertions, 2 deletions
diff --git a/src/mailman/chains/accept.py b/src/mailman/chains/accept.py index b1e4b1cf0..4b326142b 100644 --- a/src/mailman/chains/accept.py +++ b/src/mailman/chains/accept.py @@ -62,7 +62,6 @@ class AcceptChain(TerminalChainBase): rule_misses = msgdata.get('rule_misses') if rule_misses: msg['X-Mailman-Rule-Misses'] = SEMISPACE.join(rule_misses) - accept_queue = config.switchboards['pipeline'] - accept_queue.enqueue(msg, msgdata) + config.switchboards['pipeline'].enqueue(msg, msgdata) log.info('ACCEPT: %s', msg.get('message-id', 'n/a')) notify(AcceptNotification(mlist, msg, msgdata, self)) diff --git a/src/mailman/chains/owner.py b/src/mailman/chains/owner.py new file mode 100644 index 000000000..ad0a04cea --- /dev/null +++ b/src/mailman/chains/owner.py @@ -0,0 +1,56 @@ +# Copyright (C) 2012 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/>. + +"""The standard -owner posting chain.""" + +from __future__ import absolute_import, print_function, unicode_literals + +__metaclass__ = type +__all__ = [ + 'BuiltInOwnerChain', + ] + + +import logging + +from zope.event import notify + +from mailman.chains.base import ChainNotification, TerminalChainBase +from mailman.config import config +from mailman.core.i18n import _ + + +log = logging.getLogger('mailman.vette') + + + +class OwnerNotification(ChainNotification): + """An event signaling that a message is accepted to the -owner address.""" + + + +class BuiltInOwnerChain(TerminalChainBase): + """Default built-in -owner address chain.""" + + name = 'default-owner-chain' + description = _('The built-in -owner posting chain.') + + def _process(self, mlist, msg, msgdata): + # At least for now, everything posted to -owners goes through. + config.switchboards['pipeline'].enqueue(msg, msgdata) + log.info('OWNER: %s', msg.get('message-id', 'n/a')) + notify(OwnerNotification(mlist, msg, msgdata, self)) diff --git a/src/mailman/chains/tests/test_owner.py b/src/mailman/chains/tests/test_owner.py new file mode 100644 index 000000000..db85d4967 --- /dev/null +++ b/src/mailman/chains/tests/test_owner.py @@ -0,0 +1,75 @@ +# Copyright (C) 2012 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 owner chain.""" + +from __future__ import absolute_import, print_function, unicode_literals + +__metaclass__ = type +__all__ = [ + 'TestOwnerChain', + ] + + +import unittest + +from mailman.app.lifecycle import create_list +from mailman.chains.owner import BuiltInOwnerChain, OwnerNotification +from mailman.core.chains import process +from mailman.testing.helpers import ( + event_subscribers, + get_queue_messages, + specialized_message_from_string as mfs) +from mailman.testing.layers import ConfigLayer + + + +class TestOwnerChain(unittest.TestCase): + """Test the owner chain.""" + + layer = ConfigLayer + + def setUp(self): + self._mlist = create_list('test@example.com') + self._msg = mfs("""\ +From: anne@example.com +To: test@example.com +Message-ID: <ant> + +""") + + def test_owner_pipeline(self): + # Messages processed through the default owners chain end up in the + # pipeline queue, and an event gets sent. + # + # This event subscriber records the event that occurs when the message + # is processed by the owner chain. + events = [] + def catch_event(event): + events.append(event) + with event_subscribers(catch_event): + process(self._mlist, self._msg, {}, 'default-owner-chain') + self.assertEqual(len(events), 1) + event = events[0] + self.assertTrue(isinstance(event, OwnerNotification)) + self.assertEqual(event.mlist, self._mlist) + self.assertEqual(event.msg['message-id'], '<ant>') + self.assertTrue(isinstance(event.chain, BuiltInOwnerChain)) + messages = get_queue_messages('pipeline') + self.assertEqual(len(messages), 1) + message = messages[0].msg + self.assertEqual(message['message-id'], '<ant>') diff --git a/src/mailman/docs/NEWS.rst b/src/mailman/docs/NEWS.rst index b92a3b618..fa5d1cb90 100644 --- a/src/mailman/docs/NEWS.rst +++ b/src/mailman/docs/NEWS.rst @@ -75,6 +75,8 @@ Database - real_name -> display_name (mailinglist, user, address) * Schema additions: - mailinglist.filter_action + - mailinglist.owner_chain + - mailinglist.owner_pipeline REST ---- |
