From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 3A49F988D5 for ; Fri, 12 May 2023 14:24:27 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1C4352CC01 for ; Fri, 12 May 2023 14:23:57 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 12 May 2023 14:23:56 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 3B6D54216E for ; Fri, 12 May 2023 14:23:56 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Fri, 12 May 2023 14:23:50 +0200 Message-Id: <20230512122355.3244212-4-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230512122355.3244212-1-d.csapak@proxmox.com> References: <20230512122355.3244212-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.015 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [jsonschema.pm, cgi.pm] Subject: [pve-devel] [PATCH common 3/3] JSONSchema: disable '-alist' format 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: , X-List-Received-Date: Fri, 12 May 2023 12:24:27 -0000 this should not be needed anymore since we can now use a simple array in the api instead Signed-off-by: Dominik Csapak --- this breaks all packages which have an '-alist' format defined src/PVE/JSONSchema.pm | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/PVE/JSONSchema.pm b/src/PVE/JSONSchema.pm index 526fc2b..b148ce9 100644 --- a/src/PVE/JSONSchema.pm +++ b/src/PVE/JSONSchema.pm @@ -795,7 +795,7 @@ sub check_format { return if $format eq 'regex'; my $parsed; - $format =~ m/^(.*?)(?:-a?(list|opt))?$/; + $format =~ m/^(.*?)(?:-(list|opt))?$/; my ($format_name, $format_type) = ($1, $2 // 'none'); my $registered = get_format($format_name); die "undefined format '$format'\n" if !$registered; @@ -1707,7 +1707,7 @@ sub get_options { } elsif ($pd->{type} eq 'boolean') { push @getopt, "$prop:s"; } else { - if ($pd->{format} && $pd->{format} =~ m/-a?list/) { + if ($pd->{format} && $pd->{format} =~ m/-list/) { push @getopt, "$prop=s@"; } elsif ($pd->{type} eq 'array') { push @getopt, "$prop=s@"; @@ -1812,16 +1812,6 @@ sub get_options { # allow --vmid 100 --vmid 101 and --vmid 100,101 # allow --dow mon --dow fri and --dow mon,fri $opts->{$p} = join(",", @{$opts->{$p}}) if ref($opts->{$p}) eq 'ARRAY'; - } elsif ($pd->{format} =~ m/-alist/) { - # we encode array as \0 separated strings - # Note: CGI.pm also use this encoding - if (scalar(@{$opts->{$p}}) != 1) { - $opts->{$p} = join("\0", @{$opts->{$p}}); - } else { - # st that split_list knows it is \0 terminated - my $v = $opts->{$p}->[0]; - $opts->{$p} = "$v\0"; - } } } } -- 2.30.2