diff options
| author | Mark Sapiro <mark@msapiro.net> | 2018-12-15 10:07:41 -0800 |
|---|---|---|
| committer | Mark Sapiro <mark@msapiro.net> | 2018-12-15 10:07:41 -0800 |
| commit | 3567095f4208f3aafce171fd5be2bfa8f5c37088 (patch) | |
| tree | ddb602abeb6c34a80a30d2cbcaebbceeaacf004d /Mailman/Handlers | |
| parent | d03507def644416adf753098173220be6f75c137 (diff) | |
| parent | 3242707ec3214cb0ca9c639b99617f69f94f0d05 (diff) | |
| download | mailman2-3567095f4208f3aafce171fd5be2bfa8f5c37088.tar.gz mailman2-3567095f4208f3aafce171fd5be2bfa8f5c37088.tar.xz mailman2-3567095f4208f3aafce171fd5be2bfa8f5c37088.zip | |
Implement dmarc_moderation_addresses feature.
Diffstat (limited to 'Mailman/Handlers')
| -rw-r--r-- | Mailman/Handlers/SpamDetect.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Mailman/Handlers/SpamDetect.py b/Mailman/Handlers/SpamDetect.py index 7e035184..cf41303f 100644 --- a/Mailman/Handlers/SpamDetect.py +++ b/Mailman/Handlers/SpamDetect.py @@ -109,7 +109,8 @@ def process(mlist, msg, msgdata): msgdata['from_is_list'] = 0 dn, addr = parseaddr(msg.get('from')) if addr and mlist.dmarc_moderation_action > 0: - if Utils.IsDMARCProhibited(mlist, addr): + if (mlist.GetPattern(addr, mlist.dmarc_moderation_addresses) or + Utils.IsDMARCProhibited(mlist, addr)): # Note that for dmarc_moderation_action, 0 = Accept, # 1 = Munge, 2 = Wrap, 3 = Reject, 4 = Discard if mlist.dmarc_moderation_action == 1: |