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 21C16923EF for ; Thu, 1 Feb 2024 16:37:00 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 09D8012D99 for ; Thu, 1 Feb 2024 16:37:00 +0100 (CET) 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, 1 Feb 2024 16:36:59 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id E53A741F8B for ; Thu, 1 Feb 2024 16:36:58 +0100 (CET) From: Dominik Csapak To: pmg-devel@lists.proxmox.com Date: Thu, 1 Feb 2024 16:36:53 +0100 Message-Id: <20240201153657.1067215-8-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240201153657.1067215-1-d.csapak@proxmox.com> References: <20240201153657.1067215-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.020 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pmg-devel] [RFC PATCH pmg-api 07/11] RuleCache: load rule/objectgroup attributes from database 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, 01 Feb 2024 15:37:00 -0000 so that we can use the 'and' and 'invert' flags set. Signed-off-by: Dominik Csapak --- src/PMG/RuleCache.pm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/PMG/RuleCache.pm b/src/PMG/RuleCache.pm index 4f7ebe7..0b62aeb 100644 --- a/src/PMG/RuleCache.pm +++ b/src/PMG/RuleCache.pm @@ -67,6 +67,23 @@ sub new { $self->{"$ruleid:what"} = { groups => [] }; $self->{"$ruleid:action"} = { groups => [] }; + my $attribute_sth = $dbh->prepare("SELECT * FROM Rule_Attributes WHERE Rule_ID = ?"); + $attribute_sth->execute($ruleid); + + while (my $ref = $attribute_sth->fetchrow_hashref()) { + $self->{"$ruleid:from"}->{and} = $ref->{value} if $ref->{name} eq 'from-and'; + $self->{"$ruleid:from"}->{invert} = $ref->{value} if $ref->{name} eq 'from-invert'; + + $self->{"$ruleid:to"}->{and} = $ref->{value} if $ref->{name} eq 'to-and'; + $self->{"$ruleid:to"}->{invert} = $ref->{value} if $ref->{name} eq 'to-invert'; + + $self->{"$ruleid:when"}->{and} = $ref->{value} if $ref->{name} eq 'when-and'; + $self->{"$ruleid:when"}->{invert} = $ref->{value} if $ref->{name} eq 'when-invert'; + + $self->{"$ruleid:what"}->{and} = $ref->{value} if $ref->{name} eq 'what-and'; + $self->{"$ruleid:what"}->{invert} = $ref->{value} if $ref->{name} eq 'what-invert'; + } + my $sth1 = $dbh->prepare( "SELECT Objectgroup_ID, Grouptype FROM RuleGroup " . "where RuleGroup.Rule_ID = '$ruleid' " . @@ -114,6 +131,14 @@ sub new { objects => $objects, }; + my $objectgroup_sth = $dbh->prepare("SELECT * FROM Objectgroup_Attributes WHERE Objectgroup_ID = ?"); + $objectgroup_sth->execute($groupid); + + while (my $ref = $objectgroup_sth->fetchrow_hashref()) { + $group->{and} = $ref->{value} if $ref->{name} eq 'and'; + $group->{invert} = $ref->{value} if $ref->{name} eq 'invert'; + } + my $type = $type_map->{$gtype}; push $self->{"$ruleid:$type"}->{groups}->@*, $group; } -- 2.30.2