From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 31 Mar 2024 18:12:25 +0000 (+0000)
Subject: location: Remove blacklist feature
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=559d42b9e8cd13ed3bf0ed1eea03702c5011a5a8;p=ipfire.org.git

location: Remove blacklist feature

This doesn't really have anything to do with the location database.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/backend/util.py b/src/backend/util.py
index 2a64c239..baf6dcb3 100644
--- a/src/backend/util.py
+++ b/src/backend/util.py
@@ -25,22 +25,6 @@ BLOCKLISTS = (
 	"xbl.spamhaus.org",
 )
 
-BLACKLISTS = (
-	"b.barracudacentral.org",
-	"bl.spamcop.net",
-	"bl.blocklist.de",
-	"cbl.abuseat.org",
-	"dnsbl-1.uceprotect.net",
-	"dnsbl-2.uceprotect.net",
-	"dnsbl-3.uceprotect.net",
-	"dnsbl.abuse.ch",
-	"ix.dnsbl.manitu.net",
-	"pbl.spamhaus.org",
-	"sbl.spamhaus.org",
-	"xbl.spamhaus.org",
-	"zen.spamhaus.org",
-)
-
 class Address(Object):
 	def init(self, address):
 		self.address = ipaddress.ip_address(address)
@@ -150,11 +134,6 @@ class Address(Object):
 		# Blocked, but no reason
 		return return_code, None
 
-	async def get_blacklists(self):
-		blacklists = { bl : await self._resolve_blacklist(bl) for bl in BLACKLISTS }
-
-		return blacklists
-
 
 def format_size(s, max_unit=None):
 	units = ("B", "kB", "MB", "GB", "TB")
diff --git a/src/templates/location/lookup.html b/src/templates/location/lookup.html
index 41830a53..0a1a5a47 100644
--- a/src/templates/location/lookup.html
+++ b/src/templates/location/lookup.html
@@ -83,38 +83,6 @@
 					{% end %}
 				</div>
 			</div>
-
-			{% if blacklists %}
-				<nav class="panel">
-					<p class="panel-heading">
-						{{ _("Blacklists") }}
-					</p>
-
-					{% for bl in sorted(blacklists) %}
-						{% if blacklists[bl] %}
-							{% set code, reason = blacklists[bl] %}
-
-							<div class="panel-block {% if code %}is-active{% end %}">
-								<span class="panel-icon">
-									{% if code %}
-										<i class="fa-solid fa-ban" aria-hidden="true"></i>
-									{% else %}
-										<i class="fa-solid fa-check" aria-hidden="true"></i>
-									{% end %}
-								</span>
-
-								<div>
-									<p>{{ bl }}</p>
-
-									{% if reason %}
-										<p class="has-text-danger">{{ reason }}</p>
-									{% end %}
-								</div>
-							</div>
-						{% end %}
-					{% end %}
-				</nav>
-			{% end %}
 		</div>
 	</section>
 {% end block %}
diff --git a/src/web/location.py b/src/web/location.py
index c466c447..18089832 100644
--- a/src/web/location.py
+++ b/src/web/location.py
@@ -1,9 +1,6 @@
 #!/usr/bin/python3
 
-import tornado.web
-
 from .. import util
-
 from . import base
 
 class IndexHandler(base.AnalyticsMixin, base.BaseHandler):
@@ -18,7 +15,4 @@ class LookupHandler(base.AnalyticsMixin, base.BaseHandler):
 		# Lookup address
 		address = util.Address(self.backend, address)
 
-		# Lookup blacklists
-		blacklists = await address.get_blacklists()
-
-		self.render("location/lookup.html", address=address, blacklists=blacklists)
+		self.render("location/lookup.html", address=address)