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 B88FF648F7 for ; Wed, 30 Dec 2020 18:16:24 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AFA2F24785 for ; Wed, 30 Dec 2020 18:15:54 +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 5594B24777 for ; Wed, 30 Dec 2020 18:15:53 +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 2228E44719 for ; Wed, 30 Dec 2020 18:15:53 +0100 (CET) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Wed, 30 Dec 2020 18:15:36 +0100 Message-Id: <20201230171539.7644-2-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201230171539.7644-1-s.ivanov@proxmox.com> References: <20201230171539.7644-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.073 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 Subject: [pmg-devel] [PATCH pmg-api v2 1/4] add helper for parsing SA channel.d files 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: Wed, 30 Dec 2020 17:16:24 -0000 RHEL/CentOS based SpamAssassin implementations ship an update script, which reads shell snippets from /etc/mail/spamassassin/channel.d/*.conf and uses the information there to update SA rules from the configured channels [0]. Noticed the existence of this directory/mechanism while reading the announcement of the updatechannel for the KAM ruleset [1]. Parsing the file as text, instead of sourcing it in a shell, since I hope that the channel files distributed don't rely on running commands to get the ruleset url and gpg key. [0] https://src.fedoraproject.org/rpms/spamassassin/blob/master/f/sa-update.cronscript [1] https://mcgrail.com/template/kam.cf_channel Signed-off-by: Stoiko Ivanov --- v1->v2: * added anchors to all regex-matches src/PMG/Utils.pm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/PMG/Utils.pm b/src/PMG/Utils.pm index d3fae9e..ba6e839 100644 --- a/src/PMG/Utils.pm +++ b/src/PMG/Utils.pm @@ -1442,5 +1442,32 @@ sub domain_regex { return $regex; } +sub local_spamassassin_channels { + + my $res = []; + + my $local_channel_dir = '/etc/mail/spamassassin/channel.d/'; + my $read_sa_channel = sub { + my ($filename) = @_; + + my $channel_file = $local_channel_dir.$filename; + my $content = PVE::Tools::file_get_contents($channel_file); + my $channel = { + filename => $channel_file, + }; + + ($channel->{keyid}) = ($content =~ /^KEYID=([a-fA-F0-9]+)$/m); + die "no KEYID in $filename!\n" if !defined($channel->{keyid}); + ($channel->{channelurl}) = ($content =~ /^CHANNELURL=(.+)$/m); + die "no CHANNELURL in $filename!\n" if !defined($channel->{channelurl}); + ($channel->{gpgkey}) = ($content =~ /(?:^|\n)(-----BEGIN PGP PUBLIC KEY BLOCK-----.+-----END PGP PUBLIC KEY BLOCK-----)(?:\n|$)/s); + die "no GPG public key in $filename!\n" if !defined($channel->{gpgkey}); + + push(@$res, $channel); + }; + + PVE::Tools::dir_glob_foreach($local_channel_dir, '.*\.conf', $read_sa_channel); + return $res; +} 1; -- 2.20.1