Re: [PATCH pve-network v2 06/10] fix #7294: sdn: register api formats for zones and vnets

["Daniel Kral" <d.kral@proxmox.com>]

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 <d.riley@proxmox.com>
> ---
>  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'

>      },
>  );
>  
> +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 <d.kral@proxmox.com>