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 05442936ED for ; Fri, 7 Apr 2023 15:43:08 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D4DE91A720 for ; Fri, 7 Apr 2023 15:43:07 +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 3BA0246459 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:49 +0200 Message-Id: <20230407134258.199691-4-l.nunner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230407134258.199691-1-l.nunner@proxmox.com> References: <20230407134258.199691-1-l.nunner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.133 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 3/8] feature: negation: expand/implement 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: Fri, 07 Apr 2023 13:43:08 -0000 The existing 'add' enpoint was expanded with a 'negate' parameter, so that new objects can be added in an already negated state. New API endpoints were added to get and update the specific group-rule relation settings (which is only 'negate' for now). These endpoints get added to all ogroups except 'actions', since negating actions doesn't make much sense. Signed-off-by: Leo Nunner --- src/PMG/API2/Rules.pm | 96 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/src/PMG/API2/Rules.pm b/src/PMG/API2/Rules.pm index 4f8c10b..ad3f6c7 100644 --- a/src/PMG/API2/Rules.pm +++ b/src/PMG/API2/Rules.pm @@ -261,6 +261,11 @@ my $register_rule_group_api = sub { description => "Groups ID.", type => 'integer', }, + negate => { + description => "Negate group.", + type => 'boolean', + optional => 1, + }, }, }, returns => { type => 'null' }, @@ -273,6 +278,10 @@ my $register_rule_group_api = sub { $rdb->rule_add_group($param->{id}, $param->{ogroup}, $name); + if (defined($param->{negate})) { + $rdb->rule_set_group_setting_negate($param->{negate}, $param->{id}, $param->{ogroup}, $name); + } + PMG::DBTools::reload_ruledb(); return undef; @@ -314,6 +323,93 @@ my $register_rule_group_api = sub { return undef; }}); + if($name ne 'action') { + __PACKAGE__->register_method ({ + name => "get_${name}_group_settings", + path => "$name/{ogroup}", + method => 'GET', + description => "Get '$name' group settings for rule.", + proxyto => 'master', + protected => 1, + permissions => { check => [ 'admin' ] }, + parameters => { + additionalProperties => 0, + properties => { + id => { + description => "Rule ID.", + type => 'integer', + }, + ogroup => { + description => "Groups ID.", + type => 'integer', + }, + }, + }, + returns => { + type => 'array', + items => { + type => "object", + properties => { + negate => { + description=> "Negate group.", + type => 'boolean', + }, + } + } + }, + code => sub { + my ($param) = @_; + + my $rdb = PMG::RuleDB->new(); + + my $settings = $rdb->rule_get_group_settings($param->{id}, $param->{ogroup}, $name); + + my $ret = { + negate => $settings->{negate}, + }; + + return $ret; + }}); + + __PACKAGE__->register_method ({ + name => "set_${name}_group_settings", + path => "$name/{ogroup}", + method => 'PUT', + description => "Update '$name' group settings for rule.", + proxyto => 'master', + protected => 1, + permissions => { check => [ 'admin' ] }, + parameters => { + additionalProperties => 0, + properties => { + id => { + description => "Rule ID.", + type => 'integer', + }, + ogroup => { + description => "Groups ID.", + type => 'integer', + }, + negate => { + description => "Negate group.", + type => 'boolean', + optional => 1, + }, + }, + }, + returns => { type => 'null' }, + code => sub { + my ($param) = @_; + + my $rdb = PMG::RuleDB->new(); + + if(defined($param->{negate})) { + $rdb->rule_set_group_setting_negate($param->{negate}, $param->{id}, $param->{ogroup}, $name); + } + + return; + }}); + } }; $register_rule_group_api->('from'); -- 2.30.2