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 4467FB93E5 for ; Wed, 13 Mar 2024 16:43:05 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1CF4DD4 for ; Wed, 13 Mar 2024 16:42:35 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 for ; Wed, 13 Mar 2024 16:42:33 +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 5495A489AC for ; Wed, 13 Mar 2024 16:42:33 +0100 (CET) Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Wed, 13 Mar 2024 16:42:32 +0100 Message-Id: From: "Stefan Sterz" To: "Proxmox VE development discussion" X-Mailer: aerc 0.17.0-69-g65571b67d7d3-dirty References: <20240313145345.484627-1-m.carrara@proxmox.com> In-Reply-To: <20240313145345.484627-1-m.carrara@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL -0.072 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 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [mon.pm, perl.org, proxmox.com] Subject: Re: [pve-devel] [PATCH pve-manager 1/2] fix #5198: ceph: mon: fix mon existence check in mon removal assertion 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: Wed, 13 Mar 2024 15:43:05 -0000 On Wed Mar 13, 2024 at 3:53 PM CET, Max Carrara wrote: > The Ceph monitor removal assertion contains a condition that checks > whether the given mon ID actually exists and thus may be removed. > > The first part of the condition checks whether the hash returned by > `get_services_info` [0] contains the key "mon.$monid". However, the > hash's keys are never prefixed with "mon.", which makes this check > incorrect. > > This is fixed by just using "$monid" directly. > > The second part checks whether the mon hashes returned by > Ceph contain the "name" key before comparing the key with the given > mon ID. This key existence check is also incorrect; in particular: > * If the lookup `$_->{name}` evaluates to e.g. "foo", the check > passes, because "foo" is truthy. [1] > * If the lookup `$_->{name}` evaluates to "0", the check fails, > because "0" is falsy (due to it being equivalent to the number 0, > according to Perl [1]). > > This is solved by using the inbuilt `exists()` instead of relying on > Perl's definition of truthiness. > > [0]: https://git.proxmox.com/?p=3Dpve-manager.git;a=3Dblob;f=3DPVE/Ceph/S= ervices.pm;h=3De0f31e8eb6bc9b3777b3d0d548497276efaa5c41;hb=3DHEAD#l112 > [1]: https://perldoc.perl.org/perldata#Scalar-values > > Fixes: https://bugzilla.proxmox.com/show_bug.cgi?id=3D5198 > Signed-off-by: Max Carrara > --- > PVE/API2/Ceph/MON.pm | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/PVE/API2/Ceph/MON.pm b/PVE/API2/Ceph/MON.pm > index 1e959ef3..1737c294 100644 > --- a/PVE/API2/Ceph/MON.pm > +++ b/PVE/API2/Ceph/MON.pm > @@ -147,8 +147,8 @@ my $assert_mon_prerequisites =3D sub { > my $assert_mon_can_remove =3D sub { > my ($monhash, $monlist, $monid, $mondir) =3D @_; > > - if (!(defined($monhash->{"mon.$monid"}) || > - grep { $_->{name} && $_->{name} eq $monid } @$monlist)) not sure if splitting the fix and the code style clean up makes sense here but otherwise this works as advertised. So: Tested-by: Stefan Sterz > + if (!(defined($monhash->{$monid}) || > + grep { exists($_->{name}) && $_->{name} eq $monid } @$monlist)) > { > die "no such monitor id '$monid'\n" > }