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 EA2F1697A2 for ; Tue, 19 Jan 2021 11:38:30 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9EBE31CE3E for ; Tue, 19 Jan 2021 11:38:30 +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 DA04C1CE05 for ; Tue, 19 Jan 2021 11:38:28 +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 9AF8846088 for ; Tue, 19 Jan 2021 11:38:28 +0100 (CET) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Tue, 19 Jan 2021 11:38:09 +0100 Message-Id: <20210119103815.15934-1-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.068 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 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, kam.cf, mcgrail.com, utils.pm, proxmox.com] Subject: [pmg-devel] [PATCH pmg-api v3 0/6] add support for locally configured SA 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: Tue, 19 Jan 2021 10:38:31 -0000 v2->v3: * 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: v1->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 snippets) * 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 installation 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 -- 2.20.1