[pmg-devel] [PATCH pmg-api v3] fix #4410: Remove non-null host bits from CIDR when writing postfix config

[Christoph Heiss]

On Wed, Dec 28, 2022 at 06:08:43PM +0100, Stoiko Ivanov wrote:
> Looks good and minimal - one tiny nit/improvement:
>
> On Wed, 28 Dec 2022 12:52:59 +0100
> Christoph Heiss <c.heiss at proxmox.com> wrote:
>
> > [..]
> > @@ -1337,10 +1339,12 @@ sub get_template_vars {
> >
> >      my $netlist = PVE::INotify::read_file('mynetworks');
> >      foreach my $cidr (keys %$netlist) {
> > -	if ($cidr =~ m/^($IPV6RE)\/(\d+)$/) {
> > -	    $mynetworks->{"[$1]/$2"} = 1;
> > +	my $ip = PVE::Network::IP_from_cidr($cidr);
> this can return undef and we should check for it
> while our config-parser takes care of many edge-cases and broken cidrs I
> managed to get passed it with a mask of 148 (max would be 128 for ipv6)
>
> I would expect that at least part of our users do edit the config files
> manually and end up with invalid data there.
>
> Probably a `warn` and ignoring the entry might be appropriate here (afaict
> this is what happens when the mynetworks parser runs into a broken line as
> well)
Good point, really did not think of that.
Will send a v4 shortly!

>
>
> > +	if ($ip->version() == 4) {
> > +	    $mynetworks->{$ip->prefix()} = 1;
> >  	} else {
> > -	    $mynetworks->{$cidr} = 1;
> > +	    my $address = '[' . $ip->short() . ']/' . $ip->prefixlen();
> > +	    $mynetworks->{$address} = 1;
> >  	}
> >      }
> >
> > --
> > 2.30.2
> >
> >
> >
> > _______________________________________________
> > pmg-devel mailing list
> > pmg-devel at lists.proxmox.com
> > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel
> >
> >
>