[pmg-devel] [PATCH pmg-api v3 0/6] add support for locally configured SA channels

Stoiko Ivanov s.ivanov at proxmox.com
Tue Jan 19 11:38:09 CET 2021

* incorporated Thomas' feedback (Thanks!)
* added minimal tests for the sa-channel file parser
* fixed two small glitches in the Makefiles (new patches 1 and 2) - noticed
  while adding the tests

original cover-letter for v2:
* addressed Fabian's feedback (where appropriate more details are added to the
individual patches)

original cover-letter:

With the recent announcement by KAM about the availability of a signed
update channel for the KAM.cf (and other) ruleset [0], I thought that this
might be a better suited way to provide regular updates to KAM.cf compared
to the initial patch I sent some time ago [1].

The upside of using sa-update is that it does lint the ruleset before trying
to pull the updates, and afterwards as well. GPG signed updates by KAM can
also be considered production worthy.

I tried to align the implementation to the channel.d mechanism mentioned in
[0] since it seems:
* somewhat sensible (these days my first choice would not be shell-code
* one mechanism of potentially having a distributable way of providing
  the necessary configuration for an external SA ruleset - and the only one
  I'm aware of, which is not a self-tailored script

The patchset was tested with the file provided at [0] on my test

Should this be accepted we could ship
/etc/mail/spamassassin/channel.d/KAM_channel.conf in proxmox-spamassassin

[0] https://mcgrail.com/template/kam.cf_channel
[1] https://lists.proxmox.com/pipermail/pmg-devel/2020-November/001397.html

Stoiko Ivanov (6):
  buildsys: fix check target in main Makefile
  buildsys: fix PERLLIB setting in tests/Makefile
  add helper for parsing SA channel.d files
  api: spamassassin: read local channels
  api: spamassassin: update local channels
  pmg-daily: run sa-update for local channels

 Makefile                               |  2 +-
 src/PMG/API2/SpamAssassin.pm           | 89 +++++++++++++++-----------
 src/PMG/Utils.pm                       | 60 +++++++++++++++++
 src/bin/pmg-daily                      |  9 ++-
 src/tests/KAM_channel.conf             | 34 ++++++++++
 src/tests/Makefile                     |  3 +-
 src/tests/missing_gpg_key_channel.conf |  2 +
 src/tests/missing_keyid.conf           |  7 ++
 src/tests/test_sa_channel_parser.pl    | 75 ++++++++++++++++++++++
 9 files changed, 241 insertions(+), 40 deletions(-)
 create mode 100644 src/tests/KAM_channel.conf
 create mode 100644 src/tests/missing_gpg_key_channel.conf
 create mode 100644 src/tests/missing_keyid.conf
 create mode 100755 src/tests/test_sa_channel_parser.pl


More information about the pmg-devel mailing list