From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: location@lists.ipfire.org Subject: Re: [PATCH 1/2] location-importer: Introduce auxiliary function to sanitise ASNs Date: Tue, 12 Oct 2021 12:23:57 +0100 Message-ID: In-Reply-To: <6e7024bb-71ec-66e6-252d-283c2a22666b@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4212915037544805616==" List-Id: --===============4212915037544805616== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello, > On 10 Oct 2021, at 17:16, Peter M=C3=BCller wr= ote: >=20 > Signed-off-by: Peter M=C3=BCller > --- > src/python/location-importer.in | 20 ++++++++++++++++++-- > 1 file changed, 18 insertions(+), 2 deletions(-) >=20 > 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 suitab= le > + for adding to our database. Returns False in such cases, and True other= wise. > + """ > + > + if not asn or not isinstance(asn, int): > + return False Does this happen that a non-integer is being passed to this function? You also return False for zero without logging the message. I would suggest to drop the check above. > + > + 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 invalid ASN: %s" % asn) > + return False This works, but I do not consider this very Pythonic. I would have written a tuple which conatins one tuple for each range and then= iterate over that until you find a match. > + > + # ASN is fine if we made it here... > + return True Ellipses in comments are sometimes weird... > + > 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 A= SN") > 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 --===============4212915037544805616==--