[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 73cb6627fc3d44ecade787f3fd80cc91d53a42f8

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 5840 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, fifteen has been updated
       via  73cb6627fc3d44ecade787f3fd80cc91d53a42f8 (commit)
       via  d0f8bbc13e5d1158b86a58c1744a81e36c899aa8 (commit)
       via  f4d5310decf8cd8f16d92bfe0457cc8fb87fc663 (commit)
       via  f0dc00d80f0b97059df52b624e1a982a6dad5bcd (commit)
       via  9566c8f52cd96ae3dee000f72028eb80a31bca16 (commit)
      from  f4b373993fb60809901e7c45d690f569b0d8867c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 73cb6627fc3d44ecade787f3fd80cc91d53a42f8
Author: Alexander Marx <amarx(a)ipfire.org>
Date:   Mon Jan 6 05:58:40 2014 +0100

    SQUID: fixed length of FAKE_REFERRER field

commit d0f8bbc13e5d1158b86a58c1744a81e36c899aa8
Author: Alexander Marx <amarx(a)ipfire.org>
Date:   Mon Jan 6 05:19:44 2014 +0100

    Firewall: reaktivated targetport-check. now there's an errromessage in case of wrong portnumber

commit f4d5310decf8cd8f16d92bfe0457cc8fb87fc663
Author: Alexander Marx <amarx(a)ipfire.org>
Date:   Mon Jan 6 05:03:40 2014 +0100

    Firewall: deleted subnet from source and target addresses if manually used

commit f0dc00d80f0b97059df52b624e1a982a6dad5bcd
Author: Alexander Marx <amarx(a)ipfire.org>
Date:   Sun Jan 5 21:45:54 2014 +0100

    Firewall: fix last commit.

commit 9566c8f52cd96ae3dee000f72028eb80a31bca16
Author: Alexander Marx <amarx(a)ipfire.org>
Date:   Sun Jan 5 16:00:47 2014 +0100

    Firewall: Bugfix - when creating a rule which leads to an error, the rule action (Accept/Drop/Reject) is set to default

-----------------------------------------------------------------------

Summary of changes:
 html/cgi-bin/firewall.cgi | 29 ++++++++++++++---------------
 html/cgi-bin/proxy.cgi    |  4 ++--
 2 files changed, 16 insertions(+), 17 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index 29b70b4..b313d4b 100755
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -659,6 +659,8 @@ sub checktarget
 							if (&General::validport($_)){
 								push (@values,$_);
 							}else{
+								$errormessage=$Lang::tr{'fwdfw err tgt_port'};
+								return $errormessage;
 							}
 						}
 					}
@@ -1426,6 +1428,11 @@ sub newrule
 	open (CONN1,"/var/ipfire/red/local-ipaddress");
 	my $redip = <CONN1>;
 	close(CONN1);
+	if (! $fwdfwsettings{'RULE_ACTION'} && $fwdfwsettings{'POLICY'} eq 'MODE2'){
+		$fwdfwsettings{'RULE_ACTION'}='DROP';
+	}elsif(! $fwdfwsettings{'RULE_ACTION'} && $fwdfwsettings{'POLICY'} eq 'MODE1'){
+		$fwdfwsettings{'RULE_ACTION'}='ACCEPT';
+	}
 	$checked{'grp1'}{$fwdfwsettings{'grp1'}} 				= 'CHECKED';
 	$checked{'grp2'}{$fwdfwsettings{'grp2'}} 				= 'CHECKED';
 	$checked{'grp3'}{$fwdfwsettings{'grp3'}} 				= 'CHECKED';
@@ -1548,6 +1555,11 @@ sub newrule
 			}
 		}	
 	}
+	# Split manual source and target address and delete the subnet
+	my ($sip,$scidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp1'}});
+	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'});
@@ -1833,23 +1845,9 @@ END
 END
 
 		&Header::closebox;
-
-		$checked{"RULE_ACTION"} = ();
-		foreach ("ACCEPT", "DROP", "REJECT") {
-			$checked{"RULE_ACTION"}{$_} = "";
-		}
-
-		if($fwdfwsettings{'updatefwrule'} eq 'on') {
-			$checked{"RULE_ACTION"}{$fwdfwsettings{'RULE_ACTION'}} = "checked";
-		} elsif ($fwdfwsettings{'POLICY'} eq 'MODE1') {
-			$checked{"RULE_ACTION"}{"ACCEPT"} = "checked";
-		} elsif ($fwdfwsettings{'POLICY'} eq 'MODE2') {
-			$checked{"RULE_ACTION"}{"DROP"} = "checked";
-		}
-
+		$checked{"RULE_ACTION"}{$fwdfwsettings{'RULE_ACTION'}}	= 'CHECKED';
 		print <<END;
 			<hr><br>
-
 			<center>
 				<table width="80%" border="0">
 					<tr>
@@ -2027,6 +2025,7 @@ 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
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index acb4f97..6f78deb 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -1678,8 +1678,8 @@ print <<END
 	<td class='base'>$Lang::tr{'advproxy fake referer'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
 </tr>
 <tr>
-	<td><input type='text' name='FAKE_USERAGENT' value='$proxysettings{'FAKE_USERAGENT'}' size='56' /></td>
-	<td><input type='text' name='FAKE_REFERER' value='$proxysettings{'FAKE_REFERER'}' size='56' /></td>
+	<td><input type='text' name='FAKE_USERAGENT' value='$proxysettings{'FAKE_USERAGENT'}' size='40%' /></td>
+	<td><input type='text' name='FAKE_REFERER' value='$proxysettings{'FAKE_REFERER'}' size='40%' /></td>
 </tr>
 </table>
 <hr size='1'>


hooks/post-receive
--
IPFire 2.x development tree