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 17969C0B5 for ; Thu, 14 Sep 2023 11:53:23 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EE6D936B84 for ; Thu, 14 Sep 2023 11:52:52 +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 ; Thu, 14 Sep 2023 11:52:51 +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 53BE1472A3 for ; Thu, 14 Sep 2023 11:52:51 +0200 (CEST) From: Leo Nunner To: pmg-devel@lists.proxmox.com Date: Thu, 14 Sep 2023 11:52:31 +0200 Message-Id: <20230914095234.115469-11-l.nunner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230914095234.115469-1-l.nunner@proxmox.com> References: <20230914095234.115469-1-l.nunner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.096 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 WIP api 10/11] match groups: update existing object API endpoints 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: Thu, 14 Sep 2023 09:53:23 -0000 Adds a 'group' parameter to all relevant endpoints, which enables associating objects inside rules with given match groups. --- src/PMG/API2/Rules.pm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/PMG/API2/Rules.pm b/src/PMG/API2/Rules.pm index 91e91ed..ba86ede 100644 --- a/src/PMG/API2/Rules.pm +++ b/src/PMG/API2/Rules.pm @@ -347,6 +347,11 @@ my $register_rule_group_api = sub { type => 'boolean', optional => 1, }, + 'group' => { + description => "Add to match group.", + type => 'integer', + optional => 1, + }, }, }, returns => { type => 'null' }, @@ -363,6 +368,10 @@ my $register_rule_group_api = sub { $rdb->rule_set_group_setting_negate($param->{negate}, $param->{id}, $param->{ogroup}, $name); } + if (defined($param->{group})) { + $rdb->rule_set_group_setting_matchgroup($param->{group}, $param->{id}, $param->{ogroup}, $name); + } + PMG::DBTools::reload_ruledb(); return undef; @@ -435,6 +444,10 @@ my $register_rule_group_api = sub { description=> "Negate group.", type => 'boolean', }, + 'group' => { + description=> "Match group ID.", + type => 'integer', + } } } }, @@ -447,6 +460,7 @@ my $register_rule_group_api = sub { my $ret = { negate => $settings->{negate}, + 'group' => $settings->{matchgroup}, }; return $ret; @@ -476,6 +490,11 @@ my $register_rule_group_api = sub { type => 'boolean', optional => 1, }, + 'group' => { + description => "Add to match group.", + type => 'integer', + optional => 1, + }, }, }, returns => { type => 'null' }, @@ -488,6 +507,10 @@ my $register_rule_group_api = sub { $rdb->rule_set_group_setting_negate($param->{negate}, $param->{id}, $param->{ogroup}, $name); } + if(defined($param->{group})) { + $rdb->rule_set_group_setting_matchgroup($param->{group}, $param->{id}, $param->{ogroup}, $name); + } + return; }}); } -- 2.39.2