[pve-devel] applied: [PATCH manager v6 01/15] pvesh: fix parameters for proxyto_callback

[Wolfgang Bumiller <w.bumiller@proxmox.com>]

applied this one

On Wed, Jun 14, 2023 at 10:46:07AM +0200, Dominik Csapak wrote:
> 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>
> ---
>  PVE/CLI/pvesh.pm | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/PVE/CLI/pvesh.pm b/PVE/CLI/pvesh.pm
> index 9acf292a..28e2518d 100755
> --- a/PVE/CLI/pvesh.pm
> +++ b/PVE/CLI/pvesh.pm
> @@ -82,13 +82,15 @@ my $method_map = {
>  };
>  
>  sub check_proxyto {
> -    my ($info, $uri_param) = @_;
> +    my ($info, $uri_param, $params) = @_;
>  
>      my $rpcenv = PVE::RPCEnvironment->get();
>  
> +    my $all_params = { %$uri_param, %$params };
> +
>      if ($info->{proxyto} || $info->{proxyto_callback}) {
>  	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())) {
>  	    die "proxy loop detected - aborting\n" if $disable_proxy;
> @@ -301,7 +303,7 @@ sub call_api_method {
>      }
>  
>      my $data;
> -    my ($node, $remip) = check_proxyto($info, $uri_param);
> +    my ($node, $remip) = check_proxyto($info, $uri_param, $param);
>      if ($node) {
>  	$data = proxy_handler($node, $remip, $path, $cmd, $param);
>      } else {
> @@ -345,7 +347,7 @@ __PACKAGE__->register_method ({
>  
>  	my $res;
>  
> -	my ($node, $remip) = check_proxyto($info, $uri_param);
> +	my ($node, $remip) = check_proxyto($info, $uri_param, $param);
>  	if ($node) {
>  	    $res = proxy_handler($node, $remip, $path, 'ls', $param);
>  	} else {
> -- 
> 2.30.2