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 654EC1FF150 for ; Mon, 06 Jul 2026 14:21:28 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id ABD0221449; Mon, 06 Jul 2026 14:21:27 +0200 (CEST) Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Mon, 06 Jul 2026 14:21:22 +0200 Message-Id: To: "David Riley" , Subject: Re: [PATCH pve-network v2 06/10] fix #7294: sdn: register api formats for zones and vnets From: "Daniel Kral" X-Mailer: aerc 0.21.0-147-g43ac7b685014-dirty References: <20260626131035.112374-1-d.riley@proxmox.com> <20260626131035.112374-7-d.riley@proxmox.com> In-Reply-To: <20260626131035.112374-7-d.riley@proxmox.com> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1783340476000 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.021 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) 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: CPO4GGYDEWUOGLDCFJ4F62PW72WON2NO X-Message-ID-Hash: CPO4GGYDEWUOGLDCFJ4F62PW72WON2NO X-MailFrom: d.kral@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: 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=3D7294 > 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/Vnet= Plugin.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(@_); }, > ); > =20 > +my $sdn_vnet_id_pattern =3D '[a-zA-Z][a-zA-Z0-9]*[a-zA-Z0-9]'; > +my $vnet_min_length =3D 2; > +my $vnet_max_length =3D 8; > + > PVE::JSONSchema::register_standard_option( > 'pve-sdn-vnet-id', > { > description =3D> "The SDN vnet object identifier.", > type =3D> 'string', > - pattern =3D> '[a-zA-Z][a-zA-Z0-9]*[a-zA-Z0-9]', > - minLength =3D> 2, > - maxLength =3D> 8, > + pattern =3D> $sdn_vnet_id_pattern, > + minLength =3D> $vnet_min_length, > + maxLength =3D> $vnet_max_length, nit: might be overkill, but add a: format =3D> 'pve-sdn-vnet-id' > }, > ); > =20 > +sub pve_verify_sdn_vnet_id { > + my ($vnet, $noerr) =3D @_; > + > + my $len =3D 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_ma= x_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_vne= t_id); > + > my $defaultData =3D { > =20 > propertyList =3D> { > diff --git a/src/PVE/Network/SDN/Zones/Plugin.pm b/src/PVE/Network/SDN/Zo= nes/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(@_); }, > ); > =20 > +my $sdn_zone_id_pattern =3D '[a-zA-Z][a-zA-Z0-9]*[a-zA-Z0-9]'; > +my $zone_min_length =3D 2; > +my $zone_max_length =3D 8; > + > PVE::JSONSchema::register_standard_option( > 'pve-sdn-zone-id', > { > description =3D> "The SDN zone object identifier.", > type =3D> 'string', > - pattern =3D> '[a-zA-Z][a-zA-Z0-9]*[a-zA-Z0-9]', > - minLength =3D> 2, > - maxLength =3D> 8, > + pattern =3D> $sdn_zone_id_pattern, > + minLength =3D> $zone_min_length, > + maxLength =3D> $zone_max_length, nit: might be overkill, but add a: format =3D> 'pve-sdn-zone-id' > }, > ); > =20 > +sub pve_verify_sdn_zone_id { > + my ($zone, $noerr) =3D @_; > + > + my $len =3D 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_ma= x_length characters long," > + . " start with a letter, and contain only alphanumeric chara= cters\n"; > + } > + return $zone; > +} > + > +PVE::JSONSchema::register_format('pve-sdn-zone-id', \&pve_verify_sdn_zon= e_id); > + > my $defaultData =3D { > =20 > propertyList =3D> { Modulo the nits, consider this: Reviewed-by: Daniel Kral