summaryrefslogtreecommitdiff
path: root/src/mailman/chains
diff options
context:
space:
mode:
authorAurélien Bompard2016-09-27 18:40:30 +0200
committerAurélien Bompard2016-10-27 10:29:03 +0200
commit54136248b53411cd0e2c65ec4d846edee6ef0dec (patch)
tree3078fad18d6684a39ac04c97c73d04ea63bc319a /src/mailman/chains
parentd2f59ff1d0d2b30763529543a68b0a4fdb9e28c6 (diff)
downloadmailman-54136248b53411cd0e2c65ec4d846edee6ef0dec.tar.gz
mailman-54136248b53411cd0e2c65ec4d846edee6ef0dec.tar.zst
mailman-54136248b53411cd0e2c65ec4d846edee6ef0dec.zip
Diffstat (limited to 'src/mailman/chains')
-rw-r--r--src/mailman/chains/builtin.py2
-rw-r--r--src/mailman/chains/docs/moderation.rst5
2 files changed, 7 insertions, 0 deletions
diff --git a/src/mailman/chains/builtin.py b/src/mailman/chains/builtin.py
index f3ff501be..b805fca0f 100644
--- a/src/mailman/chains/builtin.py
+++ b/src/mailman/chains/builtin.py
@@ -41,6 +41,8 @@ class BuiltInChain:
('approved', LinkAction.jump, 'accept'),
('emergency', LinkAction.jump, 'hold'),
('loop', LinkAction.jump, 'discard'),
+ # Discard emails from banned addresses.
+ ('banned-address', LinkAction.jump, 'discard'),
# Determine whether the member or nonmember has an action shortcut.
('member-moderation', LinkAction.jump, 'moderation'),
# Take a detour through the header matching chain.
diff --git a/src/mailman/chains/docs/moderation.rst b/src/mailman/chains/docs/moderation.rst
index 880f9b63c..3b40c7293 100644
--- a/src/mailman/chains/docs/moderation.rst
+++ b/src/mailman/chains/docs/moderation.rst
@@ -90,6 +90,7 @@ built-in chain. No rules hit and so the message is accepted.
approved
emergency
loop
+ banned-address
member-moderation
nonmember-moderation
administrivia
@@ -126,6 +127,7 @@ moderator approval.
approved
emergency
loop
+ banned-address
Anne's moderation action can also be set to `discard`...
::
@@ -151,6 +153,7 @@ Anne's moderation action can also be set to `discard`...
approved
emergency
loop
+ banned-address
... or `reject`.
@@ -175,6 +178,7 @@ Anne's moderation action can also be set to `discard`...
approved
emergency
loop
+ banned-address
Nonmembers
@@ -214,6 +218,7 @@ moderator approval.
approved
emergency
loop
+ banned-address
member-moderation
>>> nonmember = mlist.nonmembers.get_member('bart@example.com')