diff options
| -rw-r--r-- | Mailman/Defaults.py.in | 4 | ||||
| -rw-r--r-- | Mailman/Handlers/Cleanse.py | 11 | ||||
| -rw-r--r-- | Mailman/Handlers/CleanseDKIM.py | 33 |
3 files changed, 37 insertions, 11 deletions
diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in index 54f65c95..e5dc7d82 100644 --- a/Mailman/Defaults.py.in +++ b/Mailman/Defaults.py.in @@ -1,6 +1,6 @@ # -*- python -*- -# Copyright (C) 1998-2005 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2006 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 @@ -476,6 +476,7 @@ GLOBAL_PIPELINE = [ 'CalcRecips', 'AvoidDuplicates', 'Cleanse', + 'CleanseDKIM', 'CookHeaders', # And now we send the message to the digest mbox file, and to the arch and # news queues. Runners will provide further processing of the message, @@ -494,6 +495,7 @@ GLOBAL_PIPELINE = [ OWNER_PIPELINE = [ 'SpamDetect', 'Replybot', + 'CleanseDKIM', 'OwnerRecips', 'ToOutgoing', ] diff --git a/Mailman/Handlers/Cleanse.py b/Mailman/Handlers/Cleanse.py index ea5a7fbf..8033d41f 100644 --- a/Mailman/Handlers/Cleanse.py +++ b/Mailman/Handlers/Cleanse.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2005 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2006 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 @@ -50,12 +50,3 @@ def process(mlist, msg, msgdata): del msg['x-confirm-reading-to'] # Pegasus mail uses this one... sigh del msg['x-pmrqc'] - # Remove any "DomainKeys" (or similar) header lines. The values contained - # in these header lines are intended to be used by the recipient to detect - # forgery or tampering in transit, and the modifications made by Mailman - # to the headers and body of the message will cause these keys to appear - # invalid. Removing them will at least avoid this misleading result, and - # it will also give the MTA the opportunity to regenerate valid keys - # originating at the Mailman server for the outgoing message. - del msg['domainkey-signature'] - del msg['dkim-signature'] diff --git a/Mailman/Handlers/CleanseDKIM.py b/Mailman/Handlers/CleanseDKIM.py new file mode 100644 index 00000000..850e3668 --- /dev/null +++ b/Mailman/Handlers/CleanseDKIM.py @@ -0,0 +1,33 @@ +# Copyright (C) 2006 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 +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program 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 this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. + +"""Remove any "DomainKeys" (or similar) header lines. + +The values contained in these header lines are intended to be used by the +recipient to detect forgery or tampering in transit, and the modifications +made by Mailman to the headers and body of the message will cause these keys +to appear invalid. Removing them will at least avoid this misleading result, +and it will also give the MTA the opportunity to regenerate valid keys +originating at the Mailman server for the outgoing message. +""" + + + +def process(mlist, msg, msgdata): + del msg['domainkey-signature'] + del msg['dkim-signature'] + |