[pmg-devel] [PATCH pmg-api] fix #4410: Remove non-null host-bits from CIDR when reading `mynetworks`

[Christoph Heiss]

On 12/22/22 16:25, Stoiko Ivanov wrote:
> Huge thanks for addressing this!
It was a nice opportunity to get into Perl and PMG too :^)

> 
> I like the approach in general - two comments inline:
> 
> On Thu, 22 Dec 2022 11:19:40 +0100
> Christoph Heiss <c.heiss at proxmox.com> wrote:
> 
[..]
>> @@ -1008,13 +1009,13 @@ sub read_pmg_mynetworks {
>>   	while (defined(my $line = <$fh>)) {
>>   	    chomp $line;
>>   	    next if $line =~ m/^\s*$/;
>> -	    if ($line =~ m!^((?:$IPV4RE|$IPV6RE))/(\d+)\s*(?:#(.*)\s*)?$!) {
>> -		my ($network, $prefix_size, $comment) = ($1, $2, $3);
>> -		my $cidr = "$network/${prefix_size}";
>> -		$mynetworks->{$cidr} = {
>> -		    cidr => $cidr,
>> -		    network_address => $network,
>> -		    prefix_size => $prefix_size,
>> +	    if ($line =~ m!^((?:$IPV4RE|$IPV6RE)/\d+)\s*(?:#(.*)\s*)?$!) {
>> +		my ($cidr, $comment) = ($1, $2);
>> +		my $ip = PVE::Network::IP_from_cidr($cidr);
> this call expands the prefix to full-length - which I wouldn't have
> noticed for ipv4 - but is quite visible with ipv6:
> entering `2001:db8::/32` results in
> `2001:0db8:0000:0000:0000:0000:0000:0000/32`
> IIUC - Net::IP::ip_compress_prefix($ip->prefix(), $ip->version()) might
> be an approach - but even that adds the last quad of zeros...
> 
> If at all possible it would be great to keep the data as the user entered it.
> (In this case - in all situations where it's actually a valid prefix w/o
> host-bits set)
Ack, I didn't really test it all that extensively with IPv6. I'll look 
into it again and send a v2.

> 
> 
> 
>> +		$mynetworks->{$ip->prefix()} = {
>> +		    cidr => $ip->prefix(),
>> +		    network_address => $ip->ip(),
>> +		    prefix_size => $ip->prefixlen(),
>>   		    comment => $comment // '',
>>   		};
>>   	    } else {
>> @@ -1336,11 +1337,11 @@ sub get_template_vars {
>>       }
>>
>>       my $netlist = PVE::INotify::read_file('mynetworks');
>> -    foreach my $cidr (keys %$netlist) {
>> -	if ($cidr =~ m/^($IPV6RE)\/(\d+)$/) {
>> +    foreach my $ip (values %$netlist) {
> why switch here to iterating over the values - and then accessing the cidr
> field twice, if it's by construction above the same as the key?
This was a left-over from when working on the code. I'll remove it.

> 
>> +	if ($ip->{cidr} =~ m/^($IPV6RE)\/(\d+)$/) {
>>   	    $mynetworks->{"[$1]/$2"} = 1;
>>   	} else {
>> -	    $mynetworks->{$cidr} = 1;
>> +	    $mynetworks->{$ip->{cidr}} = 1;
>>   	}
>>       }
>>
>> --
>> 2.30.2
>>
>>
>>
>> _______________________________________________
>> pmg-devel mailing list
>> pmg-devel at lists.proxmox.com
>> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel
>>
>>
>