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 1/2] location-importer: Introduce auxiliary function to sanitise ASNs Date: Sun, 10 Oct 2021 18:16:19 +0200 Message-ID: <6e7024bb-71ec-66e6-252d-283c2a22666b@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3442802551746455114==" List-Id: --===============3442802551746455114== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Peter M=C3=BCller --- src/python/location-importer.in | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/python/location-importer.in b/src/python/location-importer.in index da058d3..c2b3e41 100644 --- a/src/python/location-importer.in +++ b/src/python/location-importer.in @@ -574,6 +574,22 @@ 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. + """ + + if not asn or not isinstance(asn, int): + return False + + if not ((1 <=3D asn and asn <=3D 23455) or (23457 <=3D asn and asn <=3D 64= 495) or (131072 <=3D asn and asn <=3D 4199999999)): + log.debug("Skipping invalid ASN: %s" % asn) + return False + + # ASN is fine if we made it here... + return True + 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 +845,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 --===============3442802551746455114==--