X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Ffirewall.cgi;h=86cba60ccbe0e3d58e82b50d66edb9ddf653226d;hp=c17bfaf8ea9809b64fefa70bdecc6c72ffabd9c9;hb=d334d7cb47ad4b55a24d54ff7f7081e9bb60ed1c;hpb=9063a04e94587fc38f410ec2234275417de201ad

diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
old mode 100755
new mode 100644
index c17bfaf8e..86cba60cc
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -136,14 +136,17 @@ print<<END;
 		\$("#protocol").change(update_protocol);
 		update_protocol();
 
-		// When nat not used, hide it
-		if (! \$("#USE_NAT").attr("checked")) {
+		// Show/Hide elements when NAT checkbox is checked.
+		if (\$("#USE_NAT").attr("checked")) {
+			\$("#actions").hide();
+		} else {
 			\$(".NAT").hide();
 		}
 
 		// Show NAT area when "use nat" checkbox is clicked
 		\$("#USE_NAT").change(function() {
 			\$(".NAT").toggle();
+			\$("#actions").toggle();
 		});
 
 		// Time constraints
@@ -606,6 +609,19 @@ sub checktarget
 		$errormessage.=$Lang::tr{'fwdfw err notgtip'};
 		return $errormessage;
 	}
+	#check for mac in targetgroup
+	if ($fwdfwsettings{'grp2'} eq 'cust_grp_tgt'){
+		&General::readhasharray("$configgrp", \%customgrp);
+		&General::readhasharray("$confighost", \%customhost);
+		foreach my $grpkey (sort keys %customgrp){
+			foreach my $hostkey (sort keys %customhost){
+				if ($customgrp{$grpkey}[2] eq $customhost{$hostkey}[0] && $customhost{$hostkey}[1] eq 'mac'){
+					$hint=$Lang::tr{'fwdfw hint mac'};
+					return $hint;
+				}
+			}
+		}
+	}
 	#check empty fields
 	if ($fwdfwsettings{$fwdfwsettings{'grp2'}} eq ''){ $errormessage.=$Lang::tr{'fwdfw err notgt'}."<br>";}
 	#check tgt services
@@ -726,17 +742,32 @@ sub checkrule
 {
 	#check valid port for NAT
 	if($fwdfwsettings{'USE_NAT'} eq 'ON'){
+		#RULE_ACTION must be ACCEPT if we use NAT
+		$fwdfwsettings{'RULE_ACTION'} = 'ACCEPT';
+
+		#if no dnat or snat selected errormessage
+		if ($fwdfwsettings{'nat'} eq ''){
+			$errormessage=$Lang::tr{'fwdfw dnat nochoice'};
+			return;
+		}
+
+		#if using snat, the external port has to be empty
+		if ($fwdfwsettings{'nat'} eq 'snat' && $fwdfwsettings{'dnatport'} ne ''){
+			$errormessage=$Lang::tr{'fwdfw dnat extport'};
+			return;
+		}
 		#if no dest port is given in nat area, take target host port
 		if($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'grp3'} eq 'TGT_PORT' && $fwdfwsettings{'dnatport'} eq ''){$fwdfwsettings{'dnatport'}=$fwdfwsettings{'TGT_PORT'};}
 		if($fwdfwsettings{'TGT_PORT'} eq '' && $fwdfwsettings{'dnatport'} ne '' && ($fwdfwsettings{'PROT'} eq 'TCP' || $fwdfwsettings{'PROT'} eq 'UDP')){
 			$errormessage=$Lang::tr{'fwdfw dnat porterr2'};
+			return;
 		}
 		#check if port given in nat area is a single valid port or portrange
 		if($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'TGT_PORT'} ne '' && !&check_natport($fwdfwsettings{'dnatport'})){
 			$errormessage=$Lang::tr{'fwdfw target'}.": ".$Lang::tr{'fwdfw dnat porterr'}."<br>";
 		}elsif($fwdfwsettings{'USESRV'} eq 'ON' && $fwdfwsettings{'grp3'} eq 'cust_srv'){
 			my $custsrvport;
-			#get servcie Protocol and Port
+			#get service Protocol and Port
 			foreach my $key (sort keys %customservice){
 				if($fwdfwsettings{$fwdfwsettings{'grp3'}} eq $customservice{$key}[0]){
 					if ($customservice{$key}[2] ne 'TCP' && $customservice{$key}[2] ne 'UDP'){
@@ -970,7 +1001,6 @@ sub error
 		print "<class name='base'>$errormessage\n";
 		print "&nbsp;</class>\n";
 		&Header::closebox();
-		print"<hr>";
 	}
 }
 sub fillselect
@@ -1014,7 +1044,7 @@ sub gen_dd_block
 print<<END;
 		<table width='100%' border='0'>
 		<tr><td width='50%' valign='top'>
-		<table width='100%' border='0'>
+		<table width='95%' border='0'>
 		<tr><td width='1%'><input type='radio' name='$grp' id='std_net_$srctgt' value='std_net_$srctgt' $checked{$grp}{'std_net_'.$srctgt}></td><td>$Lang::tr{'fwhost stdnet'}</td><td align='right'><select name='std_net_$srctgt' style='width:200px;'>
 END
 	foreach my $network (sort keys %defaultNetworks)
@@ -1050,7 +1080,7 @@ END
 	if (! -z $configgrp || $optionsfw{'SHOWDROPDOWN'} eq 'on'){
 		print"<tr><td valign='top'><input type='radio' name='$grp' id='cust_grp_$srctgt' value='cust_grp_$srctgt' $checked{$grp}{'cust_grp_'.$srctgt}></td><td >$Lang::tr{'fwhost cust grp'}</td><td align='right'><select name='cust_grp_$srctgt' style='width:200px;'>";
 		foreach my $key (sort { ncmp($customgrp{$a}[0],$customgrp{$b}[0]) } keys %customgrp) {
-			if($helper ne $customgrp{$key}[0]){
+			if($helper ne $customgrp{$key}[0] && $customgrp{$key}[2] ne 'none'){
 				print"<option ";
 				print "selected='selected' " if ($fwdfwsettings{$fwdfwsettings{$grp}} eq $customgrp{$key}[0]);
 				print ">$customgrp{$key}[0]</option>";
@@ -1060,7 +1090,7 @@ END
 		print"</select></td>";
 	}
 	#End left table. start right table (vpn)
-	print"</tr></table></td><td valign='top'><table width='100%' border='0'><tr>";
+	print"</tr></table></td><td valign='top'><table width='95%' border='0' align='right'><tr>";
 	# CCD networks
 	if( ! -z $configccdnet || $optionsfw{'SHOWDROPDOWN'} eq 'on'){
 		print"<td width='1%'><input type='radio' name='$grp' id='ovpn_net_$srctgt' value='ovpn_net_$srctgt'  $checked{$grp}{'ovpn_net_'.$srctgt}></td><td nowrap='nowrap' width='16%'>$Lang::tr{'fwhost ccdnet'}</td><td nowrap='nowrap' width='1%' align='right'><select name='ovpn_net_$srctgt' style='width:200px;'>";
@@ -1386,24 +1416,7 @@ sub hint
 		print "<class name='base'>$hint\n";
 		print "&nbsp;</class>\n";
 		&Header::closebox();
-		print"<hr>";
-	}
-}
-sub inc_counter
-{
-	my $config=shift;
-	my %hash=%{(shift)};
-	my $val=shift;
-	my $pos;
-
-	&General::readhasharray($config, \%hash);
-	foreach my $key (sort { uc($hash{$a}[0]) cmp uc($hash{$b}[0]) }  keys %hash){
-		if($hash{$key}[0] eq $val){
-			$pos=$#{$hash{$key}};
-			$hash{$key}[$pos] = $hash{$key}[$pos]+1;
-		}
 	}
-	&General::writehasharray($config, \%hash);
 }
 sub newrule
 {
@@ -1450,7 +1463,6 @@ sub newrule
 	$checked{'TIME_SAT'}{$fwdfwsettings{'TIME_SAT'}} 		= 'CHECKED';
 	$checked{'TIME_SUN'}{$fwdfwsettings{'TIME_SUN'}} 		= 'CHECKED';
 	$checked{'USE_NAT'}{$fwdfwsettings{'USE_NAT'}} 			= 'CHECKED';
-	$checked{'nat'}{$fwdfwsettings{'nat'}} 		= 'CHECKED';
 	$selected{'TIME_FROM'}{$fwdfwsettings{'TIME_FROM'}}		= 'selected';
 	$selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}}			= 'selected';
 	$selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected';
@@ -1510,13 +1522,11 @@ sub newrule
 				$checked{'TIME_SAT'}{$fwdfwsettings{'TIME_SAT'}} 		= 'CHECKED';
 				$checked{'TIME_SUN'}{$fwdfwsettings{'TIME_SUN'}} 		= 'CHECKED';
 				$checked{'USE_NAT'}{$fwdfwsettings{'USE_NAT'}}	 		= 'CHECKED';
-				$checked{'nat'}{$fwdfwsettings{'nat'}}	 				= 'CHECKED';
+				$checked{'nat'}{$fwdfwsettings{'nat'}}					= 'CHECKED';
 				$selected{'TIME_FROM'}{$fwdfwsettings{'TIME_FROM'}}		= 'selected';
 				$selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}}			= 'selected';
 				$selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected';
 				$selected{'ipfire_src'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} ='selected';
-				$selected{'dnat'}{$fwdfwsettings{$fwdfwsettings{'nat'}}} ='selected';
-				$selected{'snat'}{$fwdfwsettings{$fwdfwsettings{'nat'}}} ='selected';
 			}
 		}
 		$fwdfwsettings{'oldgrp1a'}=$fwdfwsettings{'grp1'};
@@ -1538,7 +1548,9 @@ sub newrule
 		}
 	}else{
 		$fwdfwsettings{'ACTIVE'}='ON';
+		$fwdfwsettings{'nat'} = 'dnat';
 		$checked{'ACTIVE'}{$fwdfwsettings{'ACTIVE'}} = 'CHECKED';
+		$checked{'nat'}{$fwdfwsettings{'nat'}} = 'CHECKED';
 		$fwdfwsettings{'oldgrp1a'}=$fwdfwsettings{'grp1'};
 		$fwdfwsettings{'oldgrp1b'}=$fwdfwsettings{$fwdfwsettings{'grp1'}};
 		$fwdfwsettings{'oldgrp2a'}=$fwdfwsettings{'grp2'};
@@ -1561,8 +1573,6 @@ sub newrule
 	if ($scidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp1'}}=$sip;}
 	my ($dip,$dcidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp2'}});
 	if ($scidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp2'}}=$dip;}
-	&Header::openbox('100%', 'left', $Lang::tr{'fwdfw addrule'});
-	&Header::closebox();
 	&Header::openbox('100%', 'left', $Lang::tr{'fwdfw source'});
 	#------SOURCE-------------------------------------------------------
 	print "<form method='post'>";
@@ -1584,10 +1594,10 @@ END
 		}
 		print<<END;
 		</select></td></tr>
-		<tr><td colspan='8'><hr style='border:dotted #BFBFBF; border-width:1px 0 0 0 ; ' /></td></tr></table>
+		<tr><td><br></td></tr>
+		</table>
 END
 		&gen_dd_block('src','grp1');
-		print"<hr>";
 		&Header::closebox();
 
 		#---SNAT / DNAT ------------------------------------------------
@@ -1690,10 +1700,9 @@ END
 		}
 		print<<END;
 		</select></td></tr>
-		<tr><td colspan='7'><hr style='border:dotted #BFBFBF; border-width:1px 0 0 0 ; ' /></td></tr></table>
+		<tr><td><br></td></tr></table>
 END
 		&gen_dd_block('tgt','grp2');
-		print"<hr>";
 		&Header::closebox;
 		#---PROTOCOL------------------------------------------------------
 		$fwdfwsettings{'SRC_PORT'} =~ s/\|/,/g;
@@ -1827,7 +1836,7 @@ END
 		&General::readhasharray("$configsrvgrp", \%customservicegrp);
 		my $helper;
 		foreach my $key (sort { ncmp($customservicegrp{$a}[0],$customservicegrp{$b}[0]) } keys %customservicegrp){
-			if ($helper ne $customservicegrp{$key}[0]){
+			if ($helper ne $customservicegrp{$key}[0] && $customservicegrp{$key}[2] ne 'none'){
 				print"<option ";
 				print"selected='selected'" if ($fwdfwsettings{$fwdfwsettings{'grp3'}} eq $customservicegrp{$key}[0]);
 				print">$customservicegrp{$key}[0]</option>";
@@ -1848,9 +1857,8 @@ END
 		&Header::closebox;
 		$checked{"RULE_ACTION"}{$fwdfwsettings{'RULE_ACTION'}}	= 'CHECKED';
 		print <<END;
-			<hr><br>
 			<center>
-				<table width="80%" border="0">
+				<table width="80%" class='tbl' id='actions'>
 					<tr>
 						<td width="33%" align="center" bgcolor="$color{'color17'}">
 							&nbsp;<br>&nbsp;
@@ -1887,7 +1895,6 @@ END
 
 			<br>
 END
-
 		#---Activate/logging/remark-------------------------------------
 		&Header::openbox('100%', 'left', $Lang::tr{'fwdfw additional'});
 		print<<END;
@@ -1995,7 +2002,7 @@ END
 				</td>
 			</tr>
 		</table>
-		<br><hr>
+		<br>
 END
 
 		#---ACTION------------------------------------------------------
@@ -2026,7 +2033,6 @@ END
 			<input type='hidden' name='oldorange' value='$fwdfwsettings{'oldorange'}' />
 			<input type='hidden' name='oldnat' value='$fwdfwsettings{'oldnat'}' />
 			<input type='hidden' name='oldruletype' value='$fwdfwsettings{'oldruletype'}' />
-			<input type='hidden' name='nat' value='$fwdfwsettings{'nat'}' />
 			<input type='hidden' name='ACTION' value='saverule' ></form><form method='post' style='display:inline'><input type='submit' value='$Lang::tr{'fwhost back'}' style='min-width:100px;'><input type='hidden' name='ACTION' value'reset'></td></td>
 			</table></form>
 END
@@ -2301,6 +2307,8 @@ sub viewtablenew
 	&General::readhasharray("$config", $hash);
 	&General::readhasharray("$configccdnet", \%ccdnet);
 	&General::readhasharray("$configccdhost", \%ccdhost);
+	&General::readhasharray("$configgrp", \%customgrp);
+	&General::readhasharray("$configsrvgrp", \%customservicegrp);
 
 	&Header::openbox('100%', 'left', $title);
 	print "<table width='100%' cellspacing='0' class='tbl'>";
@@ -2404,6 +2412,21 @@ END
 					}
 				}
 			}
+			#check if networkgroups or servicegroups are empty
+			foreach my $netgroup (sort keys %customgrp){
+				if(($$hash{$key}[4] eq $customgrp{$netgroup}[0] || $$hash{$key}[6] eq $customgrp{$netgroup}[0]) && $customgrp{$netgroup}[2] eq 'none'){
+					$coloryellow='on';
+					&disable_rule($key);
+					$$hash{$key}[2]='';
+				}
+			}
+			foreach my $srvgroup (sort keys %customservicegrp){
+				if($$hash{$key}[15] eq $customservicegrp{$srvgroup}[0] && $customservicegrp{$srvgroup}[2] eq 'none'){
+					$coloryellow='on';
+					&disable_rule($key);
+					$$hash{$key}[2]='';
+				}
+			}
 			$$hash{'ACTIVE'}=$$hash{$key}[2];
 			$count++;
 			if($coloryellow eq 'on'){