diff options
| author | Jim Popovitch <jimpop@gmail.com> | 2013-11-08 00:56:42 +0000 |
|---|---|---|
| committer | Jim Popovitch <jimpop@gmail.com> | 2013-11-08 00:56:42 +0000 |
| commit | bc05ad4e81bd2ce9ec0f36e5112eadf607a49195 (patch) | |
| tree | 9979051513f5f7116de90dc9a1686543d1c8e87c | |
| parent | 80f14d7924d0a1b90873ecdc8388a10d31e440b3 (diff) | |
| download | mailman2-bc05ad4e81bd2ce9ec0f36e5112eadf607a49195.tar.gz mailman2-bc05ad4e81bd2ce9ec0f36e5112eadf607a49195.tar.xz mailman2-bc05ad4e81bd2ce9ec0f36e5112eadf607a49195.zip | |
Added suuport for p=quarantine based on feedback from Franck Martin.
| -rw-r--r-- | Mailman/Gui/Privacy.py | 4 | ||||
| -rw-r--r-- | Mailman/Utils.py | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Mailman/Gui/Privacy.py b/Mailman/Gui/Privacy.py index 3e963b7a..90560bff 100644 --- a/Mailman/Gui/Privacy.py +++ b/Mailman/Gui/Privacy.py @@ -238,7 +238,7 @@ class Privacy(GUIBase): ('dmarc_moderation_action', mm_cfg.Radio, (_('Accept'), _('Hold'), _('Reject'), _('Discard')), 0, _("""Action to take when anyone posts to the - list from a domain with a DMARC Reject Policy."""), + list from a domain with a DMARC Reject/Quarantine Policy."""), _("""<ul><li><b>Hold</b> -- this holds the message for approval by the list moderators. @@ -257,7 +257,7 @@ class Privacy(GUIBase): <a href="?VARHELP/privacy/sender/dmarc_moderation_action" >rejection notice</a> to be sent to anyone who posts to this list from a domain - with DMARC Reject Policy.""")), + with DMARC Reject/Quarantine Policy.""")), _('Non-member filters'), diff --git a/Mailman/Utils.py b/Mailman/Utils.py index ec9174c7..37ae940b 100644 --- a/Mailman/Utils.py +++ b/Mailman/Utils.py @@ -1132,6 +1132,11 @@ def IsDmarcProhibited(email): email, dmarc_domain, name, entry) return True + if re.search(r'\bp=quarantine\b', entry, re.IGNORECASE): + syslog('info', 'DMARC lookup for %s (%s) found p=quarantine in %s = %s', + email, dmarc_domain, name, entry) + return True + return False |