location-importer: Replace "UK" with "GB"

Message ID 7822de27-5ce9-dfbc-7408-9c5f0ecd7b2e@ipfire.org
State Accepted
Commit 01e5f0ffb0b4efabdca1c5e6a3f41bfb7f0d9f8f
Headers
Series location-importer: Replace "UK" with "GB" |

Commit Message

Peter Müller Dec. 12, 2021, 9:11 a.m. UTC
  Apparently, LACNIC does not to proper input validation on supplied
country codes, so people can use "UK", while they probably mean "GB"
instead.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
---
 src/python/location-importer.in | 4 ++++
 1 file changed, 4 insertions(+)
  

Patch

diff --git a/src/python/location-importer.in b/src/python/location-importer.in
index b791b4d..099af55 100644
--- a/src/python/location-importer.in
+++ b/src/python/location-importer.in
@@ -705,6 +705,10 @@  class CLI(object):
 						# ... but keep this list distinct...
 						continue
 
+				# When people set country codes to "UK", they actually mean "GB"
+				if val == "UK":
+					val = "GB"
+
 				inetnum[key].append(val)
 
 		# Skip empty objects