From: Peter Müller <peter.mueller@ipfire.org>
Date: Mon, 1 Nov 2021 18:24:14 +0000 (+0100)
Subject: location-importer: Introduce auxiliary function to sanitise ASNs
X-Git-Tag: 0.9.9~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=43fe570c1ec47d554cffe82878bbf893d7ef49d4;p=people%2Fms%2Flibloc.git

location-importer: Introduce auxiliary function to sanitise ASNs

The third version of this patch does this in an even more Pythonic way.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/python/location-importer.in b/src/python/location-importer.in
index da058d3..ede8a75 100644
--- a/src/python/location-importer.in
+++ b/src/python/location-importer.in
@@ -37,6 +37,14 @@ from location.i18n import _
 log = logging.getLogger("location.importer")
 log.propagate = 1
 
+# Define constants
+VALID_ASN_RANGES = (
+	(1, 23455),
+	(23457, 64495),
+	(131072, 4199999999),
+)
+
+
 class CLI(object):
 	def parse_cli(self):
 		parser = argparse.ArgumentParser(
@@ -574,6 +582,19 @@ class CLI(object):
 		# be suitable for libloc consumption...
 		return True
 
+	def _check_parsed_asn(self, asn):
+		"""
+			Assistive function to filter Autonomous System Numbers not being suitable
+			for adding to our database. Returns False in such cases, and True otherwise.
+		"""
+
+		for start, end in VALID_ASN_RANGES:
+			if start <= asn and end >= asn:
+				return True
+
+		log.info("Supplied ASN %s out of publicly routable ASN ranges" % asn)
+		return False
+
 	def _parse_block(self, block, source_key, validcountries = None):
 		# Get first line to find out what type of block this is
 		line = block[0]
@@ -829,8 +850,8 @@ class CLI(object):
 					log.debug("Skipping ARIN AS names line not containing an integer for ASN")
 					continue
 
-				if not ((1 <= asn and asn <= 23455) or (23457 <= asn and asn <= 64495) or (131072 <= asn and asn <= 4199999999)):
-					log.debug("Skipping ARIN AS names line not containing a valid ASN: %s" % asn)
+				# Filter invalid ASNs...
+				if not self._check_parsed_asn(asn):
 					continue
 
 				# Skip any AS name that appears to be a placeholder for a different RIR or entity...