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 A6D9D66CB3 for ; Sun, 8 Nov 2020 15:19:49 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 62FC6E8F4 for ; Sun, 8 Nov 2020 15:19:49 +0100 (CET) Received: from kvmformation1.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3D1EBE8AC for ; Sun, 8 Nov 2020 15:19:47 +0100 (CET) Received: by kvmformation1.odiso.net (Postfix, from userid 0) id D75B371384D; Sun, 8 Nov 2020 15:19:41 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Sun, 8 Nov 2020 15:19:04 +0100 Message-Id: <20201108141940.1028443-3-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201108141940.1028443-1-aderumier@odiso.com> References: <20201108141940.1028443-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.232 Adjusted score from AWL reputation of From: address HEADER_FROM_DIFFERENT_DOMAINS 0.25 From and EnvelopeFrom 2nd level mail domains are different 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 KHOP_HELO_FCRDNS 0.276 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [vnetplugin.pm, vnets.pm, subnets.pm, subnetplugin.pm] Subject: [pve-devel] [PATCH pve-network 02/38] add subnets verifications hooks 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: , X-List-Received-Date: Sun, 08 Nov 2020 14:19:49 -0000 --- PVE/API2/Network/SDN/Subnets.pm | 5 ++++- PVE/API2/Network/SDN/Vnets.pm | 9 +++++++-- PVE/Network/SDN/SubnetPlugin.pm | 15 +++++++++++++++ PVE/Network/SDN/VnetPlugin.pm | 8 +++++--- 4 files changed, 31 insertions(+), 6 deletions(-) diff --git a/PVE/API2/Network/SDN/Subnets.pm b/PVE/API2/Network/SDN/Subnets.pm index 26b2aa5..3ef1d11 100644 --- a/PVE/API2/Network/SDN/Subnets.pm +++ b/PVE/API2/Network/SDN/Subnets.pm @@ -9,6 +9,7 @@ use PVE::Cluster qw(cfs_read_file cfs_write_file); use PVE::Network::SDN; use PVE::Network::SDN::Subnets; use PVE::Network::SDN::SubnetPlugin; +use PVE::Network::SDN::Vnets; use Storable qw(dclone); use PVE::JSONSchema qw(get_standard_option); @@ -204,9 +205,11 @@ __PACKAGE__->register_method ({ my $scfg = PVE::Network::SDN::Subnets::sdn_subnets_config($cfg, $id); - my $subnet_cfg = PVE::Network::SDN::Subnets::config(); + my $subnets_cfg = PVE::Network::SDN::Subnets::config(); + my $vnets_cfg = PVE::Network::SDN::Vnets::config(); delete $cfg->{ids}->{$id}; + PVE::Network::SDN::SubnetPlugin->on_delete_hook($id, $subnets_cfg, $vnets_cfg); PVE::Network::SDN::Subnets::write_config($cfg); PVE::Network::SDN::increase_version(); diff --git a/PVE/API2/Network/SDN/Vnets.pm b/PVE/API2/Network/SDN/Vnets.pm index c5860c8..23bc8bb 100644 --- a/PVE/API2/Network/SDN/Vnets.pm +++ b/PVE/API2/Network/SDN/Vnets.pm @@ -11,6 +11,7 @@ use PVE::Network::SDN::Zones; use PVE::Network::SDN::Zones::Plugin; use PVE::Network::SDN::Vnets; use PVE::Network::SDN::VnetPlugin; +use PVE::Network::SDN::Subnets; use Storable qw(dclone); use PVE::JSONSchema qw(get_standard_option); @@ -132,7 +133,9 @@ __PACKAGE__->register_method ({ my $plugin = PVE::Network::SDN::Zones::Plugin->lookup($plugin_config->{type}); $plugin->verify_tag($opts->{tag}); - PVE::Network::SDN::VnetPlugin->on_update_hook($id, $cfg); + my $subnet_cfg = PVE::Network::SDN::Subnets::config(); + + PVE::Network::SDN::VnetPlugin->on_update_hook($id, $cfg, $subnet_cfg); PVE::Network::SDN::Vnets::write_config($cfg); PVE::Network::SDN::increase_version(); @@ -173,7 +176,9 @@ __PACKAGE__->register_method ({ my $plugin = PVE::Network::SDN::Zones::Plugin->lookup($plugin_config->{type}); $plugin->verify_tag($opts->{tag}); - PVE::Network::SDN::VnetPlugin->on_update_hook($id, $cfg); + my $subnet_cfg = PVE::Network::SDN::Subnets::config(); + + PVE::Network::SDN::VnetPlugin->on_update_hook($id, $cfg, $subnet_cfg); PVE::Network::SDN::Vnets::write_config($cfg); PVE::Network::SDN::increase_version(); diff --git a/PVE/Network/SDN/SubnetPlugin.pm b/PVE/Network/SDN/SubnetPlugin.pm index 8900681..1b790a6 100644 --- a/PVE/Network/SDN/SubnetPlugin.pm +++ b/PVE/Network/SDN/SubnetPlugin.pm @@ -112,4 +112,19 @@ sub on_update_hook { raise_param_exc({ gateway => "$gateway is not in subnet $subnet"}) if $gateway && !$subnet_matcher->($gateway); } +sub on_delete_hook { + my ($class, $subnetid, $subnet_cfg, $vnet_cfg) = @_; + + #verify if vnets have subnet + foreach my $id (keys %{$vnet_cfg->{ids}}) { + my $vnet = $vnet_cfg->{ids}->{$id}; + my @subnets = PVE::Tools::split_list($vnet->{subnets}) if $vnet->{subnets}; + foreach my $subnet (@subnets) { + raise_param_exc({ subnet => "$subnet is attached to vnet $id"}) if $subnet eq $subnetid; + } + } + + return; +} + 1; diff --git a/PVE/Network/SDN/VnetPlugin.pm b/PVE/Network/SDN/VnetPlugin.pm index 47ca50b..430b3bf 100644 --- a/PVE/Network/SDN/VnetPlugin.pm +++ b/PVE/Network/SDN/VnetPlugin.pm @@ -111,10 +111,12 @@ sub on_update_hook { } } } - #verify subnet - my $subnets = $vnet_cfg->{ids}->{$vnetid}->{subnets}; - my @subnets = PVE::Tools::split_list($vnet_cfg->{ids}->{$vnetid}->{subnets}) if $plugin_config->{'peers'}; + #verify subnet + my @subnets = PVE::Tools::split_list($vnet_cfg->{ids}->{$vnetid}->{subnets}) if $vnet_cfg->{ids}->{$vnetid}->{subnets}; + foreach my $subnet (@subnets) { + raise_param_exc({ subnet => "$subnet not existing"}) if !$subnet_cfg->{ids}->{$subnet}; + } } 1; -- 2.20.1