From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id C11D8917B5 for ; Thu, 15 Feb 2024 12:59:30 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A316E126C6 for ; Thu, 15 Feb 2024 12:59:00 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 15 Feb 2024 12:58:59 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id BE7CD4844C for ; Thu, 15 Feb 2024 12:58:59 +0100 (CET) From: Dominik Csapak To: pmg-devel@lists.proxmox.com Date: Thu, 15 Feb 2024 12:58:58 +0100 Message-Id: <20240215115859.1878868-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.020 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [quarantine.pm] Subject: [pmg-devel] [PATCH pmg-api 1/2] fix #4392: keep empty user bl/wl in database X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Feb 2024 11:59:30 -0000 since our cluster sync does currently not handle vanishing rows. So by keeping the empty entries, they get properly synced to the other nodes. Signed-off-by: Dominik Csapak --- This should be seen as a workaround for now. The "real" fix would probably be to use a better db schema for the user bl/wl. With that we have to do a db migration anyway so we can then cleanup the empty entries too. src/PMG/Quarantine.pm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/PMG/Quarantine.pm b/src/PMG/Quarantine.pm index d3d0640..bd231e4 100644 --- a/src/PMG/Quarantine.pm +++ b/src/PMG/Quarantine.pm @@ -71,16 +71,15 @@ sub add_to_blackwhite { } my $queries = "DELETE FROM UserPrefs WHERE pmail = $qu AND (Name = 'WL' OR Name = 'BL');"; - if (scalar(keys %{$list->{WL}})) { - $queries .= - "INSERT INTO UserPrefs (PMail, Name, Data, MTime) " . - "VALUES ($qu, 'WL', $wlist, EXTRACT (EPOCH FROM now())::INTEGER);"; - } - if (scalar(keys %{$list->{BL}})) { - $queries .= - "INSERT INTO UserPrefs (PMail, Name, Data, MTime) " . - "VALUES ($qu, 'BL', $blist, EXTRACT (EPOCH FROM now())::INTEGER);"; - } + + $queries .= + "INSERT INTO UserPrefs (PMail, Name, Data, MTime) " . + "VALUES ($qu, 'WL', $wlist, EXTRACT (EPOCH FROM now())::INTEGER);"; + + $queries .= + "INSERT INTO UserPrefs (PMail, Name, Data, MTime) " . + "VALUES ($qu, 'BL', $blist, EXTRACT (EPOCH FROM now())::INTEGER);"; + $dbh->do($queries); } -- 2.30.2