diff --git a/PVE/APIServer/AnyEvent.pm b/PVE/APIServer/AnyEvent.pm index 0654bd4..f0e2e68 100644 --- a/PVE/APIServer/AnyEvent.pm +++ b/PVE/APIServer/AnyEvent.pm @@ -34,6 +34,7 @@ use PVE::SafeSyslog; use PVE::INotify; use PVE::Tools; use PVE::APIServer::Formatter; +use PVE::APIServer::Utils; use Net::IP; use URI; @@ -1662,6 +1663,7 @@ sub wait_end_loop { sub check_host_access { my ($self, $clientip) = @_; + $clientip = PVE::APIServer::Utils::normalize_v4_in_v6($clientip); my $cip = Net::IP->new($clientip); if (!$cip) { diff --git a/PVE/APIServer/Utils.pm b/PVE/APIServer/Utils.pm index 36e3ae6..8470f80 100644 --- a/PVE/APIServer/Utils.pm +++ b/PVE/APIServer/Utils.pm @@ -34,7 +34,7 @@ sub read_proxy_config { my $ips = []; foreach my $ip (split(/,/, $value)) { $ip = "0/0" if $ip eq 'all'; - push @$ips, Net::IP->new($ip) || die Net::IP::Error() . "\n"; + push @$ips, Net::IP->new(normalize_v4_in_v6($ip)) || die Net::IP::Error() . "\n"; } $res->{$key} = $ips; } elsif ($key eq 'LISTEN_IP') { @@ -57,4 +57,15 @@ sub read_proxy_config { return $res; } +sub normalize_v4_in_v6 { + my ($ip_text) = @_; + + my $ip = Net::IP->new($ip_text) || die Net::IP::Error() . "\n"; + my $v4_mapped_v6_prefix = Net::IP->new('::ffff:0:0/96'); + if ($v4_mapped_v6_prefix->overlaps($ip)) { + return Net::IP::ip_get_embedded_ipv4($ip_text); + } + return $ip_text; +} + 1;