From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <s.ivanov@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 57F75938DD
for <pmg-devel@lists.proxmox.com>; Tue, 20 Feb 2024 14:18:52 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 3656A7A1B
for <pmg-devel@lists.proxmox.com>; Tue, 20 Feb 2024 14:18:22 +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 <pmg-devel@lists.proxmox.com>; Tue, 20 Feb 2024 14:18:21 +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 7E2F743F9D
for <pmg-devel@lists.proxmox.com>; Tue, 20 Feb 2024 14:18:21 +0100 (CET)
Date: Tue, 20 Feb 2024 14:18:20 +0100
From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: Dominik Csapak <d.csapak@proxmox.com>
Cc: pmg-devel@lists.proxmox.com
Message-ID: <20240220141820.63307049@rosa.proxmox.com>
In-Reply-To: <20240209125440.2572239-8-d.csapak@proxmox.com>
References: <20240209125440.2572239-1-d.csapak@proxmox.com>
<20240209125440.2572239-8-d.csapak@proxmox.com>
X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.085 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 -
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [rulecache.pm]
Subject: Re: [pmg-devel] [PATCH pmg-api 07/12] 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
<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: Tue, 20 Feb 2024 13:18:52 -0000
On Fri, 9 Feb 2024 13:54:31 +0100
Dominik Csapak <d.csapak@proxmox.com> wrote:
> so that we can use the 'and' and 'invert' flags set.
>
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> 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';
not sure if it's worth it, or makes this less readable ..., but
if ($ref-name =~ /(from|to|when|what)-(and|invert)/) {
$self->{"$ruleid:$1"}->{$2} = $ref->{value)
}
might work here as well
> + $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;
> }