From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id F34901FF183 for ; Wed, 22 Oct 2025 13:17:49 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5CD5415C52; Wed, 22 Oct 2025 13:18:14 +0200 (CEST) From: Hannes Laimer To: pve-devel@lists.proxmox.com Date: Wed, 22 Oct 2025 13:17:37 +0200 Message-ID: <20251022111737.190009-1-h.laimer@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1761131852974 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.043 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [rules.pm] Subject: [pve-devel] [PATCH pve-firewall] api: rules: add return type to list_rules endpoint X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" We already have this for the GET endpoint for a rule, so we just reuse that for the items in the list. Signed-off-by: Hannes Laimer --- This is a little odd since we return the exact same data in the list as we do in the endpoint for a single rule. So unless you already know the pos of a rule, you could just list them and wouldn't need to call rules/{pos} at all... We also need this to correctly generate the rust types for the `rules` endpoint. src/PVE/API2/Firewall/Rules.pm | 130 ++++++++++++++++----------------- 1 file changed, 64 insertions(+), 66 deletions(-) diff --git a/src/PVE/API2/Firewall/Rules.pm b/src/PVE/API2/Firewall/Rules.pm index 992ad9a..baed539 100644 --- a/src/PVE/API2/Firewall/Rules.pm +++ b/src/PVE/API2/Firewall/Rules.pm @@ -19,6 +19,68 @@ my $api_properties = { }, }; +my $rule_return_properties = { + action => { + type => 'string', + }, + comment => { + type => 'string', + optional => 1, + }, + dest => { + type => 'string', + optional => 1, + }, + dport => { + type => 'string', + optional => 1, + }, + enable => { + type => 'integer', + optional => 1, + }, + log => PVE::Firewall::get_standard_option( + 'pve-fw-loglevel', + { + description => 'Log level for firewall rule', + }, + ), + 'icmp-type' => { + type => 'string', + optional => 1, + }, + iface => { + type => 'string', + optional => 1, + }, + ipversion => { + type => 'integer', + optional => 1, + }, + macro => { + type => 'string', + optional => 1, + }, + pos => { + type => 'integer', + }, + proto => { + type => 'string', + optional => 1, + }, + source => { + type => 'string', + optional => 1, + }, + sport => { + type => 'string', + optional => 1, + }, + type => { + type => 'string', + }, +}; + =head3 check_privileges_for_method($class, $method_name, $param) If the permission checks from the register_method() call are not sufficient, @@ -102,11 +164,7 @@ sub register_get_rules { type => 'array', items => { type => "object", - properties => { - pos => { - type => 'integer', - }, - }, + properties => $rule_return_properties, }, links => [{ rel => 'child', href => "{pos}" }], }, @@ -151,67 +209,7 @@ sub register_get_rule { proxyto => $rule_env eq 'host' ? 'node' : undef, returns => { type => "object", - properties => { - action => { - type => 'string', - }, - comment => { - type => 'string', - optional => 1, - }, - dest => { - type => 'string', - optional => 1, - }, - dport => { - type => 'string', - optional => 1, - }, - enable => { - type => 'integer', - optional => 1, - }, - log => PVE::Firewall::get_standard_option( - 'pve-fw-loglevel', - { - description => 'Log level for firewall rule', - }, - ), - 'icmp-type' => { - type => 'string', - optional => 1, - }, - iface => { - type => 'string', - optional => 1, - }, - ipversion => { - type => 'integer', - optional => 1, - }, - macro => { - type => 'string', - optional => 1, - }, - pos => { - type => 'integer', - }, - proto => { - type => 'string', - optional => 1, - }, - source => { - type => 'string', - optional => 1, - }, - sport => { - type => 'string', - optional => 1, - }, - type => { - type => 'string', - }, - }, + properties => $rule_return_properties, }, code => sub { my ($param) = @_; -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel