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 36CE8BFDF for ; 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 1E23136B48 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 94A04472A8 for ; Thu, 14 Sep 2023 11:52:50 +0200 (CEST) From: Leo Nunner To: pmg-devel@lists.proxmox.com Date: Thu, 14 Sep 2023 11:52:26 +0200 Message-Id: <20230914095234.115469-6-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.097 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 05/11] match groups: update database schema 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:52:52 -0000 Adds a 'MatchGroup' table which contains all the data relevant for a match group: - ID: numerical ID of the group - Rule ID: of the rule it belongs to - Class: which object type it belongs to The 'RuleGroup' table - which maps objects to a specific rule - now also has a 'MatchGroup' field to store the ID of the corresponding match group, should it be part of one. Signed-off-by: Leo Nunner --- src/PMG/DBTools.pm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/PMG/DBTools.pm b/src/PMG/DBTools.pm index 81d7fb3..1461dae 100644 --- a/src/PMG/DBTools.pm +++ b/src/PMG/DBTools.pm @@ -295,6 +295,15 @@ my $userprefs_ctablecmd = <<__EOD; __EOD +my $matchgroup_ctablecmd = <<__EOD; + CREATE TABLE MatchGroup + (ID SERIAL UNIQUE, + RID INTEGER NOT NULL, + Name VARCHAR(255), + Class VARCHAR(10) NOT NULL, + PRIMARY KEY (ID)); +__EOD + sub cond_create_dbtable { my ($dbh, $name, $ctablecmd) = @_; @@ -418,6 +427,7 @@ sub create_ruledb { Rule_ID INTEGER NOT NULL, Grouptype INTEGER NOT NULL, Negate INTEGER NOT NULL DEFAULT 0, + MatchGroup INTEGER NOT NULL DEFAULT 0, PRIMARY KEY (Objectgroup_ID, Rule_ID, Grouptype) ); @@ -440,6 +450,8 @@ sub create_ruledb { $userprefs_ctablecmd; $virusinfo_stat_ctablecmd; + + $matchgroup_ctablecmd; EOD ); @@ -495,6 +507,7 @@ sub upgradedb { 'CStatistic', $cstatistic_ctablecmd, 'ClusterInfo', $clusterinfo_ctablecmd, 'VirusInfo', $virusinfo_stat_ctablecmd, + 'MatchGroup', $matchgroup_ctablecmd, }; foreach my $table (keys %$tables) { @@ -593,6 +606,19 @@ sub upgradedb { } } + # Allow logical AND for rule objects + if (!database_column_exists($dbh, 'RuleGroup', 'MatchGroup')) { + eval { + $dbh->begin_work; + $dbh->do("ALTER TABLE RuleGroup ADD COLUMN MatchGroup INTEGER NOT NULL DEFAULT 0"); + $dbh->commit; + }; + if (my $err = $@) { + $dbh->rollback; + die $err; + } + } + foreach my $table (keys %$tables) { eval { $dbh->do("ANALYZE $table"); }; warn $@ if $@; -- 2.39.2