The format of this list has changed, from a plain text file with a
customer schema to JSON. Adjust our routines accordingly to make use of
this list again.
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
Tested-by: Peter Müller <peter.mueller(a)ipfire.org>
---
src/scripts/location-importer.in | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/src/scripts/location-importer.in b/src/scripts/location-importer.in
index 28a4f6c..8b0c676 100644
--- a/src/scripts/location-importer.in
+++ b/src/scripts/location-importer.in
@@ -3,7 +3,7 @@
# #
# libloc - A library to determine the location of someone on the Internet #
# #
-# Copyright (C) 2020-2022 IPFire Development Team <info(a)ipfire.org> #
+# Copyright (C) 2020-2023 IPFire Development Team <info(a)ipfire.org> #
# #
# This library is free software; you can redistribute it and/or #
# modify it under the terms of the GNU Lesser General Public #
@@ -1686,7 +1686,7 @@ class CLI(object):
]
asn_lists = [
- ("SPAMHAUS-ASNDROP", "https://www.spamhaus.org/drop/asndrop.txt")
+ ("SPAMHAUS-ASNDROP", "https://www.spamhaus.org/drop/asndrop.json")
]
for name, url in ip_lists:
@@ -1759,23 +1759,16 @@ class CLI(object):
# Iterate through every line, filter comments and add remaining ASNs to
# the override table in case they are valid...
- for sline in f.readlines():
+ for sline in fcontent:
# The response is assumed to be encoded in UTF-8...
sline = sline.decode("utf-8")
- # Comments start with a semicolon...
- if sline.startswith(";"):
+ # Load every line as a JSON object and try to obtain an ASN from it...
+ try:
+ asn = json.loads(sline)["asn"]
+ except KeyError:
continue
- # Throw away anything after the first space...
- sline = sline.split()[0]
-
- # ... strip the "AS" prefix from it ...
- sline = sline.strip("AS")
-
- # ... and convert it into an integer. Voila.
- asn = int(sline)
-
# Filter invalid ASNs...
if not self._check_parsed_asn(asn):
log.warning("Skipping bogus ASN found in %s (%s): %s" % \
--
2.35.3
