From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <s.ivanov@proxmox.com> 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 85D5F945C8 for <pmg-devel@lists.proxmox.com>; Wed, 21 Feb 2024 19:37:08 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6076F1D1C1 for <pmg-devel@lists.proxmox.com>; Wed, 21 Feb 2024 19:36:38 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 for <pmg-devel@lists.proxmox.com>; Wed, 21 Feb 2024 19:36:37 +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 657E5428EE for <pmg-devel@lists.proxmox.com>; Wed, 21 Feb 2024 19:36:37 +0100 (CET) Date: Wed, 21 Feb 2024 19:36:35 +0100 From: Stoiko Ivanov <s.ivanov@proxmox.com> To: Dominik Csapak <d.csapak@proxmox.com> Cc: pmg-devel@lists.proxmox.com Message-ID: <20240221193635.35430834@rosa.proxmox.com> In-Reply-To: <20240221122439.1281024-1-d.csapak@proxmox.com> References: <20240221122439.1281024-1-d.csapak@proxmox.com> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.084 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [rules.pm, ruledb.pm, mailqueue.pm, remove.pm, dbtools.pm, objectgrouphelpers.pm, modgroup.pm, cluster.pm, backup.pm, pmgdb.pm, rulecache.pm, utils.pm] Subject: [pmg-devel] applied-partially: [PATCH pmg-api/docs/gui v2] implement and combination and inversion of groups and objects X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion <pmg-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pmg-devel>, <mailto:pmg-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pmg-devel/> List-Post: <mailto:pmg-devel@lists.proxmox.com> List-Help: <mailto:pmg-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel>, <mailto:pmg-devel-request@lists.proxmox.com?subject=subscribe> X-List-Received-Date: Wed, 21 Feb 2024 18:37:08 -0000 huge thanks for the series and the quick iteration on my nits! applied the api and docs patches, left the gui patches for now after a talk with Thomas off-list. On Wed, 21 Feb 2024 13:24:26 +0100 Dominik Csapak <d.csapak@proxmox.com> wrote: > This series is the backend part of the and/inversion addition to the > rule system. > > The gui change is rather simple, just one additional drop down for > groups + one for each type in each rule. > > changes from v1: > * rebase on master > * include new tables in cluster sync + backup > * incorporate stoikos feedback > * improved commit messages > more details in the relevant patches > > changes from rfc: > * added docs + gui > * some minor bugfixes > * fixed the api (forgot to add the info to the GET calls in rfc) > * changed output for `pmgdb dump` so we get that info in the pmgreport too > > pmg-api: > > Dominik Csapak (10): > RuleCache: reorganize how we gather marks and spaminfo > api: refactor rule parameters > add objectgroup attributes and/invert > add rule attributes and/invert (for each relevant type) > RuleCache: load rule/objectgroup attributes from database > RuleCache: implement and/invert for when/from/to > MailQueue: return maximum AID > ModGroup: add possibility to explode to all targets > RuleCache: implement and/invert for what matches > pmgdb: extend dump output to include add/invert > > src/PMG/API2/ObjectGroupHelpers.pm | 51 +++++- > src/PMG/API2/RuleDB.pm | 23 +-- > src/PMG/API2/Rules.pm | 94 ++++++++-- > src/PMG/Backup.pm | 2 + > src/PMG/CLI/pmgdb.pm | 38 +++- > src/PMG/Cluster.pm | 4 + > src/PMG/DBTools.pm | 32 ++++ > src/PMG/MailQueue.pm | 4 +- > src/PMG/ModGroup.pm | 17 ++ > src/PMG/RuleCache.pm | 274 +++++++++++++++++++++++----- > src/PMG/RuleDB.pm | 278 +++++++++++++++++++++++------ > src/PMG/RuleDB/Remove.pm | 28 ++- > src/PMG/Utils.pm | 2 + > src/bin/pmg-smtp-filter | 23 +-- > 14 files changed, 701 insertions(+), 169 deletions(-) > > pmg-docs: > > Dominik Csapak (1): > rule system: explain new and mode and invert flag > > pmg-mail-filter.adoc | 40 +++++++++++++++++++++++++++++++++++++++- > 1 file changed, 39 insertions(+), 1 deletion(-) > > pmg-gui: > > Dominik Csapak (2): > rules: use tree panel instead of grouping feature of the grid > rules/objects: add mode selector dropdown > > css/ext6-pmg.css | 7 +++ > js/Makefile | 1 + > js/ObjectGroup.js | 64 +++++++++++++++++++- > js/ObjectGroupConfiguration.js | 4 ++ > js/RuleInfo.js | 103 ++++++++++++++++++++++++++------- > js/form/ModeSelector.js | 11 ++++ > 6 files changed, 167 insertions(+), 23 deletions(-) > create mode 100644 js/form/ModeSelector.js >