Merge authors:
jimpop@template.hostname
Related merge proposals:
https://code.launchpad.net/~jimpop/mailman/preserve_dkim/+merge/295834
proposed by: Jim Popovitch (jimpop)
review: Approve - Mark Sapiro (msapiro)
------------------------------------------------------------
revno: 1655 [merge]
committer: Mark Sapiro <m...@msapiro.net>
branch nick: 2.1
timestamp: Thu 2016-05-26 08:42:36 -0700
message:
REMOVE_DKIM_HEADERS = 3 renames headers X-Mailman-Original...
modified:
Mailman/Defaults.py.in
Mailman/Handlers/CleanseDKIM.py
NEWS
--
lp:mailman/2.1
https://code.launchpad.net/~mailman-coders/mailman/2.1
Your team Mailman Checkins is subscribed to branch lp:mailman/2.1.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.1/+edit-subscription
=== modified file 'Mailman/Defaults.py.in'
--- Mailman/Defaults.py.in 2016-05-06 21:44:28 +0000
+++ Mailman/Defaults.py.in 2016-05-26 15:42:36 +0000
@@ -616,8 +616,10 @@
# broken and even if the outgoing message is resigned. However, some sites
# may wish to remove these headers. Possible values and meanings are:
# No, 0, False -> do not remove headers.
-# Yes, 1, True -> remove headers only if the list's from_is_list setting is 1.
+# Yes, 1, True -> remove headers only if we are munging the from header due
+# to from_is_list or dmarc_moderation_action.
# 2 -> always remove headers.
+# 3 -> always remove, rename and preserve original DKIM headers.
REMOVE_DKIM_HEADERS = No
# All `normal' messages which are delivered to the entire list membership go
=== modified file 'Mailman/Handlers/CleanseDKIM.py'
--- Mailman/Handlers/CleanseDKIM.py 2015-04-15 20:31:01 +0000
+++ Mailman/Handlers/CleanseDKIM.py 2016-05-26 15:42:36 +0000
@@ -43,6 +43,13 @@
)
):
return
+ if (mm_cfg.REMOVE_DKIM_HEADERS == 3):
+ for value in msg.get_all('domainkey-signature', []):
+ msg['X-Mailman-Original-DomainKey-Signature'] = value
+ for value in msg.get_all('dkim-signature', []):
+ msg['X-Mailman-Original-DKIM-Signature'] = value
+ for value in msg.get_all('authentication-results', []):
+ msg['X-Mailman-Original-Authentication-Results'] = value
del msg['domainkey-signature']
del msg['dkim-signature']
del msg['authentication-results']
=== modified file 'NEWS'
--- NEWS 2016-05-19 00:40:27 +0000
+++ NEWS 2016-05-26 15:42:36 +0000
@@ -9,6 +9,10 @@
New Features
+ - Thanks to Jim Popovitch REMOVE_DKIM_HEADERS can now be set to 3 to
+ preserve the original headers as X-Mailman-Original-... before removing
+ them.
+
- Several additional templates have been added to those that can be edited
via the web admin GUI. (LP: #1583387)
_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe:
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
