From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter =?utf-8?q?M=C3=BCller?= <peter.mueller@ipfire.org> To: location@lists.ipfire.org Subject: [PATCH] location-importer: Set "is_drop" to "True" even in case of conflicts Date: Sat, 11 Dec 2021 19:01:54 +0100 Message-ID: <19b33f2c-e801-24be-0c3c-ea2a667109b2@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4010079272414558587==" List-Id: <location.lists.ipfire.org> --===============4010079272414558587== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Previously, any present override for a given network or ASN would have caused the SQL statement not to conduct anything at all. Since "is_drop" is the only flag being actually set here, it makes sense to do so in case of already present overrides as well. The effect of this is limited: Our own override files are always considered at last, so in case of conflicts they will be the ultima ratio. This is an intended behaviour, but slipped my mind when I filed bug #12728, so this patch can only be seen as a partial solution - the rest is not a bug, but a feature. :-) Partially fixes: #12728 Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- src/python/location-importer.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/python/location-importer.in b/src/python/location-importer.in index b791b4d..b3e3658 100644 --- a/src/python/location-importer.in +++ b/src/python/location-importer.in @@ -1320,7 +1320,7 @@ class CLI(object): source, is_drop ) VALUES (%s, %s, %s) - ON CONFLICT (network) DO NOTHING""", + ON CONFLICT (network) DO UPDATE SET is_drop = True""", "%s" % network, "Spamhaus DROP lists", True @@ -1368,7 +1368,7 @@ class CLI(object): source, is_drop ) VALUES (%s, %s, %s) - ON CONFLICT (number) DO NOTHING""", + ON CONFLICT (number) DO UPDATE SET is_drop = True""", "%s" % asn, "Spamhaus ASN-DROP list", True -- 2.26.2 --===============4010079272414558587==--