proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-09 12:19:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pvesh: fix parameters for proxyto_callback

Browse Source 
in pve-http-server the proxyto_callback always has a complete list of
parameters, not only the ones in the url, so adapt the implementation
here to do the same

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2023-06-14 10:46:07 +02:00 committed by Wolfgang Bumiller
parent 5d6262aa59
commit 0fe0a2dd2b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PVE/CLI/pvesh.pm
View File

@ -82,13 +82,15 @@ my $method_map = {
}; };
sub check_proxyto { sub check_proxyto {
my ($info, $uri_param) = @_; my ($info, $uri_param, $params) = @_;
my $rpcenv = PVE::RPCEnvironment->get(); my $rpcenv = PVE::RPCEnvironment->get();
my $all_params = { %$uri_param, %$params };
if ($info->{proxyto} || $info->{proxyto_callback}) { if ($info->{proxyto} || $info->{proxyto_callback}) {
my $node = PVE::API2Tools::resolve_proxyto( my $node = PVE::API2Tools::resolve_proxyto(
$rpcenv, $info->{proxyto_callback}, $info->{proxyto}, $uri_param); $rpcenv, $info->{proxyto_callback}, $info->{proxyto}, $all_params);
if ($node ne 'localhost' && ($node ne PVE::INotify::nodename())) { if ($node ne 'localhost' && ($node ne PVE::INotify::nodename())) {
die "proxy loop detected - aborting\n" if $disable_proxy; die "proxy loop detected - aborting\n" if $disable_proxy;
@ -301,7 +303,7 @@ sub call_api_method {
} }
my $data; my $data;
my ($node, $remip) = check_proxyto($info, $uri_param); my ($node, $remip) = check_proxyto($info, $uri_param, $param);
if ($node) { if ($node) {
$data = proxy_handler($node, $remip, $path, $cmd, $param); $data = proxy_handler($node, $remip, $path, $cmd, $param);
} else { } else {
@ -345,7 +347,7 @@ __PACKAGE__->register_method ({
my $res; my $res;
my ($node, $remip) = check_proxyto($info, $uri_param); my ($node, $remip) = check_proxyto($info, $uri_param, $param);
if ($node) { if ($node) {
$res = proxy_handler($node, $remip, $path, 'ls', $param); $res = proxy_handler($node, $remip, $path, 'ls', $param);
} else { } else {