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 EA0DA93EEE for ; Wed, 21 Feb 2024 13:24:42 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D380516BC0 for ; Wed, 21 Feb 2024 13:24:42 +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 ; Wed, 21 Feb 2024 13:24:41 +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 034D444475 for ; Wed, 21 Feb 2024 13:24:41 +0100 (CET) From: Dominik Csapak To: pmg-devel@lists.proxmox.com Date: Wed, 21 Feb 2024 13:24:32 +0100 Message-Id: <20240221122439.1281024-7-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240221122439.1281024-1-d.csapak@proxmox.com> References: <20240221122439.1281024-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] [PATCH pmg-api v2 06/10] RuleCache: implement and/invert for when/from/to 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: Wed, 21 Feb 2024 12:24:43 -0000 by introducing 'match_list_with_mode' that gets called for each group and then on the result of each group match result. This does not work for 'what' matches since they are not a simple yes/no match (they include the parts) so this will be done seperately. Signed-off-by: Dominik Csapak --- no changes src/PMG/RuleCache.pm | 65 +++++++++++++++++++++++++++++--------------- 1 file changed, 43 insertions(+), 22 deletions(-) diff --git a/src/PMG/RuleCache.pm b/src/PMG/RuleCache.pm index 4bde2e7..d0fa1f8 100644 --- a/src/PMG/RuleCache.pm +++ b/src/PMG/RuleCache.pm @@ -272,13 +272,14 @@ sub from_match { $ip = $1; } - for my $group ($from->{groups}->@*) { - for my $obj ($group->{objects}->@*) { - return 1 if $obj->who_match($addr, $ip, $ldap); - } - } - - return 0; + return match_list_with_mode($from->{groups}, $from->{and}, $from->{invert}, sub { + my ($group) = @_; + my $list = $group->{objects}; + return match_list_with_mode($list, $group->{and}, $group->{invert}, sub { + my ($obj) = @_; + return $obj->who_match($addr, $ip, $ldap); + }); + }); } sub to_match { @@ -288,14 +289,14 @@ sub to_match { return 1 if scalar($to->{groups}->@*) == 0; - for my $group ($to->{groups}->@*) { - for my $obj ($group->{objects}->@*) { - return 1 if $obj->who_match($addr, undef, $ldap); - } - } - - - return 0; + return match_list_with_mode($to->{groups}, $to->{and}, $to->{invert}, sub { + my ($group) = @_; + my $list = $group->{objects}; + return match_list_with_mode($list, $group->{and}, $group->{invert}, sub { + my ($obj) = @_; + return $obj->who_match($addr, undef, $ldap); + }); + }); } sub when_match { @@ -305,13 +306,14 @@ sub when_match { return 1 if scalar($when->{groups}->@*) == 0; - for my $group ($when->{groups}->@*) { - for my $obj ($group->{objects}->@*) { - return 1 if $obj->when_match($time); - } - } - - return 0; + return match_list_with_mode($when->{groups}, $when->{and}, $when->{invert}, sub { + my ($group) = @_; + my $list = $group->{objects}; + return match_list_with_mode($list, $group->{and}, $group->{invert}, sub { + my ($obj) = @_; + return $obj->when_match($time); + }); + }); } sub what_match { @@ -353,4 +355,23 @@ sub what_match { return ($marks, $spaminfo); } +# calls sub with each element of $list, and and/ors/inverts the result +sub match_list_with_mode($$$$) { + my ($list, $and, $invert, $sub) = @_; + + $and //= 0; + $invert //= 0; + + for my $el ($list->@*) { + my $res = $sub->($el); + if (!$and) { + return !$invert if $res; + } else { + return $invert if !$res; + } + } + + return $and != $invert; +} + 1; -- 2.30.2