From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id C72BC1FF15E for ; Mon, 13 Oct 2025 13:07:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CBCA511CF2; Mon, 13 Oct 2025 13:07:29 +0200 (CEST) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Mon, 13 Oct 2025 13:06:18 +0200 Message-ID: <20251013110719.18486-2-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251013110719.18486-1-s.ivanov@proxmox.com> References: <20251013110719.18486-1-s.ivanov@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1760353609049 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.071 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 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, proxmox.com] Subject: [pmg-devel] [PATCH pmg-api 1/2] api: quarantine: fix wrong backward-compatibility action 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" While renaming to blocklist/welcomelist we kept the old methods in the API for backward compatibilty, and added both options as equivalent actions. However it seems I substituted the backward compatibility name, as well at some point and did not notice it. Additionally the commits of renaming and re-adding the old names for backward compatibility were not separated cleanly (thus this patch fixes 2 commits). Reported in our German community forum: https://forum.proxmox.com/threads/.173910/ Tested by reproducing with a spamreport template with the old actions, and verified that the welcomelist action works with this patch. Fixes: ba7a7855 ("api: quarantine: re-add black- whitelist api methods for compatibilty") Fixes: 85981ebd ("api: quarantine: rename to block/welcomelist") Signed-off-by: Stoiko Ivanov --- src/PMG/API2/Quarantine.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PMG/API2/Quarantine.pm b/src/PMG/API2/Quarantine.pm index 3887a741..e38d3ab2 100644 --- a/src/PMG/API2/Quarantine.pm +++ b/src/PMG/API2/Quarantine.pm @@ -1433,7 +1433,7 @@ __PACKAGE__->register_method({ my $pmail = try_decode_utf8($ref->{pmail}); my $receiver = try_decode_utf8($ref->{receiver} // $ref->{pmail}); - if ($action eq 'welcomelist' || $action eq 'welcomelist') { + if ($action eq 'welcomelist' || $action eq 'whitelist') { PMG::Quarantine::add_to_blockwelcome($dbh, $pmail, 'WL', [$sender]); PMG::Quarantine::deliver_quarantined_mail($dbh, $ref, $receiver); } elsif ($action eq 'blocklist' || $action eq 'blacklist') { -- 2.47.3 _______________________________________________ pmg-devel mailing list pmg-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel