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 01649648C6 for ; Wed, 30 Dec 2020 14:07:42 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F20D02239C for ; Wed, 30 Dec 2020 14:07:11 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id E996422391 for ; Wed, 30 Dec 2020 14:07:10 +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 B1DAE446CB for ; Wed, 30 Dec 2020 14:07:10 +0100 (CET) Date: Wed, 30 Dec 2020 14:07:03 +0100 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: pmg-devel@lists.proxmox.com, Stoiko Ivanov References: <20201216171813.29694-1-s.ivanov@proxmox.com> <20201216171813.29694-2-s.ivanov@proxmox.com> In-Reply-To: <20201216171813.29694-2-s.ivanov@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.15.0 (https://github.com/astroidmail/astroid) Message-Id: <1609332643.euaiuk9qax.astroid@nora.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.024 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: Re: [pmg-devel] [PATCH pmg-api 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 13:07:42 -0000 On December 16, 2020 6:18 pm, Stoiko Ivanov wrote: > 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]. >=20 > Noticed the existence of this directory/mechanism while reading the > announcement of the updatechannel for the KAM ruleset [1]. >=20 > 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. >=20 > [0] https://src.fedoraproject.org/rpms/spamassassin/blob/master/f/sa-upda= te.cronscript > [1] https://mcgrail.com/template/kam.cf_channel >=20 > Signed-off-by: Stoiko Ivanov > --- > src/PMG/Utils.pm | 27 +++++++++++++++++++++++++++ > 1 file changed, 27 insertions(+) >=20 > diff --git a/src/PMG/Utils.pm b/src/PMG/Utils.pm > index d3fae9e..3f5b045 100644 > --- a/src/PMG/Utils.pm > +++ b/src/PMG/Utils.pm > @@ -1442,5 +1442,32 @@ sub domain_regex { > return $regex; > } > =20 > +sub local_spamassassin_channels { > + > + my $res =3D []; > + > + my $local_channel_dir =3D '/etc/mail/spamassassin/channel.d/'; > + my $read_sa_channel =3D sub { > + my ($filename) =3D @_; > + > + my $channel_file =3D $local_channel_dir.$filename; > + my $content =3D PVE::Tools::file_get_contents($channel_file); > + my $channel =3D { > + filename =3D> $channel_file, > + }; > + > + ($channel->{keyid}) =3D ($content =3D~ /^KEYID=3D([a-fA-F0-9]+)$/m); > + die "no KEYID in $filename!\n" if !defined($channel->{keyid}); > + ($channel->{channelurl}) =3D ($content =3D~ /CHANNELURL=3D(.+)$/m); should maybe be anchored as well? > + die "no CHANNELURL in $filename!\n" if !defined($channel->{channelurl})= ; > + ($channel->{gpgkey}) =3D ($content =3D~ /(-----BEGIN PGP PUBLIC KEY BLO= CK-----.+-----END PGP PUBLIC KEY BLOCK-----)/s); could also be anchored: (^|\n) (\n|$) or something similar > + 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_s= a_channel); > + return $res; > +} > =20 > 1; > --=20 > 2.20.1 >=20 >=20 >=20 > _______________________________________________ > pmg-devel mailing list > pmg-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel >=20 >=20 >=20 =