Re: [PATCH] location-importer.in: process unaligned IP ranges in RIR data files correctly

[Michael Tremer <michael.tremer@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 3747 bytes --]

Thank you for this.

Are there any other things coming or can I go ahead and tag another version to roll these changes out into production?

-Michael

> On 29 Mar 2021, at 21:24, Peter Müller <peter.mueller(a)ipfire.org> wrote:
> 
> The IP range given in an inetnum object apparently not necessarily
> matches distinct subnet boundaries. As a result, the current attempt to
> calculate its CIDR mask resulted in faulty subnets not covering the
> entire IP range.
> 
> This patch leaves the task of enumerating subnets to the ipaddress
> module itself, which handles things much more robust. Since the output
> may contain of several subnets, a list for the inetnum key is necessary
> as well as a loop over them when conducting the SQL statements.
> 
> Fixes: #12595
> 
> Cc: Michael Tremer <michael.tremer(a)ipfire.org>
> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
> ---
> src/python/location-importer.in | 31 +++++++++++--------------------
> 1 file changed, 11 insertions(+), 20 deletions(-)
> 
> diff --git a/src/python/location-importer.in b/src/python/location-importer.in
> index 2506925..e2f201b 100644
> --- a/src/python/location-importer.in
> +++ b/src/python/location-importer.in
> @@ -3,7 +3,7 @@
> #                                                                             #
> # libloc - A library to determine the location of someone on the Internet     #
> #                                                                             #
> -# Copyright (C) 2020 IPFire Development Team <info(a)ipfire.org>                #
> +# Copyright (C) 2020-2021 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                  #
> @@ -604,18 +604,10 @@ class CLI(object):
> 					log.warning("Could not parse line: %s" % line)
> 					return
> 
> -				# Set prefix to default
> -				prefix = 32
> -
> -				# Count number of addresses in this subnet
> -				num_addresses = int(end_address) - int(start_address)
> -				if num_addresses:
> -					prefix -= math.log(num_addresses, 2)
> -
> -				inetnum["inetnum"] = "%s/%.0f" % (start_address, prefix)
> +				inetnum["inetnum"] = list(ipaddress.summarize_address_range(start_address, end_address))
> 
> 			elif key == "inet6num":
> -				inetnum[key] = val
> +				inetnum[key] = [ipaddress.ip_network(val, strict=False)]
> 
> 			elif key == "country":
> 				inetnum[key] = val.upper()
> @@ -630,15 +622,14 @@ class CLI(object):
> 				(inetnum.get("inet6num") or inetnum.get("inetnum")))
> 			return
> 
> -		network = ipaddress.ip_network(inetnum.get("inet6num") or inetnum.get("inetnum"), strict=False)
> -
> -		if not self._check_parsed_network(network):
> -			return
> -
> -		self.db.execute("INSERT INTO _rirdata(network, country) \
> -			VALUES(%s, %s) ON CONFLICT (network) DO UPDATE SET country = excluded.country",
> -			"%s" % network, inetnum.get("country"),
> -		)
> +		# Iterate through all networks enumerated from above, check them for plausibility and insert
> +		# them into the database, if _check_parsed_network() succeeded
> +		for single_network in inetnum.get("inet6num") or inetnum.get("inetnum"):
> +			if self._check_parsed_network(single_network):
> +				self.db.execute("INSERT INTO _rirdata(network, country) \
> +					VALUES(%s, %s) ON CONFLICT (network) DO UPDATE SET country = excluded.country",
> +					"%s" % single_network, inetnum.get("country"),
> +				)
> 
> 	def _parse_org_block(self, block):
> 		org = {}
> -- 
> 2.26.2