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 C66AC947FA for ; Thu, 22 Feb 2024 11:57:02 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9CFC76D59 for ; Thu, 22 Feb 2024 11:56:32 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 22 Feb 2024 11:56:31 +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 84C52448D0 for ; Thu, 22 Feb 2024 11:56:31 +0100 (CET) Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Thu, 22 Feb 2024 11:56:30 +0100 Message-Id: To: "Dominik Csapak" , From: "Stefan Sterz" X-Mailer: aerc 0.17.0-57-g782a17dfb056 References: <20240215115859.1878868-1-d.csapak@proxmox.com> In-Reply-To: <20240215115859.1878868-1-d.csapak@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL -0.080 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: Re: [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, 22 Feb 2024 10:57:02 -0000 On Thu Feb 15, 2024 at 12:58 PM CET, Dominik Csapak wrote: > 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. > this does seem to work as advertised. one small side-effect of keeping empty entries is that they will still be suggested in the front-ends combobox. syncing worked in both direction for me. > 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 =3D "DELETE FROM UserPrefs WHERE pmail =3D $qu AND (Name = =3D 'WL' OR Name =3D 'BL');"; > - if (scalar(keys %{$list->{WL}})) { > - $queries .=3D > - "INSERT INTO UserPrefs (PMail, Name, Data, MTime) " . > - "VALUES ($qu, 'WL', $wlist, EXTRACT (EPOCH FROM now())::INTEGER);"; > - } > - if (scalar(keys %{$list->{BL}})) { > - $queries .=3D > - "INSERT INTO UserPrefs (PMail, Name, Data, MTime) " . > - "VALUES ($qu, 'BL', $blist, EXTRACT (EPOCH FROM now())::INTEGER);"; > - } > + > + $queries .=3D > + "INSERT INTO UserPrefs (PMail, Name, Data, MTime) " . > + "VALUES ($qu, 'WL', $wlist, EXTRACT (EPOCH FROM now())::INTEGER);"; > + > + $queries .=3D > + "INSERT INTO UserPrefs (PMail, Name, Data, MTime) " . > + "VALUES ($qu, 'BL', $blist, EXTRACT (EPOCH FROM now())::INTEGER);"; > + one small nit (that really isn't this patches fault): imo this should be wrapped like this: ``` $queries .=3D "INSERT INTO UserPrefs (PMail, Name, Data, MTime) " . "VALUES ($qu, 'WL', $wlist, EXTRACT (EPOCH FROM now())::INTEGER);"; $queries .=3D "INSERT INTO UserPrefs (PMail, Name, Data, MTime) " . "VALUES ($qu, 'BL', $blist, EXTRACT (EPOCH FROM now())::INTEGER);"; ``` so consider this: Tested-by: Stefan Sterz > $dbh->do($queries); > } >