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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id BB4009CAE7 for ; Thu, 1 Jun 2023 08:50:45 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9D1521A686 for ; Thu, 1 Jun 2023 08:50:15 +0200 (CEST) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [IPv6:2a0a:1580:2000::2d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 1 Jun 2023 08:50:13 +0200 (CEST) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 7CA217EE1; Thu, 1 Jun 2023 08:50:12 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 774BC2D655A; Thu, 1 Jun 2023 08:50:12 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Thu, 1 Jun 2023 08:50:11 +0200 Message-Id: <20230601065011.2946694-4-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230601065011.2946694-1-aderumier@odiso.com> References: <20230601065011.2946694-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.001 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 HEADER_FROM_DIFFERENT_DOMAINS 0.25 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH pve-manager 2/2] pvesh: send params to check_proxyto like httpserver 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: Thu, 01 Jun 2023 06:50:45 -0000 Currently only url_params are send to check_proxyto, the behaviour is different than httpserver. for example, so we can't retreive "pvesh create ... --node" param in proxyto_callback Signed-off-by: Alexandre Derumier --- PVE/CLI/pvesh.pm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/PVE/CLI/pvesh.pm b/PVE/CLI/pvesh.pm index 9acf292a..f83e05aa 100755 --- a/PVE/CLI/pvesh.pm +++ b/PVE/CLI/pvesh.pm @@ -300,16 +300,19 @@ sub call_api_method { die "no '$cmd' handler for '$path'\n"; } + for my $p (sort keys %{$param}) { + if (defined($uri_param->{$p}) && $uri_param->{$p} ne $param->{$p}) { + die "duplicate parameter $p (already defined in URI) with conflicting values!\n"; + } + $uri_param->{$p} = $param->{$p}; + } + my $data; my ($node, $remip) = check_proxyto($info, $uri_param); if ($node) { $data = proxy_handler($node, $remip, $path, $cmd, $param); } else { - foreach my $p (keys %$uri_param) { - $param->{$p} = $uri_param->{$p}; - } - - $data = $handler->handle($info, $param); + $data = $handler->handle($info, $uri_param); } return if $opt_nooutput || $stdopts->{quiet}; -- 2.30.2