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 ABF0A7AC3F for ; Mon, 10 May 2021 14:19:04 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A0D7817CA6 for ; Mon, 10 May 2021 14:18:34 +0200 (CEST) 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 id CAB5C17C4D for ; Mon, 10 May 2021 14:18:31 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A0E7745B6E for ; Mon, 10 May 2021 14:18:31 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 10 May 2021 14:18:23 +0200 Message-Id: <20210510121826.8543-12-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210510121826.8543-1-f.ebner@proxmox.com> References: <20210510121826.8543-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.003 Adjusted score from AWL reputation of From: address 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 Subject: [pve-devel] [PATCH v2 manager 11/14] api: ceph: mon: fix handling of IPv6 addresses in assert_mon_prerequisites 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: Mon, 10 May 2021 12:19:04 -0000 by comparing their canonical forms. Signed-off-by: Fabian Ebner --- New in v2. PVE/API2/Ceph/MON.pm | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/PVE/API2/Ceph/MON.pm b/PVE/API2/Ceph/MON.pm index e4e8ecfb..27278bc1 100644 --- a/PVE/API2/Ceph/MON.pm +++ b/PVE/API2/Ceph/MON.pm @@ -89,15 +89,26 @@ my $ips_from_mon_host = sub { my $assert_mon_prerequisites = sub { my ($cfg, $monhash, $monid, $monip) = @_; - my $ip_regex = '(?:^|[^\d])' . # start or nondigit - "\Q$monip\E" . # the ip not interpreted as regex - '(?:[^\d]|$)'; # end or nondigit + $monip = PVE::Network::canonical_ip($monip); - if (($cfg->{global}->{mon_host} && $cfg->{global}->{mon_host} =~ m/$ip_regex/) || - grep { $_->{addr} && $_->{addr} =~ m/$ip_regex/ } values %$monhash) { - die "monitor address '$monip' already in use\n"; + my $used_ips = {}; + + my $mon_host_ips = $ips_from_mon_host->($cfg->{global}->{mon_host}); + + for my $mon_host_ip (@{$mon_host_ips}) { + my $ip = PVE::Network::canonical_ip($mon_host_ip); + $used_ips->{$ip} = 1; + } + + for my $mon (values %{$monhash}) { + next if !defined($mon->{addr}); + + my $ip = PVE::Network::canonical_ip($mon->{addr}); + $used_ips->{$ip} = 1; } + die "monitor address '$monip' already in use\n" if $used_ips->{$monip}; + if (defined($monhash->{$monid})) { die "monitor '$monid' already exists\n"; } -- 2.20.1