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 325CD1FF13A for ; Wed, 13 May 2026 10:34:50 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B9EE83C59; Wed, 13 May 2026 10:34:46 +0200 (CEST) From: Gabriel Goller To: pve-devel@lists.proxmox.com Subject: [PATCH pve-network v2 2/4] sdn: add full-range CIDR JSON schema formats Date: Wed, 13 May 2026 10:34:21 +0200 Message-ID: <20260513083430.63529-3-g.goller@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260513083430.63529-1-g.goller@proxmox.com> References: <20260513083430.63529-1-g.goller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1778661161079 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.028 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 Message-ID-Hash: 6LXJZ5JU5PSBWG7QWH23HBQ7OZYWTVHV X-Message-ID-Hash: 6LXJZ5JU5PSBWG7QWH23HBQ7OZYWTVHV X-MailFrom: g.goller@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Add IPv4, IPv6, and generic CIDR validators that allow the full prefix range, including /0. Don't change the existing CIDR validators. Signed-off-by: Gabriel Goller --- src/PVE/Network/SDN/PrefixLists.pm | 40 ++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/src/PVE/Network/SDN/PrefixLists.pm b/src/PVE/Network/SDN/PrefixLists.pm index 19d752d245f0..9bb7174878f7 100644 --- a/src/PVE/Network/SDN/PrefixLists.pm +++ b/src/PVE/Network/SDN/PrefixLists.pm @@ -5,6 +5,7 @@ use warnings; use PVE::Cluster qw(cfs_register_file cfs_read_file cfs_lock_file cfs_write_file); use PVE::JSONSchema qw(get_standard_option); +use PVE::Tools; use PVE::INotify; use PVE::Network::SDN; use PVE::Network::SDN::RouteMaps; @@ -39,6 +40,45 @@ PVE::JSONSchema::register_standard_option( }, ); +PVE::JSONSchema::register_format('FullRangeCIDRv6', \&pve_verify_fullrangecidrv6); + +sub pve_verify_fullrangecidrv6 { + my ($cidr, $noerr) = @_; + + if ($cidr =~ m!^(?:$PVE::Tools::IPV6RE)(?:/(\d+))$! && ($1 >= 0) && ($1 <= 128)) { + return $cidr; + } + + return undef if $noerr; + die "value does not look like a valid IPv6 CIDR network\n"; +} + +PVE::JSONSchema::register_format('FullRangeCIDRv4', \&pve_verify_fullrangecidrv4); + +sub pve_verify_fullrangecidrv4 { + my ($cidr, $noerr) = @_; + + if ($cidr =~ m!^(?:$PVE::Tools::IPV4RE)(?:/(\d+))$! && ($1 >= 0) && ($1 <= 32)) { + return $cidr; + } + + return undef if $noerr; + die "value does not look like a valid IPv4 CIDR network\n"; +} + +PVE::JSONSchema::register_format('FullRangeCIDR', \&pve_verify_fullrangecidr); + +sub pve_verify_fullrangecidr { + my ($cidr, $noerr) = @_; + + if (!(pve_verify_fullrangecidrv4($cidr, 1) || pve_verify_fullrangecidrv6($cidr, 1))) { + return undef if $noerr; + die "value does not look like a valid CIDR network\n"; + } + + return $cidr; +} + cfs_register_file( 'sdn/prefix-lists.cfg', \&parse_prefix_lists_config, \&write_prefix_lists_config, ); -- 2.47.3