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 2a64c2394b4dea2adca8f6addc616296cb0caa00..baf6dcb312bdc1d44544b7634ea8e2938050aa86 100644 (file)
--- 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 41830a530d4b40ad53c82c01874bf4a599001390..0a1a5a47732ac792c508a0e383894c34bae8c009 100644 (file)
--- 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 c466c447d82786ddb29b07014ff41cb3fe288912..1808983262a93c7d04610c94df95b6e8327652ac 100644 (file)
--- 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)