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 E05BB9C729 for ; Wed, 22 Nov 2023 14:01:36 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B67A618628 for ; Wed, 22 Nov 2023 14:01:36 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 22 Nov 2023 14:01:35 +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 930EB429ED for ; Wed, 22 Nov 2023 14:01:35 +0100 (CET) From: Stefan Lendl To: pbs-devel@lists.proxmox.com Date: Wed, 22 Nov 2023 14:00:41 +0100 Message-ID: <20231122130040.269759-2-s.lendl@proxmox.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.049 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [subnetplugin.pm] Subject: [pbs-devel] [PATCH pve-network] sdn: validate dhcp-range in API X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Nov 2023 13:01:36 -0000 * start- and end-addresses must be valid IPs * must both be in the subnet's CIDR * and start needs to smaller (or equal) to end Signed-off-by: Stefan Lendl --- src/PVE/Network/SDN/SubnetPlugin.pm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/src/PVE/Network/SDN/SubnetPlugin.pm b/src/PVE/Network/SDN/SubnetPlugin.pm index 37b6b2b..049f7e1 100644 --- a/src/PVE/Network/SDN/SubnetPlugin.pm +++ b/src/PVE/Network/SDN/SubnetPlugin.pm @@ -74,6 +74,33 @@ my $dhcp_range_fmt = { PVE::JSONSchema::register_format('pve-sdn-dhcp-range', $dhcp_range_fmt); +sub validate_dhcp_ranges { + my ($subnet) = @_; + + my $cidr = $subnet->{cidr}; + my $subnet_matcher = subnet_matcher($cidr); + + my $dhcp_ranges = PVE::Network::SDN::Subnets::get_dhcp_ranges($subnet); + + foreach my $dhcp_range (@$dhcp_ranges) { + my $dhcp_start = $dhcp_range->{'start-address'}; + my $dhcp_end = $dhcp_range->{'end-address'}; + + my $start_ip = new Net::IP($dhcp_start); + raise_param_exc({ 'dhcp-range' => "start-adress is not a valid IP $dhcp_start" }) if !$start_ip; + + my $end_ip = new Net::IP($dhcp_end); + raise_param_exc({ 'dhcp-range' => "end-adress is not a valid IP $dhcp_end" }) if !$end_ip; + + if (Net::IP::ip_bincomp($end_ip->binip(), 'lt', $start_ip->binip()) == 1) { + raise_param_exc({ 'dhcp-range' => "start-address $dhcp_start must be smaller than end-address $dhcp_end" }) + } + + raise_param_exc({ 'dhcp-range' => "start-address $dhcp_start is not in subnet $cidr" }) if !$subnet_matcher->($dhcp_start); + raise_param_exc({ 'dhcp-range' => "end-address $dhcp_end is not in subnet $cidr" }) if !$subnet_matcher->($dhcp_end); + } +} + sub properties { return { vnet => { @@ -156,6 +183,7 @@ sub on_update_hook { #for /32 pointopoint, we allow gateway outside the subnet raise_param_exc({ gateway => "$gateway is not in subnet $cidr"}) if $gateway && !$subnet_matcher->($gateway) && !$pointopoint; + validate_dhcp_ranges($subnet); if ($ipam) { PVE::Network::SDN::Subnets::add_subnet($zone, $subnetid, $subnet); -- 2.42.0