From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id B62971FF163 for ; Thu, 10 Oct 2024 17:59:10 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 99EFE1E616; Thu, 10 Oct 2024 17:57:27 +0200 (CEST) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Thu, 10 Oct 2024 17:56:34 +0200 Message-Id: <20241010155637.255451-23-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241010155637.255451-1-s.hanreich@proxmox.com> References: <20241010155637.255451-1-s.hanreich@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.260 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 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pve-devel] [PATCH pve-firewall v2 22/25] api: load sdn ipsets 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" Since the SDN configuration reads the IPAM config file, which resides in /etc/pve/priv we need to add the protected flag to several endpoints. Signed-off-by: Stefan Hanreich --- src/PVE/API2/Firewall/Cluster.pm | 8 ++++++-- src/PVE/API2/Firewall/Rules.pm | 12 +++++++----- src/PVE/API2/Firewall/VM.pm | 3 ++- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/PVE/API2/Firewall/Cluster.pm b/src/PVE/API2/Firewall/Cluster.pm index 48ad90d..d5e8268 100644 --- a/src/PVE/API2/Firewall/Cluster.pm +++ b/src/PVE/API2/Firewall/Cluster.pm @@ -214,6 +214,7 @@ __PACKAGE__->register_method({ permissions => { check => ['perm', '/', [ 'Sys.Audit' ]], }, + protected => 1, parameters => { additionalProperties => 0, properties => { @@ -253,9 +254,12 @@ __PACKAGE__->register_method({ code => sub { my ($param) = @_; - my $conf = PVE::Firewall::load_clusterfw_conf(); + my $conf = PVE::Firewall::load_clusterfw_conf(undef, { load_sdn_config => 1 }); + + my $cluster_refs = PVE::Firewall::Helpers::collect_refs($conf, $param->{type}, "dc"); + my $sdn_refs = PVE::Firewall::Helpers::collect_refs($conf->{sdn}, $param->{type}, "sdn"); - return PVE::Firewall::Helpers::collect_refs($conf, $param->{type}, "dc"); + return [@$sdn_refs, @$cluster_refs]; }}); 1; diff --git a/src/PVE/API2/Firewall/Rules.pm b/src/PVE/API2/Firewall/Rules.pm index 9fcfb20..f5cb002 100644 --- a/src/PVE/API2/Firewall/Rules.pm +++ b/src/PVE/API2/Firewall/Rules.pm @@ -72,6 +72,7 @@ sub register_get_rules { path => '', method => 'GET', description => "List rules.", + protected => 1, permissions => PVE::Firewall::rules_audit_permissions($rule_env), parameters => { additionalProperties => 0, @@ -120,6 +121,7 @@ sub register_get_rule { path => '{pos}', method => 'GET', description => "Get single rule data.", + protected => 1, permissions => PVE::Firewall::rules_audit_permissions($rule_env), parameters => { additionalProperties => 0, @@ -412,7 +414,7 @@ sub lock_config { sub load_config { my ($class, $param) = @_; - my $fw_conf = PVE::Firewall::load_clusterfw_conf(); + my $fw_conf = PVE::Firewall::load_clusterfw_conf(undef, { load_sdn_config => 1 }); my $rules = $fw_conf->{groups}->{$param->{group}}; die "no such security group '$param->{group}'\n" if !defined($rules); @@ -488,7 +490,7 @@ sub lock_config { sub load_config { my ($class, $param) = @_; - my $fw_conf = PVE::Firewall::load_clusterfw_conf(); + my $fw_conf = PVE::Firewall::load_clusterfw_conf(undef, { load_sdn_config => 1 }); my $rules = $fw_conf->{rules}; return (undef, $fw_conf, $rules); @@ -528,7 +530,7 @@ sub lock_config { sub load_config { my ($class, $param) = @_; - my $cluster_conf = PVE::Firewall::load_clusterfw_conf(); + my $cluster_conf = PVE::Firewall::load_clusterfw_conf(undef, { load_sdn_config => 1 }); my $fw_conf = PVE::Firewall::load_hostfw_conf($cluster_conf); my $rules = $fw_conf->{rules}; @@ -572,7 +574,7 @@ sub lock_config { sub load_config { my ($class, $param) = @_; - my $cluster_conf = PVE::Firewall::load_clusterfw_conf(); + my $cluster_conf = PVE::Firewall::load_clusterfw_conf(undef, { load_sdn_config => 1 }); my $fw_conf = PVE::Firewall::load_vmfw_conf($cluster_conf, 'vm', $param->{vmid}); my $rules = $fw_conf->{rules}; @@ -616,7 +618,7 @@ sub lock_config { sub load_config { my ($class, $param) = @_; - my $cluster_conf = PVE::Firewall::load_clusterfw_conf(); + my $cluster_conf = PVE::Firewall::load_clusterfw_conf(undef, { load_sdn_config => 1 }); my $fw_conf = PVE::Firewall::load_vmfw_conf($cluster_conf, 'ct', $param->{vmid}); my $rules = $fw_conf->{rules}; diff --git a/src/PVE/API2/Firewall/VM.pm b/src/PVE/API2/Firewall/VM.pm index 4222103..4df725d 100644 --- a/src/PVE/API2/Firewall/VM.pm +++ b/src/PVE/API2/Firewall/VM.pm @@ -234,6 +234,7 @@ sub register_handlers { path => 'refs', method => 'GET', description => "Lists possible IPSet/Alias reference which are allowed in source/dest properties.", + protected => 1, permissions => { check => ['perm', '/vms/{vmid}', [ 'VM.Audit' ]], }, @@ -278,7 +279,7 @@ sub register_handlers { code => sub { my ($param) = @_; - my $cluster_conf = PVE::Firewall::load_clusterfw_conf(); + my $cluster_conf = PVE::Firewall::load_clusterfw_conf(undef, { load_sdn_config => 1 }); my $fw_conf = PVE::Firewall::load_vmfw_conf($cluster_conf, $rule_env, $param->{vmid}); my $dc_refs = PVE::Firewall::Helpers::collect_refs($cluster_conf, $param->{type}, 'dc'); -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel