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 821598B9C5 for ; Tue, 25 Oct 2022 16:33:02 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5995925098 for ; Tue, 25 Oct 2022 16:32:32 +0200 (CEST) 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, 25 Oct 2022 16:32:31 +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 C20F644B8A for ; Tue, 25 Oct 2022 16:32:30 +0200 (CEST) From: Stefan Hrdlicka To: pve-devel@lists.proxmox.com Date: Tue, 25 Oct 2022 16:31:51 +0200 Message-Id: <20221025143151.4057070-1-s.hrdlicka@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.038 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. [firewall.pm] Subject: [pve-devel] [PATCH pve-firewall] allow non zero ip address host bits X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Oct 2022 14:33:02 -0000 They can already be set directly via the cluster.fw file. Net::IP is just a bit more picky with what it allows: For example: error: 192.168.1.155/24 correct: 192.168.1.0/24 also improves #3554 Signed-off-by: Stefan Hrdlicka --- src/PVE/Firewall.pm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm index e6d6802..25e2fd0 100644 --- a/src/PVE/Firewall.pm +++ b/src/PVE/Firewall.pm @@ -69,6 +69,14 @@ sub pve_verify_ip_or_cidr { if ($cidr =~ m!^(?:$IPV6RE|$IPV4RE)(/(\d+))?$!) { return $cidr if Net::IP->new($cidr); return undef if $noerr; + + # Error 171 in Net::IP comes up if the host part of the IP address isn't + # zero. + # for example: + # error: 192.168.1.155/24 + # correct: 192.168.1.0/24 + return $cidr if Net::IP::Errno() == 171; + die Net::IP::Error() . "\n"; } return undef if $noerr; -- 2.30.2