location-import.in: optimise regular expression for filtering ASN allocations to...

https://lists.ipfire.org/pipermail/location/2021-June/000394.html

Reported-by: Michael Tremer <michael.tremer@ipfire.org>
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 b235db7b19c949e262bfbeff30b2e233fd7a91f0..ff90d915b33cd3b76c55549a8866e0a93cc82762 100644 (file)
--- a/src/python/location-importer.in
+++ b/src/python/location-importer.in
@@ -811,7 +811,7 @@ class CLI(object):
                                        continue
 
                                # Skip any AS name that appears to be a placeholder for a different RIR or entity...
-                               if re.match(r"^(ASN-BLK|)(AFCONC|AFRINIC|APNIC|ASNBLK|DNIC|LACNIC|RIPE|IANA)(\d?$|\-.*)", name):
+                               if re.match(r"^(ASN-BLK|)(AFCONC|AFRINIC|APNIC|ASNBLK|DNIC|LACNIC|RIPE|IANA)(?:\d?$|\-)", name):
                                        continue
 
                                # Bail out in case the AS name contains anything we do not expect here...