From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <l.nunner@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 ED77BC07E
for <pmg-devel@lists.proxmox.com>; Thu, 14 Sep 2023 11:52:52 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id D1E2C36B83
for <pmg-devel@lists.proxmox.com>; 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 <pmg-devel@lists.proxmox.com>; 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 F305A472BA
for <pmg-devel@lists.proxmox.com>; Thu, 14 Sep 2023 11:52:50 +0200 (CEST)
From: Leo Nunner <l.nunner@proxmox.com>
To: pmg-devel@lists.proxmox.com
Date: Thu, 14 Sep 2023 11:52:27 +0200
Message-Id: <20230914095234.115469-7-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 06/11] match groups: add functions for
database access
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: Thu, 14 Sep 2023 09:52:53 -0000
Introduce functions to manage match groups in the database. This
includes adding and deleting match groups, as well as the ability to
load all match groups that are associated with one specific rule.
Signed-off-by: Leo Nunner <l.nunner@proxmox.com>
---
src/PMG/RuleDB.pm | 82 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 82 insertions(+)
diff --git a/src/PMG/RuleDB.pm b/src/PMG/RuleDB.pm
index 98beda3..b126d0d 100644
--- a/src/PMG/RuleDB.pm
+++ b/src/PMG/RuleDB.pm
@@ -757,6 +757,70 @@ sub rule_remove_group {
return 1;
}
+sub rule_add_match_group {
+ my ($self, $ruleid, $gtype_str, $name) = @_;
+
+ defined($ruleid) || die "undefined rule id: ERROR";
+
+ $self->{dbh}->do("INSERT INTO MatchGroup " .
+ "(RID, Class, Name) " .
+ "VALUES (?, ?, ?)", undef,
+ $ruleid, $gtype_str, $name);
+
+ return PMG::Utils::lastid($self->{dbh}, 'matchgroup_id_seq');
+}
+
+sub rule_remove_match_group {
+ my ($self, $ruleid, $groupid) = @_;
+
+ defined($ruleid) || die "undefined rule id: ERROR";
+ defined($groupid) || die "undefined group id: ERROR";
+
+ # first, we check whether there are any objects in this group
+ my $sth = $self->{dbh}->prepare("SELECT COUNT (*) FROM RuleGroup ".
+ "WHERE Rule_ID = ? and MatchGroup = ?");
+
+ $sth->execute($ruleid, $groupid);
+ my ($count) = $sth->fetchrow_array;
+
+ die "Cannot delete non-empty match group" if $count;
+
+ $self->{dbh}->do("DELETE FROM MatchGroup WHERE " .
+ "ID = ? and RID = ?", undef,
+ $groupid, $ruleid);
+}
+
+sub load_match_groups {
+ my ($self, $rule) = @_;
+
+ defined($rule->{id}) || die "undefined rule id: ERROR";
+
+ my $sth = $self->{dbh}->prepare(
+ "SELECT ID, Name, Class " .
+ "FROM MatchGroup " .
+ "WHERE RID = ? " .
+ "ORDER BY Class");
+
+ $sth->execute($rule->{id});
+
+ my $matchgroups = [];
+
+ while (my $ref = $sth->fetchrow_hashref()) {
+ my $mg = {
+ id => $ref->{id},
+ class => $ref->{class},
+ name => $ref->{name},
+ };
+
+ push @$matchgroups, $mg;
+ }
+
+ $sth->finish();
+
+ return $matchgroups;
+}
+
+
sub rule_get_group_settings {
my ($self, $ruleid, $groupid, $gtype_str) = @_;
@@ -797,6 +861,24 @@ sub rule_set_group_setting_negate {
return 1;
}
+sub rule_set_group_setting_matchgroup {
+ 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 MatchGroup = ? " .
+ "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