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 37E249238E for ; Tue, 27 Dec 2022 19:22:11 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id ED1E31DD54 for ; Tue, 27 Dec 2022 19:21:40 +0100 (CET) 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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 27 Dec 2022 19:21:37 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 5AC3A44156 for ; Tue, 27 Dec 2022 19:21:37 +0100 (CET) Date: Tue, 27 Dec 2022 19:21:35 +0100 From: Stoiko Ivanov To: Christoph Heiss Cc: pmg-devel@lists.proxmox.com Message-ID: <20221227192135.7f7bdf4f@rosa.proxmox.com> In-Reply-To: <20221227122915.218159-1-c.heiss@proxmox.com> References: <20221227122915.218159-1-c.heiss@proxmox.com> X-Mailer: Claws Mail 4.1.0 (GTK 3.24.24; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.159 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [config.pm, proxmox.com, mynetworks.pm] Subject: Re: [pmg-devel] [PATCH pmg-api v2] fix #4410: Remove non-null host-bits from CIDR when reading `mynetworks` X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Dec 2022 18:22:11 -0000 On Tue, 27 Dec 2022 13:29:15 +0100 Christoph Heiss wrote: > This will simply drop non-null host bits when reading the config file, > thus preserving backwards-compatibility. > When creating new entries, invalid CIDRs are now rejected to prevent > creation of such entries in the future. > > In the GUI, the entries are displayed as the user entered them (as > suggested my Stoiko). This is done by considering /etc/pmg/mynetworks > as the "source of truth" - all entries are saved there verbatim, but > when writing the postfix config the right ones are picked. This sounds good! Currently the code breaks the GET,PUT,DELETE api calls for mynetworks (mismatch between the key (which is the 'computed/long string' and the provided parameter (which is the the data from the file) (tested with an ipv6 prefix - creating works, getting/setting/deleting does not work) maybe keep the user-entered value as key - and add the host-bit-clean cidr (address/mask string) as additional field - then get this field when serializing the data in get_template_vars > > Signed-off-by: Christoph Heiss > --- > src/PMG/API2/MyNetworks.pm | 10 ++++++++-- > src/PMG/Config.pm | 15 ++++++++------- > 2 files changed, 16 insertions(+), 9 deletions(-) > > diff --git a/src/PMG/API2/MyNetworks.pm b/src/PMG/API2/MyNetworks.pm > index 975ca2e..325e59b 100644 > --- a/src/PMG/API2/MyNetworks.pm > +++ b/src/PMG/API2/MyNetworks.pm > @@ -3,6 +3,7 @@ package PMG::API2::MyNetworks; > use strict; > use warnings; > use Data::Dumper; > +use Net::IP; > > use PVE::SafeSyslog; > use PVE::Tools qw(extract_param); > @@ -10,6 +11,7 @@ use HTTP::Status qw(:constants); > use PVE::JSONSchema qw(get_standard_option); > use PVE::RESTHandler; > use PVE::INotify; > +use PVE::Network; > > use PMG::Config; > > @@ -77,13 +79,17 @@ __PACKAGE__->register_method ({ > my ($param) = @_; > > my $code = sub { > + die "invalid network adress '$param->{cidr}', host-bits must be null\n" > + if !Net::IP::ip_normalize($param->{cidr}); > > my $mynetworks = PVE::INotify::read_file('mynetworks'); > + my $ip = PVE::Network::IP_from_cidr($param->{cidr}); > > die "trusted network '$param->{cidr}' already exists\n" > - if $mynetworks->{$param->{cidr}}; > + if $mynetworks->{$ip->prefix()}; > > - $mynetworks->{$param->{cidr}} = { > + $mynetworks->{$ip->prefix()} = { > + cidr => $param->{cidr}, > comment => $param->{comment} // '', > }; > > diff --git a/src/PMG/Config.pm b/src/PMG/Config.pm > index 9ba5c76..a29060b 100755 > --- a/src/PMG/Config.pm > +++ b/src/PMG/Config.pm > @@ -730,6 +730,7 @@ use PVE::SafeSyslog; > use PVE::Tools qw($IPV4RE $IPV6RE); > use PVE::INotify; > use PVE::JSONSchema; > +use PVE::Network; > > use PMG::Cluster; > use PMG::Utils; > @@ -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} = { > + if ($line =~ m!^((?:$IPV4RE|$IPV6RE)/\d+)\s*(?:#(.*)\s*)?$!) { > + my ($cidr, $comment) = ($1, $2); > + my $ip = PVE::Network::IP_from_cidr($cidr); > + $mynetworks->{$ip->prefix()} = { > cidr => $cidr, > - network_address => $network, > - prefix_size => $prefix_size, > + network_address => $ip->short(), the short() method yields IPv4 addresses in a somewhat uncommon format (at least for me -> 10.2.2.0/24 -> '10.2.2') - however at a quick glance it seems that the 'network_address' field is not really used anywhere - so we should probably just drop it. > + prefix_size => $ip->prefixlen(), > comment => $comment // '', > }; > } else { > @@ -1032,7 +1033,7 @@ sub write_pmg_mynetworks { > foreach my $cidr (sort keys %$mynetworks) { > my $data = $mynetworks->{$cidr}; > my $comment = $data->{comment} // '*'; > - PVE::Tools::safe_print($filename, $fh, "$cidr #$comment\n"); > + PVE::Tools::safe_print($filename, $fh, "$data->{cidr} #$comment\n"); > } > } > > -- > 2.30.2 > > > > _______________________________________________ > pmg-devel mailing list > pmg-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel > >