From mboxrd@z Thu Jan 1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <peter.mueller@ipfire.org>
To: location@lists.ipfire.org
Subject: [PATCH] location-importer: Fix Spamhaus ASN-DROP parsing
Date: Sat, 04 Nov 2023 14:04:00 +0000
Message-ID: <fd183979-30db-463a-a381-4894cf4c8033@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8688037197236261996=="
List-Id: <location.lists.ipfire.org>
--===============8688037197236261996==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
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=C3=BCller <peter.mueller(a)ipfire.org>
Tested-by: Peter M=C3=BCller <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):
]
=20
asn_lists =3D [
- ("SPAMHAUS-ASNDROP", "https://www.spamhaus.org/drop/asndrop.txt")
+ ("SPAMHAUS-ASNDROP", "https://www.spamhaus.org/drop/asndrop.json")
]
=20
for name, url in ip_lists:
@@ -1759,23 +1759,16 @@ class CLI(object):
=20
# 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 =3D sline.decode("utf-8")
=20
- # 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 =3D json.loads(sline)["asn"]
+ except KeyError:
continue
=20
- # Throw away anything after the first space...
- sline =3D sline.split()[0]
-
- # ... strip the "AS" prefix from it ...
- sline =3D sline.strip("AS")
-
- # ... and convert it into an integer. Voila.
- asn =3D int(sline)
-
# Filter invalid ASNs...
if not self._check_parsed_asn(asn):
log.warning("Skipping bogus ASN found in %s (%s): %s" % \
--=20
2.35.3
--===============8688037197236261996==--