all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Leo Nunner <l.nunner@proxmox.com>
To: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] [PATCH pmg-api 3/8] feature: negation: expand/implement API endpoints
Date: Fri,  7 Apr 2023 15:42:49 +0200	[thread overview]
Message-ID: <20230407134258.199691-4-l.nunner@proxmox.com> (raw)
In-Reply-To: <20230407134258.199691-1-l.nunner@proxmox.com>

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 <l.nunner@proxmox.com>
---
 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





  parent reply	other threads:[~2023-04-07 13:43 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-07 13:42 [pmg-devel] [PATCH pmg-api/gui/docs, proxmox-widget-toolkit] Extend rule system Leo Nunner
2023-04-07 13:42 ` [pmg-devel] [PATCH pmg-api 1/8] feature: negation: add field to database Leo Nunner
2023-04-07 13:42 ` [pmg-devel] [PATCH pmg-api 2/8] feature: negation: parse negation value into objects Leo Nunner
2023-04-07 13:42 ` Leo Nunner [this message]
2023-04-07 13:42 ` [pmg-devel] [PATCH pmg-api 4/8] feature: negation: implement matching logic Leo Nunner
2023-04-11  7:35   ` Leo Nunner
2023-04-07 13:42 ` [pmg-devel] [PATCH pmg-api 5/8] feature: match groups: add field to database Leo Nunner
2023-04-07 13:42 ` [pmg-devel] [PATCH pmg-api 6/8] feature: match groups: parse field into objects Leo Nunner
2023-04-07 13:42 ` [pmg-devel] [PATCH pmg-api 7/8] feature: match groups: update API endpoints Leo Nunner
2023-04-07 13:42 ` [pmg-devel] [PATCH pmg-api 8/8] feature: match groups: implement matching logic Leo Nunner
2023-04-07 13:42 ` [pmg-devel] [PATCH pmg-gui 1/2] feature: negate objects inside rules Leo Nunner
2023-04-07 13:42 ` [pmg-devel] [PATCH pmg-gui 2/2] feature: introduce logical 'and' for rules Leo Nunner
2023-04-07 13:42 ` [pmg-devel] [PATCH pmg-docs] docs: document negation and match groups Leo Nunner
2023-04-07 13:42 ` [pmg-devel] [PATCH widget-toolkit] dark-mode: fix colour of default tree icons Leo Nunner
2023-04-11  9:52 ` [pmg-devel] [PATCH pmg-api/gui/docs, proxmox-widget-toolkit] Extend rule system Thomas Lamprecht
2023-04-11 11:04   ` Leo Nunner
2023-04-11 11:19     ` Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230407134258.199691-4-l.nunner@proxmox.com \
    --to=l.nunner@proxmox.com \
    --cc=pmg-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal