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 05F4060B9A for ; Fri, 14 Aug 2020 07:00:41 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DECD21F126 for ; Fri, 14 Aug 2020 07:00:10 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 firstgate.proxmox.com (Proxmox) with ESMTPS id E21B61F116 for ; Fri, 14 Aug 2020 07:00:07 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 966E9445FE for ; Fri, 14 Aug 2020 07:00:07 +0200 (CEST) Date: Fri, 14 Aug 2020 06:59:46 +0200 (CEST) From: Dietmar Maurer To: Proxmox Backup Server development discussion , Fabian Ebner Message-ID: <1755079976.146.1597381187347@webmail.proxmox.com> In-Reply-To: <20200813130412.18399-1-f.ebner@proxmox.com> References: <20200813130412.18399-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Priority: 3 Importance: Normal X-Mailer: Open-Xchange Mailer v7.10.3-Rev20 X-Originating-Client: open-xchange-appsuite X-SPAM-LEVEL: Spam detection results: 0 AWL 0.143 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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. [network.rs, parser.rs, proxmox.com] Subject: Re: [pbs-devel] [PATCH v2 proxmox-backup] Fix #2926: parse_iface_attributes: always break on non-{attribitue, comment} token X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Aug 2020 05:00:41 -0000 applied, with following changes: --- a/src/config/network.rs +++ b/src/config/network.rs @@ -602,7 +602,7 @@ mod test { } #[test] - fn test_network_config_create_no_blank_1() -> Result<(), Error> { + fn test_network_config_parser_no_blank_1() -> Result<(), Error> { let input = "auto lo\n\ iface lo inet loopback\n\ iface lo inet6 loopback\n\ @@ -646,7 +646,7 @@ mod test { } #[test] - fn test_network_config_create_no_blank_2() -> Result<(), Error> { + fn test_network_config_parser_no_blank_2() -> Result<(), Error> { // Adapted from bug 2926 let input = "### Hetzner Online GmbH installimage\n\ > On 08/13/2020 3:04 PM Fabian Ebner wrote: > > > There is no requirement to have at least > a blank line, attribute or comment in between two > interface definitions, e.g. > iface lo inet loopback > iface lo inet6 loopback > > Signed-off-by: Fabian Ebner > --- > src/config/network.rs | 97 ++++++++++++++++++++++++++++++++++++ > src/config/network/parser.rs | 4 +- > 2 files changed, 98 insertions(+), 3 deletions(-) > > diff --git a/src/config/network.rs b/src/config/network.rs > index c217141f..02d0713c 100644 > --- a/src/config/network.rs > +++ b/src/config/network.rs > @@ -600,4 +600,101 @@ mod test { > > Ok(()) > } > + > + #[test] > + fn test_network_config_create_no_blank_1() -> Result<(), Error> { > + let input = "auto lo\n\ > + iface lo inet loopback\n\ > + iface lo inet6 loopback\n\ > + auto ens18\n\ > + iface ens18 inet static\n\ > + \taddress 192.168.20.144/20\n\ > + \tgateway 192.168.16.1\n\ > + # comment\n\ > + iface ens20 inet static\n\ > + \taddress 192.168.20.145/20\n\ > + iface ens21 inet manual\n\ > + iface ens22 inet manual\n"; > + > + let mut parser = NetworkParser::new(&input.as_bytes()[..]); > + > + let config = parser.parse_interfaces(None)?; > + > + let output = String::try_from(config)?; > + > + let expected = "auto lo\n\ > + iface lo inet loopback\n\ > + \n\ > + iface lo inet6 loopback\n\ > + \n\ > + auto ens18\n\ > + iface ens18 inet static\n\ > + \taddress 192.168.20.144/20\n\ > + \tgateway 192.168.16.1\n\ > + #comment\n\ > + \n\ > + iface ens20 inet static\n\ > + \taddress 192.168.20.145/20\n\ > + \n\ > + iface ens21 inet manual\n\ > + \n\ > + iface ens22 inet manual\n\ > + \n"; > + assert_eq!(output, expected); > + > + Ok(()) > + } > + > + #[test] > + fn test_network_config_create_no_blank_2() -> Result<(), Error> { > + // Adapted from bug 2926 > + let input = "### Hetzner Online GmbH installimage\n\ > + \n\ > + source /etc/network/interfaces.d/*\n\ > + \n\ > + auto lo\n\ > + iface lo inet loopback\n\ > + iface lo inet6 loopback\n\ > + \n\ > + auto enp4s0\n\ > + iface enp4s0 inet static\n\ > + \taddress 10.10.10.10/24\n\ > + \tgateway 10.10.10.1\n\ > + \t# route 10.10.20.10/24 via 10.10.20.1\n\ > + \tup route add -net 10.10.20.10 netmask 255.255.255.0 gw 10.10.20.1 dev enp4s0\n\ > + \n\ > + iface enp4s0 inet6 static\n\ > + \taddress fe80::5496:35ff:fe99:5a6a/64\n\ > + \tgateway fe80::1\n"; > + > + let mut parser = NetworkParser::new(&input.as_bytes()[..]); > + > + let config = parser.parse_interfaces(None)?; > + > + let output = String::try_from(config)?; > + > + let expected = "### Hetzner Online GmbH installimage\n\ > + \n\ > + source /etc/network/interfaces.d/*\n\ > + \n\ > + auto lo\n\ > + iface lo inet loopback\n\ > + \n\ > + iface lo inet6 loopback\n\ > + \n\ > + auto enp4s0\n\ > + iface enp4s0 inet static\n\ > + \taddress 10.10.10.10/24\n\ > + \tgateway 10.10.10.1\n\ > + \t# route 10.10.20.10/24 via 10.10.20.1\n\ > + \tup route add -net 10.10.20.10 netmask 255.255.255.0 gw 10.10.20.1 dev enp4s0\n\ > + \n\ > + iface enp4s0 inet6 static\n\ > + \taddress fe80::5496:35ff:fe99:5a6a/64\n\ > + \tgateway fe80::1\n\ > + \n"; > + assert_eq!(output, expected); > + > + Ok(()) > + } > } > diff --git a/src/config/network/parser.rs b/src/config/network/parser.rs > index 071bbcc7..a97d0f79 100644 > --- a/src/config/network/parser.rs > +++ b/src/config/network/parser.rs > @@ -210,9 +210,7 @@ impl NetworkParser { > self.eat(Token::Newline)?; > continue; > } > - Token::Newline => break, > - Token::EOF => break, > - unexpected => bail!("unexpected token {:?} (expected iface attribute)", unexpected), > + _ => break, > } > > match self.peek()? { > -- > 2.20.1 > > > > _______________________________________________ > pbs-devel mailing list > pbs-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel