Re: [pmg-devel] [PATCH pmg-api 08/12] RuleCache: implement and/invert for when/from/to

[Stoiko Ivanov <s.ivanov@proxmox.com>]

LGTM (from a quick glance, and after thinking a bit too long why
match_list_with_mode needs to get called recursively)

Reviewed-by: Stoiko Ivanov <s.ivanov@proxmox.com>

On Fri,  9 Feb 2024 13:54:32 +0100
Dominik Csapak <d.csapak@proxmox.com> wrote:

> 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 <d.csapak@proxmox.com>
> ---
>  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 0b62aeb..7d08107 100644
> --- a/src/PMG/RuleCache.pm
> +++ b/src/PMG/RuleCache.pm
> @@ -273,13 +273,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 {
> @@ -289,14 +290,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 {
> @@ -306,13 +307,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 {
> @@ -357,4 +359,23 @@ sub what_match {
>      return $res;
>  }
>  
> +# 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;