From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter =?utf-8?q?M=C3=BCller?= To: location@lists.ipfire.org Subject: [PATCH] Process LACNIC geofeed as well Date: Sat, 11 Dec 2021 22:59:22 +0100 Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0620982292333987450==" List-Id: --===============0620982292333987450== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This improves country code accurarcy for suballocations within IP space managed by LACNIC, as the delegated-extended-latest file only provides country code information at the top level of an allocated network. Sadly, lacnic.db.gz does not contain descriptions or names of Autonomous Systems within the space maintained by LACNIC. Signed-off-by: Peter M=C3=BCller --- src/python/importer.py | 4 ++- src/python/location-importer.in | 43 +++++++++++++++++++++++++++------ 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/src/python/importer.py b/src/python/importer.py index de340b4..dee36ed 100644 --- a/src/python/importer.py +++ b/src/python/importer.py @@ -53,7 +53,9 @@ WHOIS_SOURCES =3D { ], =20 # Latin America and Caribbean Network Information Centre - # XXX ??? + "LACNIC": [ + "https://ftp.lacnic.net/lacnic/dbase/lacnic.db.gz" + ], =20 # R=C3=A9seaux IP Europ=C3=A9ens "RIPE": [ diff --git a/src/python/location-importer.in b/src/python/location-importer.in index b791b4d..78bb846 100644 --- a/src/python/location-importer.in +++ b/src/python/location-importer.in @@ -681,13 +681,42 @@ class CLI(object): # Strip any excess space start_address, end_address =3D start_address.rstrip(), end_address.strip= () =20 - # Convert to IP address - try: - start_address =3D ipaddress.ip_address(start_address) - end_address =3D ipaddress.ip_address(end_address) - except ValueError: - log.warning("Could not parse line: %s" % line) - return + # Handle "inetnum" formatting in LACNIC DB (e.g. "24.152.8/22" instead o= f "24.152.8.0/22") + if start_address and not (delim or end_address): + try: + start_address =3D ipaddress.ip_network(start_address, strict=3DFalse) + except ValueError: + start_address =3D start_address.split("/") + ldigits =3D len(start_address[0].split(".")) + + # How many octets do we need to add? + # (LACNIC does not seem to have a /8 or greater assigned, so the follo= wing should suffice.) + if ldigits =3D=3D 2: + start_address =3D start_address[0] + ".0.0/" + start_address[1] + elif ldigits =3D=3D 3: + start_address =3D start_address[0] + ".0/" + start_address[1] + else: + log.warning("Could not recover IPv4 address from line in LACNIC DB fo= rmat: %s" % line) + return + + try: + start_address =3D ipaddress.ip_network(start_address, strict=3DFalse) + except ValueError: + log.warning("Could not parse line in LACNIC DB format: %s" % line) + return + + # Enumerate first and last IP address of this network + end_address =3D start_address[-1] + start_address =3D start_address[0] + + else: + # Convert to IP address + try: + start_address =3D ipaddress.ip_address(start_address) + end_address =3D ipaddress.ip_address(end_address) + except ValueError: + log.warning("Could not parse line: %s" % line) + return =20 inetnum["inetnum"] =3D list(ipaddress.summarize_address_range(start_addr= ess, end_address)) =20 --=20 2.26.2 --===============0620982292333987450==--