From: Thomas Lamprecht <t.lamprecht@proxmox.com>
To: Stoiko Ivanov <s.ivanov@proxmox.com>, pmg-devel@lists.proxmox.com
Subject: Re: [pmg-devel] [PATCH pmg-api v2 3/4] api: spamassassin: update local channels
Date: Fri, 15 Jan 2021 10:58:59 +0100 [thread overview]
Message-ID: <98aeece2-adbc-287c-8e1b-f38aa85e0c2b@proxmox.com> (raw)
In-Reply-To: <20201230171539.7644-4-s.ivanov@proxmox.com>
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
>
> 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)
>
> In order to only hardcode the path of sa-update once the definition
> was moved to PMG::Utils.
>
> 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.
>
> 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)
>
> Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
> ---
> src/PMG/API2/SpamAssassin.pm | 6 +++---
> src/PMG/Utils.pm | 31 +++++++++++++++++++++++++++++++
> 2 files changed, 34 insertions(+), 3 deletions(-)
>
> diff --git a/src/PMG/API2/SpamAssassin.pm b/src/PMG/API2/SpamAssassin.pm
> 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);
>
> -use PMG::Utils;
> +use PMG::Utils qw($SAUPDATE);
can we please avoid the $SAUPDATE variable completely, either just directly use
"sa-updates" with no path prefixed as this is much cleaner and safer to do, we
have a sensible PATH env after all and having fixed paths made problems in the
past (especially with usr-merge in built systems).
If you must, add a sa_update helper method doing the actual run_command and some
possible other common things, maybe even having a clean, not overly general,
parameter signature.
> use PMG::Config;
>
> use Mail::SpamAssassin;
>
> use base qw(PVE::RESTHandler);
>
> -my $SAUPDATE = '/usr/bin/sa-update';
> -
> __PACKAGE__->register_method ({
> name => 'index',
> path => '',
> @@ -174,6 +172,8 @@ __PACKAGE__->register_method({
> my $cmd = "$SAUPDATE -v";
>
> PVE::Tools::run_command($cmd, noerr => 1);
> +
> + PMG::Utils::update_local_spamassassin_channels(1);
> };
>
> 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';
>
> our @EXPORT_OK = qw(
> postgres_admin_cmd
> +$SAUPDATE
> );
>
> my $valid_pmg_realms = ['pam', 'pmg', 'quarantine'];
> @@ -1442,6 +1443,8 @@ sub domain_regex {
> return $regex;
> }
>
> +our $SAUPDATE = '/usr/bin/sa-update';
> +
> sub local_spamassassin_channels {
>
> my $res = [];
> @@ -1470,4 +1473,32 @@ sub local_spamassassin_channels {
> return $res;
> }
>
> +sub update_local_spamassassin_channels {
> + my ($verbose) = @_;
> + # import all configured channel's gpg-keys to sa-update's keyring
> + my $localchannels = PMG::Utils::local_spamassassin_channels();
> + for my $channel (@$localchannels) {
> + my $importcmd = [$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 = 0;
> +
> + for my $channel (@$localchannels) {
> + my $cmd = [$SAUPDATE, '--channel', $channel->{channelurl}, '--gpgkey', $channel->{keyid}];
> + push @$cmd, '-v' if $verbose;
> +
> + print "Updating $channel->{channelurl}\n" if $verbose;
> + my $ret = PVE::Tools::run_command($cmd, noerr => 1);
> + die "updating $channel->{channelurl} failed - sa-update exited with $ret\n" if $ret >= 2;
> +
> + $fresh_updates = 1 if $ret == 0;
> + }
> +
> + return $fresh_updates
> +}
> +
> 1;
>
next prev parent reply other threads:[~2021-01-15 9:59 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-30 17:15 [pmg-devel] [PATCH pmg-api v2 0/4] add support for locally configured SA channels Stoiko Ivanov
2020-12-30 17:15 ` [pmg-devel] [PATCH pmg-api v2 1/4] add helper for parsing SA channel.d files Stoiko Ivanov
2021-01-15 8:21 ` Thomas Lamprecht
2020-12-30 17:15 ` [pmg-devel] [PATCH pmg-api v2 2/4] api: spamassassin: read local channels Stoiko Ivanov
2021-01-15 10:02 ` Thomas Lamprecht
2021-01-18 19:47 ` Stoiko Ivanov
2021-01-19 9:10 ` Thomas Lamprecht
2020-12-30 17:15 ` [pmg-devel] [PATCH pmg-api v2 3/4] api: spamassassin: update " Stoiko Ivanov
2021-01-15 9:58 ` Thomas Lamprecht [this message]
2020-12-30 17:15 ` [pmg-devel] [PATCH pmg-api v2 4/4] pmg-daily: run sa-update for " Stoiko Ivanov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=98aeece2-adbc-287c-8e1b-f38aa85e0c2b@proxmox.com \
--to=t.lamprecht@proxmox.com \
--cc=pmg-devel@lists.proxmox.com \
--cc=s.ivanov@proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox