From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject:
 [PATCH 2/3] firewall.cgi: Fix multiple usage of configured net or interface.
Date: Sun, 11 Jul 2021 19:54:17 +0200
Message-ID: <20210711175419.3582-2-stefan.schantl@ipfire.org>
In-Reply-To: <20210711175419.3582-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1972351716524624846=="
List-Id: <development.lists.ipfire.org>

--===============1972351716524624846==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

When configuring a standard network as source or target the same
interface would be pre-selected as firewall interface when editing an
existing rule.

In case an existing input rule with an configured firewall interface
should be changed, the same network device has been pre-selected in the
standard networks dropdown box.

This easily confuses users and may lead to false configurations when
saving an edited rule.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 html/cgi-bin/firewall.cgi | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index d3cddfa23..8d6adee96 100644
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -1032,7 +1032,12 @@ END
 		{
 			next if($defaultNetworks{$network}{'NAME'} eq "IPFire");
 			print "<option value=3D'$defaultNetworks{$network}{'NAME'}'";
-			print " selected=3D'selected'" if ($fwdfwsettings{$fwdfwsettings{$grp}} e=
q $defaultNetworks{$network}{'NAME'});
+
+			# Check if the the key handles a standard network.
+			if ( grep(/std_net_/, $fwdfwsettings{$grp}) ) {
+				print " selected=3D'selected'" if ($fwdfwsettings{$fwdfwsettings{$grp}} =
eq $defaultNetworks{$network}{'NAME'});
+			}
+
 			my $defnet=3D"$defaultNetworks{$network}{'NAME'}_NETADDRESS";
 			my $defsub=3D"$defaultNetworks{$network}{'NAME'}_NETMASK";
 			my $defsub1=3D&General::subtocidr($ifaces{$defsub});
@@ -1510,8 +1515,8 @@ sub newrule
 	$checked{'USE_NAT'}{$fwdfwsettings{'USE_NAT'}} 			=3D 'CHECKED';
 	$selected{'TIME_FROM'}{$fwdfwsettings{'TIME_FROM'}}		=3D 'selected';
 	$selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}}			=3D 'selected';
-	$selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} =3D'selected';
-	$selected{'ipfire_src'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} =3D'selecte=
d';
+	$selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} =3D 'selected' =
if ($fwdfwsettings{'grp2'} eq "ipfire");
+	$selected{'ipfire_src'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} =3D 'select=
ed' if ($fwdfwsettings{'grp1'} eq "ipfire_src");
 	#check if update and get values
 	if($fwdfwsettings{'updatefwrule'} eq 'on' || $fwdfwsettings{'copyfwrule'} e=
q 'on' && !$errormessage){
 		&General::readhasharray("$config", \%hash);
@@ -1582,8 +1587,8 @@ sub newrule
 				$checked{'RATE_LIMIT'}{$fwdfwsettings{'RATE_LIMIT'}}	=3D 'CHECKED';
 				$selected{'TIME_FROM'}{$fwdfwsettings{'TIME_FROM'}}		=3D 'selected';
 				$selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}}			=3D 'selected';
-				$selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} =3D'selected=
';
-				$selected{'ipfire_src'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} =3D'sele=
cted';
+				$selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} =3D 'selecte=
d' if ($fwdfwsettings{'grp2'} eq "ipfire");
+				$selected{'ipfire_src'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} =3D 'sel=
ected' if ($fwdfwsettings{'grp1'} eq "ipfire_src");
 				$selected{'dnat'}{$fwdfwsettings{'dnat'}}				=3D'selected';
 				$selected{'snat'}{$fwdfwsettings{'snat'}}				=3D'selected';
 				$selected{'RATETIME'}{$fwdfwsettings{'RATETIME'}}		=3D'selected';
--=20
2.30.2


--===============1972351716524624846==--