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 1863568D45 for ; Fri, 15 Jan 2021 10:59:31 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 068642312F for ; Fri, 15 Jan 2021 10:59:01 +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 584CD23125 for ; Fri, 15 Jan 2021 10:59:00 +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 2638B449AC for ; Fri, 15 Jan 2021 10:59:00 +0100 (CET) To: Stoiko Ivanov , pmg-devel@lists.proxmox.com References: <20201230171539.7644-1-s.ivanov@proxmox.com> <20201230171539.7644-4-s.ivanov@proxmox.com> From: Thomas Lamprecht Message-ID: <98aeece2-adbc-287c-8e1b-f38aa85e0c2b@proxmox.com> Date: Fri, 15 Jan 2021 10:58:59 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:85.0) Gecko/20100101 Thunderbird/85.0 MIME-Version: 1.0 In-Reply-To: <20201230171539.7644-4-s.ivanov@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.051 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.237 Looks like a legit reply (A) 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. [spamassassin.pm, utils.pm] Subject: Re: [pmg-devel] [PATCH pmg-api v2 3/4] api: spamassassin: update local channels 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 Jan 2021 09:59:31 -0000 On 30.12.20 18:15, Stoiko Ivanov wrote: > This patch adds a helper to loop over all present Spamassassin > channels files in /etc/mail/spamassassin/channel.d and: > * import the included gpg key into sa-update's keyring > * run sa-update for each channel separately >=20 > the verbose argument of the helper is for reusing the code in > pmg-daily (where we only want to log errors and be less informative) >=20 > In order to only hardcode the path of sa-update once the definition > was moved to PMG::Utils. >=20 > The choice of invoking sa-update for each channel separately, instead > of providing multiple '--channel' and '--gpgkey' options to a single > command was made to prevent downloading signatures, which were signed > by a key not configured for the channel. >=20 > Importing gpg-keys is also done with individual sa-update invocations, > because sa-update only imports the last present --import argument > (wrong use of Getopt::Long) >=20 > Signed-off-by: Stoiko Ivanov > --- > src/PMG/API2/SpamAssassin.pm | 6 +++--- > src/PMG/Utils.pm | 31 +++++++++++++++++++++++++++++++ > 2 files changed, 34 insertions(+), 3 deletions(-) >=20 > diff --git a/src/PMG/API2/SpamAssassin.pm b/src/PMG/API2/SpamAssassin.p= m > index 6b9f8f9..fa638c4 100644 > --- a/src/PMG/API2/SpamAssassin.pm > +++ b/src/PMG/API2/SpamAssassin.pm > @@ -11,15 +11,13 @@ use PVE::RESTHandler; > use PMG::RESTEnvironment; > use PVE::JSONSchema qw(get_standard_option); > =20 > -use PMG::Utils; > +use PMG::Utils qw($SAUPDATE); can we please avoid the $SAUPDATE variable completely, either just direct= ly use "sa-updates" with no path prefixed as this is much cleaner and safer to d= o, we have a sensible PATH env after all and having fixed paths made problems i= n the past (especially with usr-merge in built systems). If you must, add a sa_update helper method doing the actual run_command a= nd some possible other common things, maybe even having a clean, not overly gener= al, parameter signature. > use PMG::Config; > =20 > use Mail::SpamAssassin; > =20 > use base qw(PVE::RESTHandler); > =20 > -my $SAUPDATE =3D '/usr/bin/sa-update'; > - > __PACKAGE__->register_method ({ > name =3D> 'index', > path =3D> '', > @@ -174,6 +172,8 @@ __PACKAGE__->register_method({ > my $cmd =3D "$SAUPDATE -v"; > =20 > PVE::Tools::run_command($cmd, noerr =3D> 1); > + > + PMG::Utils::update_local_spamassassin_channels(1); > }; > =20 > return $rpcenv->fork_worker('saupdate', undef, $authuser, $realcmd); > diff --git a/src/PMG/Utils.pm b/src/PMG/Utils.pm > index ba6e839..9992c64 100644 > --- a/src/PMG/Utils.pm > +++ b/src/PMG/Utils.pm > @@ -44,6 +44,7 @@ use base 'Exporter'; > =20 > our @EXPORT_OK =3D qw( > postgres_admin_cmd > +$SAUPDATE > ); > =20 > my $valid_pmg_realms =3D ['pam', 'pmg', 'quarantine']; > @@ -1442,6 +1443,8 @@ sub domain_regex { > return $regex; > } > =20 > +our $SAUPDATE =3D '/usr/bin/sa-update'; > + > sub local_spamassassin_channels { > =20 > my $res =3D []; > @@ -1470,4 +1473,32 @@ sub local_spamassassin_channels { > return $res; > } > =20 > +sub update_local_spamassassin_channels { > + my ($verbose) =3D @_; > + # import all configured channel's gpg-keys to sa-update's keyring > + my $localchannels =3D PMG::Utils::local_spamassassin_channels(); > + for my $channel (@$localchannels) { > + my $importcmd =3D [$SAUPDATE, '--import', $channel->{filename}]; > + push @$importcmd, '-v' if $verbose; > + > + print "Importing gpg key from $channel->{filename}\n" if $verbose; > + PVE::Tools::run_command($importcmd); > + } > + > + my $fresh_updates =3D 0; > + > + for my $channel (@$localchannels) { > + my $cmd =3D [$SAUPDATE, '--channel', $channel->{channelurl}, '--gpgke= y', $channel->{keyid}]; > + push @$cmd, '-v' if $verbose; > + > + print "Updating $channel->{channelurl}\n" if $verbose; > + my $ret =3D PVE::Tools::run_command($cmd, noerr =3D> 1); > + die "updating $channel->{channelurl} failed - sa-update exited with $= ret\n" if $ret >=3D 2; > + > + $fresh_updates =3D 1 if $ret =3D=3D 0; > + } > + > + return $fresh_updates > +} > + > 1; >=20