diff options
| author | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2018-06-06 02:18:30 +0900 |
|---|---|---|
| committer | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2018-06-06 02:18:30 +0900 |
| commit | e591f51039f4ebc4a52d6a8aac210d8ebb7978de (patch) | |
| tree | 004c9f8ba6a59659e2ea930f5f74403a269627f8 /Mailman/MailList.py | |
| parent | 898c692842fed6e33a4bc309d9d240721a01a4c7 (diff) | |
| parent | ca506e913faa49331db68f541774fdb773653988 (diff) | |
| download | mailman2-e591f51039f4ebc4a52d6a8aac210d8ebb7978de.tar.gz mailman2-e591f51039f4ebc4a52d6a8aac210d8ebb7978de.tar.xz mailman2-e591f51039f4ebc4a52d6a8aac210d8ebb7978de.zip | |
merge lp:mailman up to rev 1765
Diffstat (limited to '')
| -rwxr-xr-x | Mailman/MailList.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Mailman/MailList.py b/Mailman/MailList.py index 619c3206..fdc3802a 100755 --- a/Mailman/MailList.py +++ b/Mailman/MailList.py @@ -908,6 +908,13 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin, syslog('vette', '%s banned subscription: %s%s (matched: %s)', realname, email, whence, pattern) raise Errors.MembershipIsBanned, pattern + # See if this is from a spamhaus listed IP. + if remote and mm_cfg.BLOCK_SPAMHAUS_LISTED_IP_SUBSCRIBE: + if Utils.banned_ip(remote): + whence = ' from %s' % remote + syslog('vette', '%s banned subscription: %s%s (Spamhaus IP)', + realname, email, whence) + raise Errors.MembershipIsBanned, 'Spamhaus IP' # Sanity check the digest flag if digest and not self.digestable: raise Errors.MMCantDigestError |