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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 2092BBACF6 for ; Fri, 15 Dec 2023 19:48:14 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E7DDD74E4 for ; Fri, 15 Dec 2023 19:47:43 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 15 Dec 2023 19:47:42 +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 2F93C47A6D for ; Fri, 15 Dec 2023 19:47:42 +0100 (CET) Date: Fri, 15 Dec 2023 19:47:40 +0100 From: Stoiko Ivanov To: Dominik Csapak Cc: pmg-devel@lists.proxmox.com Message-ID: References: <20230414110638.2491262-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230414110638.2491262-1-d.csapak@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.088 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - 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, quarantine.pm] Subject: [pmg-devel] applied: [RFC PATCH pmg-api] api: quarantine: include descriptions for KAM rules in the spaminfo 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: Fri, 15 Dec 2023 18:48:14 -0000 applied the patch after testing - huge Thanks! the spamassassin updates have been in /var/lib/spamassassin/$saversion/$channelurl for a very long time (at least since 2010) - so I guess I'd consider this stable :) On Fri, Apr 14, 2023 at 01:06:38PM +0200, Dominik Csapak wrote: > so that the KAM rules also get a description instead of '-' > > Signed-off-by: Dominik Csapak > --- > sending as RFC because i'm not sure if that path is fixed, and if not > how we'd get that > > src/PMG/API2/Quarantine.pm | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/src/PMG/API2/Quarantine.pm b/src/PMG/API2/Quarantine.pm > index 7101795..a100e11 100644 > --- a/src/PMG/API2/Quarantine.pm > +++ b/src/PMG/API2/Quarantine.pm > @@ -72,8 +72,9 @@ sub decode_spaminfo { > > my $salocaldir = "/var/lib/spamassassin/$saversion/updates_spamassassin_org"; > my $sacustomdir = "/etc/mail/spamassassin"; > + my $kamdir = "/var/lib/spamassassin/$saversion/kam_sa-channels_mcgrail_com"; > > - $spamdesc = PMG::Utils::load_sa_descriptions([$salocaldir, $sacustomdir]) if !$spamdesc; > + $spamdesc = PMG::Utils::load_sa_descriptions([$salocaldir, $sacustomdir, $kamdir]) if !$spamdesc; > > foreach my $test (split (',', $info)) { > my ($name, $score) = split (':', $test); > -- > 2.30.2 > > > > _______________________________________________ > pmg-devel mailing list > pmg-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel > >