[git.ipfire.org] IPFire 2.x development tree branch, next, updated. dd58c50c3e55749903369c2b3258de7cc307c8ce

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. dd58c50c3e55749903369c2b3258de7cc307c8ce

[git]

[-- Attachment #1: Type: text/plain, Size: 2546 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, next has been updated
       via  dd58c50c3e55749903369c2b3258de7cc307c8ce (commit)
       via  7c1b7d3e226310403ddd40b4cd19d78f7db4d457 (commit)
      from  27ecea56ce242adc0f3b471ed2868dc3ea246874 (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 dd58c50c3e55749903369c2b3258de7cc307c8ce
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon May 12 13:21:24 2014 +0200

    proxy.pac: Don't use proxy for direct domain access.

commit 7c1b7d3e226310403ddd40b4cd19d78f7db4d457
Author: Bernhard Bitsch <bbitsch(a)ipfire.org>
Date:   Mon May 12 13:16:43 2014 +0200

    proxy.pac: Only grant direct access for actual subnets.
    
    Fixes #10324.

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

Summary of changes:
 html/cgi-bin/proxy.cgi | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index c4cff47..2a9d493 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -2972,11 +2972,23 @@ sub writepacfile
 		print FILE <<END
 if (
      (isPlainHostName(host)) ||
-     (dnsDomainIs(host, ".$mainsettings{'DOMAINNAME'}")) ||
      (isInNet(host, "127.0.0.1", "255.0.0.0")) ||
-     (isInNet(host, "10.0.0.0", "255.0.0.0")) ||
-     (isInNet(host, "172.16.0.0", "255.240.0.0")) ||
-     (isInNet(host, "192.168.0.0", "255.255.0.0")) ||
+END
+;
+
+	if ($netsettings{'GREEN_DEV'}) {
+		print FILE "     (isInNet(host, \"$netsettings{'GREEN_NETADDRESS'}\", \"$netsettings{'GREEN_NETMASK'}\")) ||\n";
+	}
+
+	if (&Header::blue_used() && $netsettings{'BLUE_DEV'}) {
+		print FILE "     (isInNet(host, \"$netsettings{'BLUE_NETADDRESS'}\", \"$netsettings{'BLUE_NETMASK'}\")) ||\n";
+	}
+
+	if (&Header::orange_used() && $netsettings{'ORANGE_DEV'}) {
+		print FILE "     (isInNet(host, \"$netsettings{'ORANGE_NETADDRESS'}\", \"$netsettings{'ORANGE_NETMASK'}\")) ||\n";
+	}
+
+	print FILE <<END
      (isInNet(host, "169.254.0.0", "255.255.0.0"))
    )
      return "DIRECT";


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