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 v4 1/2] location-importer: Introduce auxiliary function to sanitise ASNs Date: Mon, 01 Nov 2021 19:24:14 +0100 Message-ID: <50907932-7f1f-e104-c409-736c4e4db029@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6226149920824852859==" List-Id: --===============6226149920824852859== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The third version of this patch does this in an even more Pythonic way. Signed-off-by: Peter M=C3=BCller --- src/python/location-importer.in | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) 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 =3D logging.getLogger("location.importer") log.propagate =3D 1 =20 +# Define constants +VALID_ASN_RANGES =3D ( + (1, 23455), + (23457, 64495), + (131072, 4199999999), +) + + class CLI(object): def parse_cli(self): parser =3D argparse.ArgumentParser( @@ -574,6 +582,19 @@ class CLI(object): # be suitable for libloc consumption... return True =20 + 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 otherwi= se. + """ + + for start, end in VALID_ASN_RANGES: + if start <=3D asn and end >=3D 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 =3D None): # Get first line to find out what type of block this is line =3D block[0] @@ -829,8 +850,8 @@ class CLI(object): log.debug("Skipping ARIN AS names line not containing an integer for AS= N") continue =20 - if not ((1 <=3D asn and asn <=3D 23455) or (23457 <=3D asn and asn <=3D = 64495) or (131072 <=3D asn and asn <=3D 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 =20 # Skip any AS name that appears to be a placeholder for a different RIR = or entity... --=20 2.26.2 --===============6226149920824852859==--