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 3517595825 for ; Tue, 27 Feb 2024 15:22:57 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0E5921DC52 for ; Tue, 27 Feb 2024 15:22:27 +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 ; Tue, 27 Feb 2024 15:22:26 +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 15DB347756 for ; Tue, 27 Feb 2024 15:22:26 +0100 (CET) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Tue, 27 Feb 2024 15:22:03 +0100 Message-Id: <20240227142203.233611-1-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.081 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] pmgdb: dump: replace active flag with rules enum 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: Tue, 27 Feb 2024 14:22:57 -0000 this addresses the odd/unintuitive behavior of `pmgdb dump --active 0` which currently prints all rules, why printing only the inactive ones might be expected. Signed-off-by: Stoiko Ivanov --- tested by running all 4 variants (active, inactive, all, no rule argument) and diffing the resulting output) src/PMG/CLI/pmgdb.pm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/PMG/CLI/pmgdb.pm b/src/PMG/CLI/pmgdb.pm index 0ac3f82..cc9d000 100644 --- a/src/PMG/CLI/pmgdb.pm +++ b/src/PMG/CLI/pmgdb.pm @@ -39,11 +39,13 @@ sub print_objects { } sub print_rule { - my ($ruledb, $rule, $active_only) = @_; + my ($ruledb, $rule, $rule_status) = @_; $ruledb->load_rule_attributes($rule); - return if !$rule->{active} && $active_only; + return if !$rule->{active} && $rule_status eq 'active'; + return if $rule->{active} && $rule_status eq 'inactive'; + my $direction = { 0 => 'in', 1 => 'out', @@ -114,11 +116,12 @@ __PACKAGE__->register_method ({ parameters => { additionalProperties => 0, properties => { - active => { - type => 'boolean', - description => "Print only active rules", + rules => { + description => "Which rules should be printed", + type => 'string', + enum => [qw(all active inactive)], + default => 'all', optional => 1, - default => 0, }, }, }, @@ -126,13 +129,14 @@ __PACKAGE__->register_method ({ code => sub { my ($param) = @_; + my $rule_status = $param->{rules} // ''; my $dbh = PMG::DBTools::open_ruledb("Proxmox_ruledb"); my $ruledb = PMG::RuleDB->new($dbh); my $rules = $ruledb->load_rules(); foreach my $rule (@$rules) { - print_rule($ruledb, $rule, $param->{active}); + print_rule($ruledb, $rule, $rule_status); } $ruledb->close(); -- 2.39.2