[pve-devel] [PATCH v4 manager] api: apt: repos: fix interfacing with perlmod

[pve-devel] [PATCH v4 manager] api: apt: repos: fix interfacing with perlmod

[Fabian Ebner]

Using
    pvesh create /nodes/pve701/apt/repositories --path
    "/etc/apt/sources.list" --index 0 --enabled 1
reliably leads to
    error: invalid type: string "0", expected usize

Coerce to int to avoid this. I was not able to trigger the issue with
the "enabled" option being a string here (in PMG I was), but be on the
safe side and coerce there too. Otherwise it might get triggered by a
future, completely unrelated change further up in the API call
handling.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---

Changes from v3:
    * shorter/cleaner code, but now there's no good reason for the
      comment anymore, because it's arguably the better code even
      without the perlmod limitation. But I do have a reproducer, so
      hopefully the issue can be fixed in perlmod before somebody else
      runs into it.

 PVE/API2/APT.pm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/PVE/API2/APT.pm b/PVE/API2/APT.pm
index bd60db33..ec9503de 100644
--- a/PVE/API2/APT.pm
+++ b/PVE/API2/APT.pm
@@ -750,13 +750,14 @@ __PACKAGE__->register_method({
     code => sub {
 	my ($param) = @_;
 
-	my $options = {
-	    enabled => $param->{enabled},
-	};
+	my $options = {};
+
+	my $enabled = $param->{enabled};
+	$options->{enabled} = int($enabled) if defined($enabled);
 
 	PVE::RS::APT::Repositories::change_repository(
 	    $param->{path},
-	    $param->{index},
+	    int($param->{index}),
 	    $options,
 	    $param->{digest}
 	);
-- 
2.30.2

Re: [pve-devel] [PATCH v4 manager] api: apt: repos: fix interfacing with perlmod

[Fabian Ebner]

Seems like I forgot about this one. Still applies and I quickly tested 
to make sure it still fixes the issue.

Am 16.07.21 um 15:27 schrieb Fabian Ebner:
> Using
>      pvesh create /nodes/pve701/apt/repositories --path
>      "/etc/apt/sources.list" --index 0 --enabled 1
> reliably leads to
>      error: invalid type: string "0", expected usize
> 
> Coerce to int to avoid this. I was not able to trigger the issue with
> the "enabled" option being a string here (in PMG I was), but be on the
> safe side and coerce there too. Otherwise it might get triggered by a
> future, completely unrelated change further up in the API call
> handling.
> 
> Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
> ---
> 
> Changes from v3:
>      * shorter/cleaner code, but now there's no good reason for the
>        comment anymore, because it's arguably the better code even
>        without the perlmod limitation. But I do have a reproducer, so
>        hopefully the issue can be fixed in perlmod before somebody else
>        runs into it.

Handling of undef key in a hash was fixed by Wolfgang in perlmod >= 
0.5.3-1, so factoring out the assignment to the 'enabled' key would not 
be necessary anymore, but the coercions to int still are.

> 
>   PVE/API2/APT.pm | 9 +++++----
>   1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/PVE/API2/APT.pm b/PVE/API2/APT.pm
> index bd60db33..ec9503de 100644
> --- a/PVE/API2/APT.pm
> +++ b/PVE/API2/APT.pm
> @@ -750,13 +750,14 @@ __PACKAGE__->register_method({
>       code => sub {
>   	my ($param) = @_;
>   
> -	my $options = {
> -	    enabled => $param->{enabled},
> -	};
> +	my $options = {};
> +
> +	my $enabled = $param->{enabled};
> +	$options->{enabled} = int($enabled) if defined($enabled);
>   
>   	PVE::RS::APT::Repositories::change_repository(
>   	    $param->{path},
> -	    $param->{index},
> +	    int($param->{index}),
>   	    $options,
>   	    $param->{digest}
>   	);
> 

Re: [pve-devel] [PATCH v4 manager] api: apt: repos: fix interfacing with perlmod

[Fabian Ebner]

Ping

Am 16.07.21 um 15:27 schrieb Fabian Ebner:
> Using
>     pvesh create /nodes/pve701/apt/repositories --path
>     "/etc/apt/sources.list" --index 0 --enabled 1
> reliably leads to
>     error: invalid type: string "0", expected usize
> 
> Coerce to int to avoid this. I was not able to trigger the issue with
> the "enabled" option being a string here (in PMG I was), but be on the
> safe side and coerce there too. Otherwise it might get triggered by a
> future, completely unrelated change further up in the API call
> handling.
> 
> Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
> ---
> 
> Changes from v3:
>     * shorter/cleaner code, but now there's no good reason for the
>       comment anymore, because it's arguably the better code even
>       without the perlmod limitation. But I do have a reproducer, so
>       hopefully the issue can be fixed in perlmod before somebody else
>       runs into it.
> 
>  PVE/API2/APT.pm | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/PVE/API2/APT.pm b/PVE/API2/APT.pm
> index bd60db33..ec9503de 100644
> --- a/PVE/API2/APT.pm
> +++ b/PVE/API2/APT.pm
> @@ -750,13 +750,14 @@ __PACKAGE__->register_method({
>      code => sub {
>  	my ($param) = @_;
>  
> -	my $options = {
> -	    enabled => $param->{enabled},
> -	};
> +	my $options = {};
> +
> +	my $enabled = $param->{enabled};
> +	$options->{enabled} = int($enabled) if defined($enabled);
>  
>  	PVE::RS::APT::Repositories::change_repository(
>  	    $param->{path},
> -	    $param->{index},
> +	    int($param->{index}),
>  	    $options,
>  	    $param->{digest}
>  	);

[pve-devel] applied: [PATCH v4 manager] api: apt: repos: fix interfacing with perlmod

[Thomas Lamprecht]

On 16.07.21 15:27, Fabian Ebner wrote:
> Using
>     pvesh create /nodes/pve701/apt/repositories --path
>     "/etc/apt/sources.list" --index 0 --enabled 1
> reliably leads to
>     error: invalid type: string "0", expected usize
> 
> Coerce to int to avoid this. I was not able to trigger the issue with
> the "enabled" option being a string here (in PMG I was), but be on the
> safe side and coerce there too. Otherwise it might get triggered by a
> future, completely unrelated change further up in the API call
> handling.
> 
> Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
> ---
> 
> Changes from v3:
>     * shorter/cleaner code, but now there's no good reason for the
>       comment anymore, because it's arguably the better code even
>       without the perlmod limitation. But I do have a reproducer, so
>       hopefully the issue can be fixed in perlmod before somebody else
>       runs into it.
> 
>  PVE/API2/APT.pm | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
>

sorry I thought this was already done, now applied, thanks!