From patchwork Wed May 2 21:27:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Marx X-Patchwork-Id: 1743 Return-Path: Received: from mail01.ipfire.org (unknown [172.28.1.200]) by web02.i.ipfire.org (Postfix) with ESMTP id CA3EA60366 for ; Wed, 2 May 2018 13:27:30 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 877C510F8DE2; Wed, 2 May 2018 12:27:30 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1525260450; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references:list-id:list-unsubscribe:list-subscribe:list-post; bh=VeM8H+p7NIhMA4P21krcpb5VfbEkXhtrWMO5ILwxUsI=; b=SNx+hdbQUL/6qeTySs5UvAXPa/+rKXvVmUI0XtD1JQVtwh+VDDw1kV0jJsJtc01iyWLiOK y2tLuM+yGVJgp51i7Bxk/RbVcHr4tUTuo1TCNMa7p2FMX5hF0spG9dGTWxakoaSqKF2jkH E9Br3XiiTKx43fn4l3+7IschM3GzX8nNeSIRb009YjA3pdGG5XxTVJu1MyePeH4AS97sRc 6aK/bpmdfq/Ijt3Y7caBJhp9sTYGre9c7MPJ0tr815jEPoTtfB6rlfTO4v1pU2fnlleRQ5 uCPGve0mmm/pHtkQ9bX4diO6VqX0jcsN0nda1iIxNZBbOEeuwj2pi948m/c8Pg== Authentication-Results: auth=pass smtp.auth=amarx smtp.mailfrom=alexander.marx@ipfire.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1525260435; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references; bh=VeM8H+p7NIhMA4P21krcpb5VfbEkXhtrWMO5ILwxUsI=; b=Pb9wklr9hiBp+/MXEH0PTxd7xzTuAmx2f4oPXo3PuKiYXWPhN2ByqkIyEcF2rjtUsOZyR0 cR5B7C+Ib8uBbCcuw/45XEfPeDCiSncuwfB+dhPwx5HIW1o44g4OWoIyzIjjJ7vowZ6pil 5ZtrYTb1NCBvt8dZ7TBWvalpnyE+sYTpWkR4pV9fqyNVdWybRMYDoT2n1WsuyO4kr1gP17 fWMf5xVvIQiktJi27VXEc09CZUqNonmnEEiy9bV0gNMi1u9jOS170ooLX6qpFCkB0lqdWP mROYnDT+KHAjQ7pqwVDUzzRCeZRWQkHOZ07ZUWCysz8z0zNgQeMWwlC0JsU3xg== Received: from EDV1.kappeln2011.lan (business-90-187-3-157.pool2.vodafone-ip.de [90.187.3.157]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 41D9B10F8DDE; Wed, 2 May 2018 12:27:15 +0100 (BST) From: Alexander Marx To: development@lists.ipfire.org Subject: [PATCH 2/4] BUG11559: firewall.cgi Date: Wed, 2 May 2018 13:27:05 +0200 Message-Id: <1525260427-6695-2-git-send-email-alexander.marx@ipfire.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1525260427-6695-1-git-send-email-alexander.marx@ipfire.org> References: <1525260427-6695-1-git-send-email-alexander.marx@ipfire.org> X-Spamd-Result: default: False [-6.89 / 11.00]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; DKIM_SIGNED(0.00)[]; BAYES_HAM(-3.00)[100.00%]; REPLY(-2.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:31334, ipnet:90.187.0.0/16, country:DE]; NEURAL_HAM(-2.79)[-0.929,0]; RCVD_TLS_ALL(0.00)[] X-Spam-Status: No, score=-6.89 X-Rspamd-Server: mail01.i.ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" When creating firewallrules or using firewall groups, it should be possible to select a single IpSec subnet if there is more than one. This patch has the changes for firewall.cgi Signed-off-by: Alexander Marx Tested-by: Peter Müller --- html/cgi-bin/firewall.cgi | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index face0f4..499f279 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -1161,11 +1161,31 @@ END #IPsec netze foreach my $key (sort { ncmp($ipsecconf{$a}[1],$ipsecconf{$b}[1]) } keys %ipsecconf) { if ($ipsecconf{$key}[3] eq 'net' || ($optionsfw{'SHOWDROPDOWN'} eq 'on' && $ipsecconf{$key}[3] ne 'host')){ - print"$Lang::tr{'fwhost ipsec net'}$Lang::tr{'fwhost ipsec net'}