This one apparently went down the drain between these two patches: - https://patchwork.ipfire.org/project/location/patch/20210522125758.28770-1-p... - https://patchwork.ipfire.org/project/location/patch/aefd1904-4b38-f5cf-ab1d-...
Due to other safeguards, the current damage in production is limited to:
location=# SELECT * FROM networks WHERE country = 'ZZ'; network | country | original_countries | source --------------------+---------+--------------------+-------- 130.195.64.0/19 | ZZ | {ZZ} | APNIC 130.195.96.0/19 | ZZ | {ZZ} | APNIC 122.252.24.0/21 | ZZ | {ZZ} | APNIC 2406:840:10::/48 | ZZ | {ZZ} | APNIC 2406:840:fd0f::/48 | ZZ | {ZZ} | APNIC (5 rows)
Fixes: #12673
Signed-off-by: Peter Müller peter.mueller@ipfire.org --- src/python/location-importer.in | 1 + 1 file changed, 1 insertion(+)
diff --git a/src/python/location-importer.in b/src/python/location-importer.in index bec0b62..da058d3 100644 --- a/src/python/location-importer.in +++ b/src/python/location-importer.in @@ -702,6 +702,7 @@ class CLI(object): if validcountries and invalidcountries: log.warning("Skipping network with bogus countr(y|ies) %s (original countries: %s): %s" % \ (invalidcountries, inetnum.get("country"), inetnum.get("inet6num") or inetnum.get("inetnum"))) + break
# Everything is fine here, run INSERT statement... self.db.execute("INSERT INTO _rirdata(network, country, original_countries, source) \
Hello,
Are you sure you don’t want this to be “continue”?
On 8 Aug 2021, at 23:31, Peter Müller peter.mueller@ipfire.org wrote:
This one apparently went down the drain between these two patches:
- https://patchwork.ipfire.org/project/location/patch/20210522125758.28770-1-p...
- https://patchwork.ipfire.org/project/location/patch/aefd1904-4b38-f5cf-ab1d-...
Due to other safeguards, the current damage in production is limited to:
location=# SELECT * FROM networks WHERE country = 'ZZ'; network | country | original_countries | source --------------------+---------+--------------------+-------- 130.195.64.0/19 | ZZ | {ZZ} | APNIC 130.195.96.0/19 | ZZ | {ZZ} | APNIC 122.252.24.0/21 | ZZ | {ZZ} | APNIC 2406:840:10::/48 | ZZ | {ZZ} | APNIC 2406:840:fd0f::/48 | ZZ | {ZZ} | APNIC (5 rows)
Fixes: #12673
Signed-off-by: Peter Müller peter.mueller@ipfire.org
src/python/location-importer.in | 1 + 1 file changed, 1 insertion(+)
diff --git a/src/python/location-importer.in b/src/python/location-importer.in index bec0b62..da058d3 100644 --- a/src/python/location-importer.in +++ b/src/python/location-importer.in @@ -702,6 +702,7 @@ class CLI(object): if validcountries and invalidcountries: log.warning("Skipping network with bogus countr(y|ies) %s (original countries: %s): %s" % \ (invalidcountries, inetnum.get("country"), inetnum.get("inet6num") or inetnum.get("inetnum")))
break # Everything is fine here, run INSERT statement... self.db.execute("INSERT INTO _rirdata(network, country, original_countries, source) \-- 2.26.2
Hello Michael,
yes: All networks processed in this for-loop have the same country code set. If one of them is found to have an invalid country code set, all the others of this batch will do so as well - there is no need to check them individually.
Thanks, and best regards, Peter Müller
Hello,
Are you sure you don’t want this to be “continue”?
On 8 Aug 2021, at 23:31, Peter Müller peter.mueller@ipfire.org wrote:
This one apparently went down the drain between these two patches:
- https://patchwork.ipfire.org/project/location/patch/20210522125758.28770-1-p...
- https://patchwork.ipfire.org/project/location/patch/aefd1904-4b38-f5cf-ab1d-...
Due to other safeguards, the current damage in production is limited to:
location=# SELECT * FROM networks WHERE country = 'ZZ'; network | country | original_countries | source --------------------+---------+--------------------+-------- 130.195.64.0/19 | ZZ | {ZZ} | APNIC 130.195.96.0/19 | ZZ | {ZZ} | APNIC 122.252.24.0/21 | ZZ | {ZZ} | APNIC 2406:840:10::/48 | ZZ | {ZZ} | APNIC 2406:840:fd0f::/48 | ZZ | {ZZ} | APNIC (5 rows)
Fixes: #12673
Signed-off-by: Peter Müller peter.mueller@ipfire.org
src/python/location-importer.in | 1 + 1 file changed, 1 insertion(+)
diff --git a/src/python/location-importer.in b/src/python/location-importer.in index bec0b62..da058d3 100644 --- a/src/python/location-importer.in +++ b/src/python/location-importer.in @@ -702,6 +702,7 @@ class CLI(object): if validcountries and invalidcountries: log.warning("Skipping network with bogus countr(y|ies) %s (original countries: %s): %s" % \ (invalidcountries, inetnum.get("country"), inetnum.get("inet6num") or inetnum.get("inetnum")))
break # Everything is fine here, run INSERT statement... self.db.execute("INSERT INTO _rirdata(network, country, original_countries, source) \-- 2.26.2
Okay, merged. Thank you for the clarification.
On 9 Aug 2021, at 15:05, Peter Müller peter.mueller@ipfire.org wrote:
Hello Michael,
yes: All networks processed in this for-loop have the same country code set. If one of them is found to have an invalid country code set, all the others of this batch will do so as well - there is no need to check them individually.
Thanks, and best regards, Peter Müller
Hello,
Are you sure you don’t want this to be “continue”?
On 8 Aug 2021, at 23:31, Peter Müller peter.mueller@ipfire.org wrote:
This one apparently went down the drain between these two patches:
- https://patchwork.ipfire.org/project/location/patch/20210522125758.28770-1-p...
- https://patchwork.ipfire.org/project/location/patch/aefd1904-4b38-f5cf-ab1d-...
Due to other safeguards, the current damage in production is limited to:
location=# SELECT * FROM networks WHERE country = 'ZZ'; network | country | original_countries | source --------------------+---------+--------------------+-------- 130.195.64.0/19 | ZZ | {ZZ} | APNIC 130.195.96.0/19 | ZZ | {ZZ} | APNIC 122.252.24.0/21 | ZZ | {ZZ} | APNIC 2406:840:10::/48 | ZZ | {ZZ} | APNIC 2406:840:fd0f::/48 | ZZ | {ZZ} | APNIC (5 rows)
Fixes: #12673
Signed-off-by: Peter Müller peter.mueller@ipfire.org
src/python/location-importer.in | 1 + 1 file changed, 1 insertion(+)
diff --git a/src/python/location-importer.in b/src/python/location-importer.in index bec0b62..da058d3 100644 --- a/src/python/location-importer.in +++ b/src/python/location-importer.in @@ -702,6 +702,7 @@ class CLI(object): if validcountries and invalidcountries: log.warning("Skipping network with bogus countr(y|ies) %s (original countries: %s): %s" % \ (invalidcountries, inetnum.get("country"), inetnum.get("inet6num") or inetnum.get("inetnum")))
break # Everything is fine here, run INSERT statement... self.db.execute("INSERT INTO _rirdata(network, country, original_countries, source) \-- 2.26.2
-
Michael Tremer -
Peter Müller