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 11FF193756 for ; Fri, 7 Apr 2023 15:43:37 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id ED4071A6C3 for ; Fri, 7 Apr 2023 15:43:06 +0200 (CEST) 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 ; Fri, 7 Apr 2023 15:43:06 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 06A9946454 for ; Fri, 7 Apr 2023 15:43:06 +0200 (CEST) From: Leo Nunner To: pmg-devel@lists.proxmox.com Date: Fri, 7 Apr 2023 15:42:46 +0200 Message-Id: <20230407134258.199691-1-l.nunner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.134 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 Subject: [pmg-devel] [PATCH pmg-api/gui/docs, proxmox-widget-toolkit] Extend rule system 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: Fri, 07 Apr 2023 13:43:37 -0000 This series introduces two new features for the PMG rule system: object negation, and match groups. Negation allows the user to negate objects inside a rule, meaning that they will evaluate to true if their condition is NOT fulfilled. The second feature, match groups, allows objects to be chained together. A match group functions as a container for multiple other objects; it will only evaluate to true if all its members evaluate to true. Match groups are connected via logical 'or' to all other objects inside the rule; take the following rule system: - Rule - Match Group - Object 1 - Object 2 - Object 3 It will match if either (Object 1 && Object 2), or if Object 3 evaluate to true. To properly achieve match groups inside the GUI, the rule overview was reworked as a tree, instead of a simple list. It can now be collapsed/expanded, and each object type (except actions) has a single subfolder called 'Match Group'. In combination, these features should cover quite a few use cases, and make it possible to model more complex rule systems. pmg-api: Leo Nunner (8): feature: negation: add field to database feature: negation: parse negation value into objects feature: negation: expand/implement API endpoints feature: negation: implement matching logic feature: match groups: add field to database feature: match groups: parse field into objects feature: match groups: update API endpoints feature: match groups: implement matching logic src/PMG/API2/ObjectGroupHelpers.pm | 6 +- src/PMG/API2/Rules.pm | 119 +++++++++++++++++++++++++ src/PMG/DBTools.pm | 28 ++++++ src/PMG/RuleCache.pm | 61 +++++++++++-- src/PMG/RuleDB.pm | 65 +++++++++++++- src/PMG/RuleDB/ArchiveFilter.pm | 6 +- src/PMG/RuleDB/ContentTypeFilter.pm | 6 +- src/PMG/RuleDB/MatchArchiveFilename.pm | 4 +- src/PMG/RuleDB/MatchField.pm | 2 +- src/PMG/RuleDB/MatchFilename.pm | 2 +- 10 files changed, 280 insertions(+), 19 deletions(-) pmg-gui: Leo Nunner (2): feature: negate objects inside rules feature: introduce logical 'and' for rules css/ext6-pmg.css | 10 ++ js/RuleInfo.js | 321 +++++++++++++++++++++++++++++++++++++---------- js/Utils.js | 14 +-- 3 files changed, 271 insertions(+), 74 deletions(-) pmg-docs: Leo Nunner (1): docs: document negation and match groups pmg-mail-filter.adoc | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) proxmox-widget-toolkit: Leo Nunner (1): dark-mode: fix colour of default tree icons src/proxmox-dark/scss/other/_icons.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.30.2