From: Leo Nunner <l.nunner@proxmox.com>
To: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] [PATCH WIP api 02/11] negation: parse negation value into objects
Date: Thu, 14 Sep 2023 11:52:23 +0200 [thread overview]
Message-ID: <20230914095234.115469-3-l.nunner@proxmox.com> (raw)
In-Reply-To: <20230914095234.115469-1-l.nunner@proxmox.com>
Expand the parsing code so that the 'negate' field is written into
objects for further handling. Two new functions are introduced: one for
reading a specific object-rule mapping (and its values), the other to
set the 'negate' value for such an object.
Signed-off-by: Leo Nunner <l.nunner@proxmox.com>
---
src/PMG/API2/ObjectGroupHelpers.pm | 5 +++-
src/PMG/RuleCache.pm | 7 ++++-
src/PMG/RuleDB.pm | 46 +++++++++++++++++++++++++++++-
3 files changed, 55 insertions(+), 3 deletions(-)
diff --git a/src/PMG/API2/ObjectGroupHelpers.pm b/src/PMG/API2/ObjectGroupHelpers.pm
index 48078fb..c3e6448 100644
--- a/src/PMG/API2/ObjectGroupHelpers.pm
+++ b/src/PMG/API2/ObjectGroupHelpers.pm
@@ -47,7 +47,10 @@ sub format_object_group {
my $res = [];
foreach my $og (@$ogroups) {
push @$res, {
- id => $og->{id}, name => $og->{name}, info => $og->{info}
+ id => $og->{id},
+ name => $og->{name},
+ info => $og->{info},
+ negate => $og->{negate},
};
}
return $res;
diff --git a/src/PMG/RuleCache.pm b/src/PMG/RuleCache.pm
index b8690ea..c5a57f6 100644
--- a/src/PMG/RuleCache.pm
+++ b/src/PMG/RuleCache.pm
@@ -56,7 +56,7 @@ sub new {
my ($from, $to, $when, $what, $action);
my $sth1 = $dbh->prepare(
- "SELECT Objectgroup_ID, Grouptype FROM RuleGroup " .
+ "SELECT Objectgroup_ID, Grouptype, Negate FROM RuleGroup " .
"where RuleGroup.Rule_ID = '$ruleid' " .
"ORDER BY Grouptype, Objectgroup_ID");
@@ -64,6 +64,7 @@ sub new {
while (my $ref1 = $sth1->fetchrow_hashref()) {
my $gtype = $ref1->{grouptype};
my $groupid = $ref1->{objectgroup_id};
+ my $negate = $ref1->{negate};
# emtyp groups differ from non-existent groups!
@@ -90,6 +91,10 @@ sub new {
$sha1->add (join (',', $objid, $gtype, $groupid) . "|");
$sha1->add ($obj->{digest}, "|");
+ if ($gtype != 4) { # it doesn't make any sense to negate actions
+ $obj->{negate} = $negate;
+ }
+
if ($gtype == 0) { #from
push @$from, $obj;
} elsif ($gtype == 1) { # to
diff --git a/src/PMG/RuleDB.pm b/src/PMG/RuleDB.pm
index a6b0b79..98beda3 100644
--- a/src/PMG/RuleDB.pm
+++ b/src/PMG/RuleDB.pm
@@ -107,7 +107,7 @@ sub load_groups {
my $sth = $self->{dbh}->prepare(
"SELECT RuleGroup.Grouptype, Objectgroup.ID, " .
- "Objectgroup.Name, Objectgroup.Info " .
+ "Objectgroup.Name, Objectgroup.Info, Negate " .
"FROM Rulegroup, Objectgroup " .
"WHERE Rulegroup.Rule_ID = ? and " .
"Rulegroup.Objectgroup_ID = Objectgroup.ID " .
@@ -123,6 +123,10 @@ sub load_groups {
my $og = PMG::RuleDB::Group->new($ref->{name}, $ref->{info});
$og->{id} = $ref->{id};
+ if ($ref->{'grouptype'} != 4) { # this doesn't make any sense for actions
+ $og->{negate} = $ref->{negate};
+ }
+
if ($ref->{'grouptype'} == 0) { #from
push @$from, $og;
} elsif ($ref->{'grouptype'} == 1) { # to
@@ -753,6 +757,46 @@ sub rule_remove_group {
return 1;
}
+
+sub rule_get_group_settings {
+ my ($self, $ruleid, $groupid, $gtype_str) = @_;
+
+ my $gtype = $grouptype_hash->{$gtype_str} //
+ die "unknown group type '$gtype_str'\n";
+
+ defined($ruleid) || die "undefined rule id: ERROR";
+ defined($groupid) || die "undefined group id: ERROR";
+ defined($gtype) || die "undefined group type: ERROR";
+
+ my $sth = $self->{dbh}->prepare("SELECT * FROM RuleGroup WHERE " .
+ "Objectgroup_ID = ? and Rule_ID = ? and Grouptype = ?");
+
+ $sth->execute($groupid, $ruleid, $gtype);
+
+ my $ref = $sth->fetchrow_hashref();
+ die "rule does not exist\n" if !defined($ref);
+
+ return $ref;
+}
+
+sub rule_set_group_setting_negate {
+ my ($self, $value, $ruleid, $groupid, $gtype_str) = @_;
+
+ my $gtype = $grouptype_hash->{$gtype_str} //
+ die "unknown group type '$gtype_str'\n";
+
+ defined($ruleid) || die "undefined rule id: ERROR";
+ defined($groupid) || die "undefined group id: ERROR";
+ defined($gtype) || die "undefined group type: ERROR";
+
+ my $sth = $self->{dbh}->prepare("UPDATE RuleGroup SET Negate = ? " .
+ "WHERE Objectgroup_ID = ? and Rule_ID = ? and Grouptype = ?");
+
+ $sth->execute($value, $groupid, $ruleid, $gtype);
+
+ return 1;
+}
+
sub load_rule {
my ($self, $id) = @_;
--
2.39.2
next prev parent reply other threads:[~2023-09-14 9:52 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-14 9:52 [pmg-devel] [PATCH WIP api/gui] Extend rule system Leo Nunner
2023-09-14 9:52 ` [pmg-devel] [PATCH WIP api 01/11] negation: add field to database Leo Nunner
2023-09-14 9:52 ` Leo Nunner [this message]
2023-09-14 9:52 ` [pmg-devel] [PATCH WIP api 03/11] negation: expand/implement API endpoints Leo Nunner
2023-09-14 9:52 ` [pmg-devel] [PATCH WIP api 04/11] negation: implement matching logic Leo Nunner
2023-09-14 9:52 ` [pmg-devel] [PATCH WIP api 05/11] match groups: update database schema Leo Nunner
2023-09-14 9:52 ` [pmg-devel] [PATCH WIP api 06/11] match groups: add functions for database access Leo Nunner
2023-09-14 9:52 ` [pmg-devel] [PATCH WIP api 07/11] match groups: parse field into objects Leo Nunner
2023-09-14 9:52 ` [pmg-devel] [PATCH WIP api 08/11] match groups: add API endpoints for create/delete Leo Nunner
2023-09-14 9:52 ` [pmg-devel] [PATCH WIP api 09/11] match groups: list match groups in rule API Leo Nunner
2023-09-14 9:52 ` [pmg-devel] [PATCH WIP api 10/11] match groups: update existing object API endpoints Leo Nunner
2023-09-14 9:52 ` [pmg-devel] [PATCH WIP api 11/11] match groups: implement matching logic Leo Nunner
2023-09-14 9:52 ` [pmg-devel] [PATCH WIP gui 1/2] negate objects inside rules Leo Nunner
2023-09-14 9:52 ` [pmg-devel] [PATCH WIP gui 2/2] introduce logical 'and' for rules Leo Nunner
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=20230914095234.115469-3-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox