From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <d.csapak@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 3921A9427B for <pmg-devel@lists.proxmox.com>; Fri, 9 Feb 2024 13:55:13 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1044639657 for <pmg-devel@lists.proxmox.com>; Fri, 9 Feb 2024 13:54:43 +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>; Fri, 9 Feb 2024 13:54:42 +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 C8D5A46803 for <pmg-devel@lists.proxmox.com>; Fri, 9 Feb 2024 13:54:41 +0100 (CET) From: Dominik Csapak <d.csapak@proxmox.com> To: pmg-devel@lists.proxmox.com Date: Fri, 9 Feb 2024 13:54:24 +0100 Message-Id: <20240209125440.2572239-1-d.csapak@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.020 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 - Subject: [pmg-devel] [PATCH pmg-api/docs/gui] 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: Fri, 09 Feb 2024 12:55:13 -0000 This series is the backend part of the and/inversion addition to the rule system. The first 4 patches of pmg-api and the first one of pmg-docs are only preparations and should not change the behaviour. There is still one WIP patch for the ModGroup explosion, i did not find a better way to do this for now. The gui change is rather simple, just one additional drop down for groups + one for each type in each rule. 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 (12): RuleCache: remove unnecessary copying of marks RuleCache: reorganize to keep group structure 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 WIP: 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 | 20 +- src/PMG/API2/Rules.pm | 94 ++++++-- src/PMG/CLI/pmgdb.pm | 38 +++- src/PMG/DBTools.pm | 30 +++ src/PMG/MailQueue.pm | 4 +- src/PMG/ModGroup.pm | 17 ++ src/PMG/RuleCache.pm | 338 +++++++++++++++++++++++------ src/PMG/RuleDB.pm | 314 +++++++++++++++++++++------ src/PMG/RuleDB/Remove.pm | 28 ++- src/PMG/Utils.pm | 2 + src/bin/pmg-smtp-filter | 21 +- 12 files changed, 754 insertions(+), 203 deletions(-) pmg-docs: Dominik Csapak (2): rule system: add a small section about matching rules rule system: explain new and mode and invert flag pmg-mail-filter.adoc | 54 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) 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 -- 2.30.2