location: Redesign index page

[ipfire.org.git] / src / web / location.py

diff --git a/src/web/location.py b/src/web/location.py
index a9e5dc17ab68c1c1e3c9ff20acb8313943424246..06d26b40683a8d64da135b763306684d40b9c2ac 100644 (file)
--- a/src/web/location.py
+++ b/src/web/location.py
@@ -1,19 +1,34 @@
 
 #!/usr/bin/python
 
+import logging
 import tornado.web
 
-from . import handlers_base as base
+from .. import util
 
-class IndexHandler(base.BaseHandler):
+from . import auth
+from . import base
+
+class IndexHandler(auth.CacheMixin, base.BaseHandler):
        def get(self):
-               self.redirect("/lookup/%s" % self.get_remote_ip())
+               self.render("location/index.html", address=self.current_address)
 
 
 class LookupHandler(base.BaseHandler):
-       def get(self, address):
-               peer = self.geoip.get_all(address)
-               if peer:
-                       peer["country_name"] = self.geoip.get_country_name(peer.country)
+       async def get(self, address):
+               # Lookup address
+               address = util.Address(self.backend, address)
+
+               self.render("location/lookup.html", address=address)
+
+
+class BlacklistsHandler(base.BaseHandler):
+       async def get(self, address):
+               # Lookup address
+               address = util.Address(self.backend, address)
+
+               # Lookup blacklists
+               blacklists = await address.get_blacklists()
 
-               self.render("location/lookup.html", address=address, peer=peer)
+               self.render("location/blacklists.html",
+                       address=address, blacklists=blacklists)