X-Git-Url: http://git.ipfire.org/?p=ipfire.org.git;a=blobdiff_plain;f=src%2Fbackend%2Futil.py;fp=src%2Fbackend%2Futil.py;h=f7182c896f0378a6d4d0d14eadf24c4377400c75;hp=18bcbe3d9240a9463badfeace991c31d752692bd;hb=7b05edde25e708236bdb30b0ce385e2208eb0e28;hpb=0dfa4ce686f35d88eb37b2d716064fbaa087ceb5 diff --git a/src/backend/util.py b/src/backend/util.py index 18bcbe3d..f7182c89 100644 --- a/src/backend/util.py +++ b/src/backend/util.py @@ -39,9 +39,6 @@ BLACKLISTS = ( "zen.spamhaus.org", ) -# Open location database -db = location.Database("/var/lib/location/database.db") - class Address(Object): def init(self, address): self.address = ipaddress.ip_address(address) @@ -58,7 +55,7 @@ class Address(Object): @lazy_property def network(self): - return db.lookup("%s" % self.address) + return self.backend.location.lookup("%s" % self.address) @property def country_code(self): @@ -70,6 +67,11 @@ class Address(Object): if self.network: return self.network.asn + @lazy_property + def autonomous_system(self): + if self.asn: + return self.backend.location.get_as(self.asn) + # Blacklist def _make_blacklist_rr(self, blacklist):