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 73186611AC for ; Thu, 19 Nov 2020 16:49:13 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6A80B945A for ; Thu, 19 Nov 2020 16:49:13 +0100 (CET) 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 DE139944F for ; Thu, 19 Nov 2020 16:49:11 +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 99FAD43C8A for ; Thu, 19 Nov 2020 16:49:11 +0100 (CET) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Thu, 19 Nov 2020 16:48:39 +0100 Message-Id: <20201119154839.4740-1-s.ivanov@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.088 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. [proxmox.com, utils.pm] Subject: [pmg-devel] [PATCH pmg-api] utils: ignore leading whitespace in sa description 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, 19 Nov 2020 15:49:13 -0000 load_sa_descriptions is used to parse the 'describe' lines for SpamAssassin rules for the SpamInfo in the quarantine view. The regex for parsing is too strict, since config lines can contain leading whitespace (e.g. due to indentation in an 'ifplugin' block) checked Mail::SpamAssassin::Conf::Parser and they strip leading/trailing whitespace as well. tested on my local setup with a quarantined mail which hit KAM_DMARC_STATUS. Signed-off-by: Stoiko Ivanov --- reported in our community forum: https://forum.proxmox.com/threads/consultation-about-the-meaning-of-some-pmg-smtp-filter-intercept-parameters.78962/ src/PMG/Utils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PMG/Utils.pm b/src/PMG/Utils.pm index 8a7021d..d3fae9e 100644 --- a/src/PMG/Utils.pm +++ b/src/PMG/Utils.pm @@ -1164,7 +1164,7 @@ sub load_sa_descriptions { return if !defined($fh); while (defined(my $line = <$fh>)) { - if ($line =~ m/^describe\s+(\S+)\s+(.*)\s*$/) { + if ($line =~ m/^(?:\s*)describe\s+(\S+)\s+(.*)\s*$/) { my ($name, $desc) = ($1, $2); next if $res->{$name}; $res->{$name}->{desc} = $desc; -- 2.20.1