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 1A00B64948 for ; Wed, 30 Dec 2020 14:07:52 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0DC17223A7 for ; Wed, 30 Dec 2020 14:07:22 +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 228222239D for ; Wed, 30 Dec 2020 14:07:21 +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 DA532446CB for ; Wed, 30 Dec 2020 14:07:20 +0100 (CET) Date: Wed, 30 Dec 2020 14:07:14 +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-3-s.ivanov@proxmox.com> In-Reply-To: <20201216171813.29694-3-s.ivanov@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.15.0 (https://github.com/astroidmail/astroid) Message-Id: <1609333126.u0qqj6cegn.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 2/4] api: spamassassin: read 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: Wed, 30 Dec 2020 13:07:52 -0000 On December 16, 2020 6:18 pm, Stoiko Ivanov wrote: > Signed-off-by: Stoiko Ivanov > --- > the patch of src/PMG/API2/SpamAssassin mostly indents code and I found it > helpful to view it with `git diff -w` >=20 > src/PMG/API2/SpamAssassin.pm | 83 +++++++++++++++++++++--------------- > 1 file changed, 49 insertions(+), 34 deletions(-) >=20 > diff --git a/src/PMG/API2/SpamAssassin.pm b/src/PMG/API2/SpamAssassin.pm > index eab02d9..5f9c3a5 100644 > --- a/src/PMG/API2/SpamAssassin.pm > +++ b/src/PMG/API2/SpamAssassin.pm > @@ -80,50 +80,65 @@ __PACKAGE__->register_method({ > my ($param) =3D @_; > =20 > my $saversion =3D $Mail::SpamAssassin::VERSION; > - my $channelfile =3D "/var/lib/spamassassin/$saversion/updates_spamassas= sin_org.cf"; > + my $sa_update_dir =3D "/var/lib/spamassassin/$saversion/"; > + > + my $check_channel =3D sub { > + my ($channel) =3D @_; > + > + # taken from sa-update: > + my $channel_file_base =3D $channel; > + $channel_file_base =3D~ tr/A-Za-z0-9-/_/cs; this is syntax we don't use anywhere else, so maybe add a comment or=20 rewrite it using a regular replacement? > + my $channelfile =3D "${sa_update_dir}${channel_file_base}.cf"; > + > + my $mtime =3D -1; > + my $version =3D -1; > + my $newversion =3D -1; > + > + if (-f $channelfile) { > + # stat metadata cf file > + $mtime =3D (stat($channelfile))[9]; # 9 is mtime > + > + # parse version from metadata cf file > + my $metadata =3D PVE::Tools::file_read_firstline($channelfile); > + if ($metadata =3D~ m/\s([0-9]+)$/) { > + $version =3D $1; > + } else { > + warn "invalid metadata in '$channelfile'\n"; > + } > + } > + # call sa-update to see if updates are available > =20 > - my $mtime =3D -1; > - my $version =3D -1; > - my $newversion =3D -1; > + my $cmd =3D "$SAUPDATE -v --checkonly --channel $channel"; > + PVE::Tools::run_command($cmd, noerr =3D> 1, logfunc =3D> sub { > + my ($line) =3D @_; > =20 > - if (-f $channelfile) { > - # stat metadata cf file > - $mtime =3D (stat($channelfile))[9]; # 9 is mtime > + if ($line =3D~ m/Update available for channel \S+: -?[0-9]+ -> ([0-9]+= )/) { > + $newversion =3D $1; > + } > + }); > =20 > - # parse version from metadata cf file > - my $metadata =3D PVE::Tools::file_read_firstline($channelfile); > - if ($metadata =3D~ m/\s([0-9]+)$/) { > - $version =3D $1; > - } else { > - warn "invalid metadata in '$channelfile'\n"; > - } > - } > - # call sa-update to see if updates are available > + my $result =3D { > + channel =3D> $channel, > + }; > =20 > - my $cmd =3D "$SAUPDATE -v --checkonly"; > - PVE::Tools::run_command($cmd, noerr =3D> 1, logfunc =3D> sub { > - my ($line) =3D @_; > + $result->{version} =3D $version if $version > -1; > + $result->{update_version} =3D $newversion if $newversion > -1; > + $result->{last_updated} =3D $mtime if $mtime > -1; > =20 > - if ($line =3D~ m/Update available for channel \S+: -?[0-9]+ -> ([0-= 9]+)/) { > - $newversion =3D $1; > + if ($newversion > $version) { > + $result->{update_avail} =3D 1; > + } else { > + $result->{update_avail} =3D 0; > } > - }); > - > - my $result =3D { > - channel =3D> 'updates.spamassassin.org', > + return $result; > }; > =20 > - $result->{version} =3D $version if $version > -1; > - $result->{update_version} =3D $newversion if $newversion > -1; > - $result->{last_updated} =3D $mtime if $mtime > -1; > + my @channels =3D ('updates.spamassassin.org'); > =20 > - if ($newversion > $version) { > - $result->{update_avail} =3D 1; > - } else { > - $result->{update_avail} =3D 0; > - } > + my $localchannels =3D PMG::Utils::local_spamassassin_channels(); > + push(@channels, map { $_->{channelurl} } @$localchannels); > =20 > - return [$result]; > + return [ map { $check_channel->($_) } @channels]; > }}); > =20 > __PACKAGE__->register_method({ > --=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 =