From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id D4CA11FF138 for ; Mon, 20 Jul 2026 10:25:15 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id A3EC2214B2; Mon, 20 Jul 2026 10:25:15 +0200 (CEST) Message-ID: Date: Mon, 20 Jul 2026 10:24:40 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: David Riley Subject: Re: [PATCH pve-network v2 06/10] fix #7294: sdn: register api formats for zones and vnets To: Daniel Kral , pve-devel@lists.proxmox.com References: <20260626131035.112374-1-d.riley@proxmox.com> <20260626131035.112374-7-d.riley@proxmox.com> Content-Language: en-US In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1784535856654 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.118 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_LOW -0.7 Sender listed at https://www.dnswl.org/, low trust 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: 23SXT4TS2DB3JLZ4BKBTB23ZRVYZBCW3 X-Message-ID-Hash: 23SXT4TS2DB3JLZ4BKBTB23ZRVYZBCW3 X-MailFrom: d.riley@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: comment inline. On 7/6/26 2:21 PM, Daniel Kral wrote: > On Fri Jun 26, 2026 at 3:10 PM CEST, David Riley wrote: >> Register JSONSchema format validators for both SDN zones and VNets, >> enabling the pool members API to verify these network identifiers. >> >> Link:https://bugzilla.proxmox.com/show_bug.cgi?id=7294 >> Signed-off-by: David Riley >> --- >> src/PVE/Network/SDN/VnetPlugin.pm | 25 ++++++++++++++++++++++--- >> src/PVE/Network/SDN/Zones/Plugin.pm | 25 ++++++++++++++++++++++--- >> 2 files changed, 44 insertions(+), 6 deletions(-) >> >> diff --git a/src/PVE/Network/SDN/VnetPlugin.pm b/src/PVE/Network/SDN/VnetPlugin.pm >> index e041575..fbddc06 100644 >> --- a/src/PVE/Network/SDN/VnetPlugin.pm >> +++ b/src/PVE/Network/SDN/VnetPlugin.pm >> @@ -16,17 +16,36 @@ PVE::Cluster::cfs_register_file( >> sub { __PACKAGE__->write_config(@_); }, >> ); >> >> +my $sdn_vnet_id_pattern = '[a-zA-Z][a-zA-Z0-9]*[a-zA-Z0-9]'; >> +my $vnet_min_length = 2; >> +my $vnet_max_length = 8; >> + >> PVE::JSONSchema::register_standard_option( >> 'pve-sdn-vnet-id', >> { >> description => "The SDN vnet object identifier.", >> type => 'string', >> - pattern => '[a-zA-Z][a-zA-Z0-9]*[a-zA-Z0-9]', >> - minLength => 2, >> - maxLength => 8, >> + pattern => $sdn_vnet_id_pattern, >> + minLength => $vnet_min_length, >> + maxLength => $vnet_max_length, > nit: might be overkill, but add a: format => 'pve-sdn-vnet-id' As far as I can tell it should not hurt. I'll add it. Thanks. >> }, >> ); >> >> +sub pve_verify_sdn_vnet_id { >> + my ($vnet, $noerr) = @_; >> + >> + my $len = length($vnet); >> + >> + if ($vnet !~ m/^$sdn_vnet_id_pattern$/ || $len < $vnet_min_length || $len > $vnet_max_length) { >> + return undef if $noerr; >> + die "invalid SDN VNet '$vnet', must be $vnet_min_length-$vnet_max_length characters" >> + . " long, start with a letter, and contain only alphanumeric characters\n"; >> + } >> + return $vnet; >> +} >> + >> +PVE::JSONSchema::register_format('pve-sdn-vnet-id', \&pve_verify_sdn_vnet_id); >> + >> my $defaultData = { >> >> propertyList => { >> diff --git a/src/PVE/Network/SDN/Zones/Plugin.pm b/src/PVE/Network/SDN/Zones/Plugin.pm >> index 74a3384..81bcf86 100644 >> --- a/src/PVE/Network/SDN/Zones/Plugin.pm >> +++ b/src/PVE/Network/SDN/Zones/Plugin.pm >> @@ -19,17 +19,36 @@ PVE::Cluster::cfs_register_file( >> sub { __PACKAGE__->write_config(@_); }, >> ); >> >> +my $sdn_zone_id_pattern = '[a-zA-Z][a-zA-Z0-9]*[a-zA-Z0-9]'; >> +my $zone_min_length = 2; >> +my $zone_max_length = 8; >> + >> PVE::JSONSchema::register_standard_option( >> 'pve-sdn-zone-id', >> { >> description => "The SDN zone object identifier.", >> type => 'string', >> - pattern => '[a-zA-Z][a-zA-Z0-9]*[a-zA-Z0-9]', >> - minLength => 2, >> - maxLength => 8, >> + pattern => $sdn_zone_id_pattern, >> + minLength => $zone_min_length, >> + maxLength => $zone_max_length, > nit: might be overkill, but add a: format => 'pve-sdn-zone-id' > >> }, >> ); >> >> +sub pve_verify_sdn_zone_id { >> + my ($zone, $noerr) = @_; >> + >> + my $len = length($zone); >> + >> + if ($zone !~ m/^$sdn_zone_id_pattern$/ || $len < $zone_min_length || $len > $zone_max_length) { >> + return undef if $noerr; >> + die "invalid SDN zone '$zone', must be $zone_min_length-$zone_max_length characters long," >> + . " start with a letter, and contain only alphanumeric characters\n"; >> + } >> + return $zone; >> +} >> + >> +PVE::JSONSchema::register_format('pve-sdn-zone-id', \&pve_verify_sdn_zone_id); >> + >> my $defaultData = { >> >> propertyList => { > Modulo the nits, consider this: > > Reviewed-by: Daniel Kral > > > >