------------------------------------------------------------
revno: 1763
committer: Mark Sapiro <m...@msapiro.net>
branch nick: 2.1
timestamp: Mon 2018-06-04 19:19:31 -0700
message:
Restrict Spamhaus ZEN hits to SBL, CSS and XBL.
modified:
Mailman/Defaults.py.in
Mailman/Utils.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 2018-06-05 01:02:12 +0000
+++ Mailman/Defaults.py.in 2018-06-05 02:19:31 +0000
@@ -146,8 +146,8 @@
GLOBAL_BAN_LIST = []
# IF the following is set to Yes, and a web subscribe comes from an IPv4
-# address and the IP is listed in Spamhaus ZEN, the subscription will be
-# blocked.
+# address and the IP is listed in Spamhaus SBL, CSS or XBL, the subscription
+# will be blocked.
BLOCK_SPAMHAUS_LISTED_IP_SUBSCRIBE = No
# Command that is used to convert text/html parts into plain text. This
=== modified file 'Mailman/Utils.py'
--- Mailman/Utils.py 2018-06-05 01:02:12 +0000
+++ Mailman/Utils.py 2018-06-05 02:19:31 +0000
@@ -1513,6 +1513,6 @@
if not ans:
return False
text = ans.rrset.to_text()
- if re.search(r'127\.0\.0\.\d{1,2}$', text, re.MULTILINE):
+ if re.search(r'127\.0\.0\.[2-7]$', text, re.MULTILINE):
return True
return False
=== modified file 'NEWS'
--- NEWS 2018-06-05 01:02:12 +0000
+++ NEWS 2018-06-05 02:19:31 +0000
@@ -26,7 +26,7 @@
- A new BLOCK_SPAMHAUS_LISTED_IP_SUBSCRIBE setting has been added to
enable blocking web subscribes from IPv4 addresses listed in Spamhaus
- ZEN.
+ SBL, CSS or XBL.
i18n
_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe:
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
