From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 5E2BE1FF15C for ; Wed, 2 Oct 2024 15:12:15 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 60B0EF884; Wed, 2 Oct 2024 15:12:31 +0200 (CEST) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Wed, 2 Oct 2024 15:11:53 +0200 Message-Id: <20241002131157.227292-4-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241002131157.227292-1-a.lauterer@proxmox.com> References: <20241002131157.227292-1-a.lauterer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.039 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH common v5 3/7] fix #3893: network: add vlan id and range parameter definitions X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" This is one step to make it possible to define the VLAN IDs and ranges for bridges. It is expected to be used in combination with the `-list` magic property. Therefore it defines and checks the validity of a single list item that could just be a single VLAN tag ID or a range. Signed-off-by: Aaron Lauterer --- changes since v4: * reordered, used to be 2/7 * $check_vid got renamed to $valid_vid * $valid_vid no returns explicit truthy/falsy values * use `return` instead of `return undef` * reworked last check ($start >= $end) to handle $noerr better v3:superfloous * switched regex to one with non-capturing group * fixed superfloous space v2: * renamed schema to a more generic one with the use case of the guest trunk config in mind src/PVE/JSONSchema.pm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/src/PVE/JSONSchema.pm b/src/PVE/JSONSchema.pm index ce39092..7c63af1 100644 --- a/src/PVE/JSONSchema.pm +++ b/src/PVE/JSONSchema.pm @@ -81,6 +81,12 @@ register_standard_option('pve-iface', { minLength => 2, maxLength => 20, }); +register_standard_option('pve-vlan-id-or-range', { + description => "VLAN ID or range.", + type => 'string', format => 'pve-vlan-id-or-range', + minLength => 1, maxLength => 9, +}); + register_standard_option('pve-storage-id', { description => "The storage identifier.", type => 'string', format => 'pve-storage-id', @@ -595,6 +601,39 @@ sub pve_verify_iface { return $id; } +# vlan id (vids), single or range +register_format('pve-vlan-id-or-range', \&pve_verify_vlan_id_or_range); +sub pve_verify_vlan_id_or_range { + my ($vlan, $noerr) = @_; + + my $valid_vid = sub { + my $tag = shift; + if ($tag < 2 || $tag > 4094) { + return 0 if $noerr; + die "invalid VLAN tag '$tag'\n"; + } + return 1; + }; + + if ($vlan !~ m/^(\d+)(?:-(\d+))?$/) { + return if $noerr; + die "invalid VLAN configuration '$vlan'\n"; + } + my $start = $1; + my $end = $2; + return if !$valid_vid->($start); + if ($end) { + return if !$valid_vid->($end); + + if ($start >= $end) { + return if $noerr; + die "VLAN range must go from lower to higher tag '$vlan'\n"; + } + } + + return $vlan; +} + # general addresses by name or IP register_format('address', \&pve_verify_address); sub pve_verify_address { -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel