From: Michael Tremer Date: Tue, 6 Aug 2019 16:08:42 +0000 (+0100) Subject: location: Remove "important" attribute from blacklists X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1058acb801b4f7cb16a3b113f2a07edae6479289;p=ipfire.org.git location: Remove "important" attribute from blacklists Signed-off-by: Michael Tremer --- diff --git a/src/backend/geoip.py b/src/backend/geoip.py index 06077f64..ba64760c 100644 --- a/src/backend/geoip.py +++ b/src/backend/geoip.py @@ -19,106 +19,106 @@ BLOCKLISTS = ( "xbl.spamhaus.org", ) -BLACKLISTS = { - "access.redhawk.org" : False, - "all.de.bl.blocklist.de" : False, - "all.spamblock.unit.liu.se" : False, - "b.barracudacentral.org" : False, - "bl.deadbeef.com" : False, - #"bl.emailbasura.org" : False, - "bl.spamcannibal.org" : False, - "bl.spamcop.net" : False, - "blackholes.five-ten-sg.com" : False, - #"blackholes.mail-abuse.org" : False, - "blacklist.sci.kun.nl" : False, - "blacklist.woody.ch" : False, - "bogons.cymru.com" : False, - "bsb.spamlookup.net" : False, - "cbl.abuseat.org" : False, - #"cbl.anti-spam.org.cn" : False, - #"cblless.anti-spam.org.cn" : False, - #"cblplus.anti-spam.org.cn" : False, - #"cdl.anti-spam.org.cn" : False, - #"combined.njabl.org" : False, - "combined.rbl.msrbl.net" : False, - "csi.cloudmark.com" : False, - "db.wpbl.info" : False, - #"dialups.mail-abuse.org" : False, - "dnsbl-1.uceprotect.net" : False, - "dnsbl-2.uceprotect.net" : False, - "dnsbl-3.uceprotect.net" : False, - "dnsbl.abuse.ch" : False, - "dnsbl.cyberlogic.net" : False, - "dnsbl.dronebl.org" : False, - "dnsbl.inps.de" : False, - "dnsbl.kempt.net" : False, - #"dnsbl.njabl.org" : False, - "dnsbl.sorbs.net" : False, - "dob.sibl.support-intelligence.net" : False, - "drone.abuse.ch" : False, - "dsn.rfc-ignorant.org" : False, - "duinv.aupads.org" : False, - #"dul.blackhole.cantv.net" : False, - "dul.dnsbl.sorbs.net" : False, - "vdul.ru" : False, - "dyna.spamrats.com" : False, - "dynablock.sorbs.net" : False, - #"dyndns.rbl.jp" : False, - "dynip.rothen.com" : False, - "forbidden.icm.edu.pl" : False, - "http.dnsbl.sorbs.net" : False, - "httpbl.abuse.ch" : False, - "images.rbl.msrbl.net" : False, - "ips.backscatterer.org" : False, - "ix.dnsbl.manitu.net" : False, - "korea.services.net" : False, - "mail.people.it" : False, - "misc.dnsbl.sorbs.net" : False, - "multi.surbl.org" : False, - "netblock.pedantic.org" : False, - "noptr.spamrats.com" : False, - "opm.tornevall.org" : False, - "orvedb.aupads.org" : False, - "pbl.spamhaus.org" : False, - "phishing.rbl.msrbl.net" : False, - "psbl.surriel.com" : False, - "query.senderbase.org" : False, - #"rbl-plus.mail-abuse.org" : False, - "rbl.efnetrbl.org" : False, - "rbl.interserver.net" : False, - "rbl.spamlab.com" : False, - "rbl.suresupport.com" : False, - "relays.bl.gweep.ca" : False, - "relays.bl.kundenserver.de" : False, - #"relays.mail-abuse.org" : False, - "relays.nether.net" : False, - "residential.block.transip.nl" : False, - #"rot.blackhole.cantv.net" : False, - "sbl.spamhaus.org" : True, - #"short.rbl.jp" : False, - "smtp.dnsbl.sorbs.net" : False, - "socks.dnsbl.sorbs.net" : False, - "spam.abuse.ch" : False, - "spam.dnsbl.sorbs.net" : False, - "spam.rbl.msrbl.net" : False, - "spam.spamrats.com" : False, - "spamguard.leadmon.net" : False, - "spamlist.or.kr" : False, - "spamrbl.imp.ch" : False, - "tor.dan.me.uk" : False, - "ubl.lashback.com" : False, - "ubl.unsubscore.com" : False, - "uribl.swinog.ch" : False, - #"url.rbl.jp" : False, - "virbl.bit.nl" : False, - #"virus.rbl.jp" : False, - "virus.rbl.msrbl.net" : False, - "web.dnsbl.sorbs.net" : False, - "wormrbl.imp.ch" : False, - "xbl.spamhaus.org" : True, - "zen.spamhaus.org" : False, - "zombie.dnsbl.sorbs.net" : False, -} +BLACKLISTS = ( + "access.redhawk.org", + "all.de.bl.blocklist.de", + "all.spamblock.unit.liu.se", + "b.barracudacentral.org", + "bl.deadbeef.com", + #"bl.emailbasura.org", + "bl.spamcannibal.org", + "bl.spamcop.net", + "blackholes.five-ten-sg.com", + #"blackholes.mail-abuse.org", + "blacklist.sci.kun.nl", + "blacklist.woody.ch", + "bogons.cymru.com", + "bsb.spamlookup.net", + "cbl.abuseat.org", + #"cbl.anti-spam.org.cn", + #"cblless.anti-spam.org.cn", + #"cblplus.anti-spam.org.cn", + #"cdl.anti-spam.org.cn", + #"combined.njabl.org", + "combined.rbl.msrbl.net", + "csi.cloudmark.com", + "db.wpbl.info", + #"dialups.mail-abuse.org", + "dnsbl-1.uceprotect.net", + "dnsbl-2.uceprotect.net", + "dnsbl-3.uceprotect.net", + "dnsbl.abuse.ch", + "dnsbl.cyberlogic.net", + "dnsbl.dronebl.org", + "dnsbl.inps.de", + "dnsbl.kempt.net", + #"dnsbl.njabl.org", + "dnsbl.sorbs.net", + "dob.sibl.support-intelligence.net", + "drone.abuse.ch", + "dsn.rfc-ignorant.org", + "duinv.aupads.org", + #"dul.blackhole.cantv.net", + "dul.dnsbl.sorbs.net", + "vdul.ru", + "dyna.spamrats.com", + "dynablock.sorbs.net", + #"dyndns.rbl.jp", + "dynip.rothen.com", + "forbidden.icm.edu.pl", + "http.dnsbl.sorbs.net", + "httpbl.abuse.ch", + "images.rbl.msrbl.net", + "ips.backscatterer.org", + "ix.dnsbl.manitu.net", + "korea.services.net", + "mail.people.it", + "misc.dnsbl.sorbs.net", + "multi.surbl.org", + "netblock.pedantic.org", + "noptr.spamrats.com", + "opm.tornevall.org", + "orvedb.aupads.org", + "pbl.spamhaus.org", + "phishing.rbl.msrbl.net", + "psbl.surriel.com", + "query.senderbase.org", + #"rbl-plus.mail-abuse.org", + "rbl.efnetrbl.org", + "rbl.interserver.net", + "rbl.spamlab.com", + "rbl.suresupport.com", + "relays.bl.gweep.ca", + "relays.bl.kundenserver.de", + #"relays.mail-abuse.org", + "relays.nether.net", + "residential.block.transip.nl", + #"rot.blackhole.cantv.net", + "sbl.spamhaus.org", + #"short.rbl.jp", + "smtp.dnsbl.sorbs.net", + "socks.dnsbl.sorbs.net", + "spam.abuse.ch", + "spam.dnsbl.sorbs.net", + "spam.rbl.msrbl.net", + "spam.spamrats.com", + "spamguard.leadmon.net", + "spamlist.or.kr", + "spamrbl.imp.ch", + "tor.dan.me.uk", + "ubl.lashback.com", + "ubl.unsubscore.com", + "uribl.swinog.ch", + #"url.rbl.jp", + "virbl.bit.nl", + #"virus.rbl.jp", + "virus.rbl.msrbl.net", + "web.dnsbl.sorbs.net", + "wormrbl.imp.ch", + "xbl.spamhaus.org", + "zen.spamhaus.org", + "zombie.dnsbl.sorbs.net", +) class Resolver(tornado.platform.caresresolver.CaresResolver): def initialize(self, **kwargs): @@ -300,8 +300,8 @@ class Address(Object): return return_code, None @tornado.gen.coroutine - def get_blacklists(self, important_only=False): - blacklists = yield { bl : self._resolve_blacklist(bl) for bl in BLACKLISTS if not important_only or BLACKLISTS[bl] } + def get_blacklists(self): + blacklists = yield { bl : self._resolve_blacklist(bl) for bl in BLACKLISTS } return blacklists