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 1EB8F6C9FE for ; Tue, 30 Mar 2021 17:06:25 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0CDD82C766 for ; Tue, 30 Mar 2021 17:05:55 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 id E941B2C75B for ; Tue, 30 Mar 2021 17:05:53 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A976745951 for ; Tue, 30 Mar 2021 17:05:53 +0200 (CEST) From: Thomas Lamprecht To: pmg-devel@lists.proxmox.com Date: Tue, 30 Mar 2021 17:05:47 +0200 Message-Id: <20210330150547.21333-1-t.lamprecht@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.045 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record 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] fix #2228: automatically deliver/delete on whitelist/blacklist 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: Tue, 30 Mar 2021 15:06:25 -0000 If a user chooses to blacklist a specific sender of a mail, the mail is highly probably undesired too, so delete it in that case. The reverse should hold for white listing a mail's sender, deliver it in that case. Signed-off-by: Thomas Lamprecht --- The bug report talked about doing this opt-out, but I really do not see when one would think along the lines of "that sender is always spam, blacklist them but keep that specific mail" so just do it unconditionally. src/PMG/API2/Quarantine.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/PMG/API2/Quarantine.pm b/src/PMG/API2/Quarantine.pm index 848ae8e..2fa1bb4 100644 --- a/src/PMG/API2/Quarantine.pm +++ b/src/PMG/API2/Quarantine.pm @@ -1228,8 +1228,10 @@ __PACKAGE__->register_method ({ if ($action eq 'whitelist') { PMG::Quarantine::add_to_blackwhite($dbh, $ref->{pmail}, 'WL', [ $sender ]); + PMG::Quarantine::deliver_quarantined_mail($dbh, $ref, $ref->{receiver} // $ref->{pmail}); } elsif ($action eq 'blacklist') { PMG::Quarantine::add_to_blackwhite($dbh, $ref->{pmail}, 'BL', [ $sender ]); + PMG::Quarantine::delete_quarantined_mail($dbh, $ref); } elsif ($action eq 'deliver') { PMG::Quarantine::deliver_quarantined_mail($dbh, $ref, $ref->{receiver} // $ref->{pmail}); } elsif ($action eq 'delete') { -- 2.20.1