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 7BE351FF15C for ; Wed, 2 Oct 2024 19:22:38 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0D9B112EBD; Wed, 2 Oct 2024 19:22:59 +0200 (CEST) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Wed, 2 Oct 2024 19:22:38 +0200 Message-Id: <20241002172238.20947-1-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.073 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. [perl.org, proxmox.com, pmg-scores.cf, sacustom.pm] Subject: [pmg-devel] [PATCH pmg-api] sa-custom: fix moving config across mountpoints 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" the custom scores are kept in /var/cache/pmg-scores.cf, until they are applied, by moving them to /etc/mail/spamassassin/pmg-scores.cf. This currently happens with perl's `rename` function [0], which is a wrapper for rename(2). `rename` does not work across filesystem boundaries (errors out with EXDEV). having `/var` on another filesystem is becoming less common, but should probably be supported. following the recommendation of [0] switch over to `File::Copy::move`, and add some error-checking. File::Copy is shipped with perl-modules-5.36, thus it does not introduce a new dependency reported in our community-forum: https://forum.proxmox.com/threads/.154814/ tested in a container with a seperate volume for `/var/cache`. other occurences of `rename` in the repo should not be affected (moving files within the same directory, or e.g. from /etc/pmg/master to /etc/pmg). [0] https://perldoc.perl.org/functions/rename Signed-off-by: Stoiko Ivanov --- src/PMG/SACustom.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/PMG/SACustom.pm b/src/PMG/SACustom.pm index f91ebf2..8b78aff 100644 --- a/src/PMG/SACustom.pm +++ b/src/PMG/SACustom.pm @@ -5,6 +5,7 @@ use warnings; use PVE::INotify; use Digest::SHA; +use File::Copy qw(move); my $shadow_path = "/var/cache/pmg-scores.cf"; my $conf_path = "/etc/mail/spamassassin/pmg-scores.cf"; @@ -14,7 +15,9 @@ sub get_shadow_path { } sub apply_changes { - rename($shadow_path, $conf_path) if -f $shadow_path; + if (-f $shadow_path) { + move($shadow_path, $conf_path) || die 'Moving custom scores configuration failed!\n'; + } } sub calc_digest { -- 2.39.5 _______________________________________________ pmg-devel mailing list pmg-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel