diff options
| author | Mark Sapiro <mark@msapiro.net> | 2018-06-04 19:19:31 -0700 |
|---|---|---|
| committer | Mark Sapiro <mark@msapiro.net> | 2018-06-04 19:19:31 -0700 |
| commit | a8715a7afa8fd36d9118df834b3e8749b0083972 (patch) | |
| tree | a8be478e2f324af01ae9d93f113353274160e35b | |
| parent | b0fda7ec4f1927bae0f930500dea17294b5bbf20 (diff) | |
| download | mailman2-a8715a7afa8fd36d9118df834b3e8749b0083972.tar.gz mailman2-a8715a7afa8fd36d9118df834b3e8749b0083972.tar.xz mailman2-a8715a7afa8fd36d9118df834b3e8749b0083972.zip | |
Restrict Spamhaus ZEN hits to SBL, CSS and XBL.
| -rwxr-xr-x | Mailman/Defaults.py.in | 4 | ||||
| -rw-r--r-- | Mailman/Utils.py | 2 | ||||
| -rw-r--r-- | NEWS | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in index a124832d..7a86f63c 100755 --- a/Mailman/Defaults.py.in +++ b/Mailman/Defaults.py.in @@ -146,8 +146,8 @@ RECAPTCHA_SECRET_KEY = None 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 diff --git a/Mailman/Utils.py b/Mailman/Utils.py index 2f9bda63..cdc82366 100644 --- a/Mailman/Utils.py +++ b/Mailman/Utils.py @@ -1513,6 +1513,6 @@ def banned_ip(ip): 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 @@ -26,7 +26,7 @@ Here is a history of user visible changes to Mailman. - 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 |