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 3AFCE6B0AC for ; Tue, 16 Mar 2021 11:24:37 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B3CB62C507 for ; Tue, 16 Mar 2021 11:24:34 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 id E42DD2C3E0 for ; Tue, 16 Mar 2021 11:24:27 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id AFD1D4591C for ; Tue, 16 Mar 2021 11:24:27 +0100 (CET) From: Wolfgang Bumiller To: pmg-devel@lists.proxmox.com Date: Tue, 16 Mar 2021 11:24:24 +0100 Message-Id: <20210316102424.25885-18-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210316102424.25885-1-w.bumiller@proxmox.com> References: <20210316102424.25885-1-w.bumiller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.031 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record 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] Subject: [pmg-devel] [PATCH v3 common] get_options: don't set optional positional params to `undef` X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Mar 2021 10:24:37 -0000 Currently this happened if (and only if) at least one positional parameter was passed. We run into this with `pmgconfig cert delete []` vs `pvenode cert delete []` where in the PVE case the `restart` option was simply omitted, whereas for PMG due to the existence of `` the `restart` option was explicitly passedset in the $opts hash but ended up being `undef`. Signed-off-by: Wolfgang Bumiller --- * New in this version src/PVE/JSONSchema.pm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/PVE/JSONSchema.pm b/src/PVE/JSONSchema.pm index 20d72b3..4864549 100644 --- a/src/PVE/JSONSchema.pm +++ b/src/PVE/JSONSchema.pm @@ -1640,11 +1640,15 @@ sub get_options { if (!@$args) { # check if all left-over arg_param are optional, else we # must die as the mapping is then ambigious - for (my $j = $i; $j < scalar(@$arg_param); $j++) { - my $prop = $arg_param->[$j]; + for (; $i < scalar(@$arg_param); $i++) { + my $prop = $arg_param->[$i]; raise("not enough arguments\n", code => HTTP_BAD_REQUEST) if !$schema->{properties}->{$prop}->{optional}; } + if ($arg_param->[-1] eq 'extra-args') { + $opts->{'extra-args'} = []; + } + last; } $opts->{$arg_name} = shift @$args; } -- 2.20.1