From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id D538F1FF16F for ; Thu, 30 Jan 2025 12:21:57 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0E0D4F68F; Thu, 30 Jan 2025 12:21:56 +0100 (CET) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Thu, 30 Jan 2025 12:21:40 +0100 Message-Id: <20250130112140.42219-3-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250130112140.42219-1-s.ivanov@proxmox.com> References: <20250130112140.42219-1-s.ivanov@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.068 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pmg-devel] [PATCH pmg-api 2/2] fix #6126: do not deliver/delete quarantined mails multiple times 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pmg-devel-bounces@lists.proxmox.com Sender: "pmg-devel" This was reported through our enterprise support and was easy to reproduce. When clicking on the action-links in the spamreport multiple times the action was equally done multiple times, which was surprising especially when you deliver a quarantined mail more than once. As quarantined mail-files are not deleted upon deliver/delete (mails can have multiple recipients), but asynchronously after the quarantine lifetime they are only marked with status 'D'. Use this information to prevent multiple deliveries and superfluous database updates. Signed-off-by: Stoiko Ivanov --- src/PMG/Quarantine.pm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/PMG/Quarantine.pm b/src/PMG/Quarantine.pm index 28138ba..77f64a0 100644 --- a/src/PMG/Quarantine.pm +++ b/src/PMG/Quarantine.pm @@ -95,6 +95,12 @@ sub deliver_quarantined_mail { my $id = 'C' . $ref->{cid} . 'R' . $ref->{rid} . 'T' . $ref->{ticketid};; + if ($ref->{status} eq 'D') { + syslog('info', "quarantined mail '$id' ($path) has already been delivered or marked as " . + "deleted for $receiver!"); + return 1; + } + my $parser = PMG::MIMEUtils::new_mime_parser({ nested => 1, decode_bodies => 0, @@ -148,6 +154,12 @@ sub delete_quarantined_mail { my $id = 'C' . $ref->{cid} . 'R' . $ref->{rid} . 'T' . $ref->{ticketid};; + if ($ref->{status} eq 'D') { + syslog('info', "quarantined mail '$id' ($path) has already been delivered or marked as " . + "deleted for $pmail"); + return 1; + } + eval { my $sth = $dbh->prepare( "UPDATE CMSReceivers SET Status='D', MTime = ? WHERE " . -- 2.39.5 _______________________________________________ pmg-devel mailing list pmg-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel