proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-04-30 15:39:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

api: ceph: mon: fix handling of IPv6 addresses in assert_mon_prerequisites

Browse Source 
by comparing their canonical forms.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner 2021-05-10 14:18:23 +02:00 committed by Thomas Lamprecht
parent 4be756f59c
commit 9e989449ae
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
PVE/API2/Ceph/MON.pm
View File

@ -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";
}