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

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

[git]

[-- Attachment #1: Type: text/plain, Size: 2639 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  9bb405536712b79f8b77771707c5dbc4002fc3f2 (commit)
      from  81f6550cfb8cfb566d9f85a98850d23b124992a1 (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 9bb405536712b79f8b77771707c5dbc4002fc3f2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Nov 11 12:47:37 2017 +0000

    captive portal: Require authorization before redirecting to proxy
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/core/117/filelists/files | 1 +
 src/initscripts/system/firewall           | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/117/filelists/files b/config/rootfiles/core/117/filelists/files
index 6fef8c0..59bd5df 100644
--- a/config/rootfiles/core/117/filelists/files
+++ b/config/rootfiles/core/117/filelists/files
@@ -5,4 +5,5 @@ srv/web/ipfire/html/themes/darkdos/include/functions.pl
 srv/web/ipfire/html/themes/ipfire-legacy/include/functions.pl
 srv/web/ipfire/html/themes/ipfire/include/functions.pl
 srv/web/ipfire/html/themes/maniac/include/functions.pl
+usr/local/bin/captivectrl
 var/ipfire/network-functions.pl
diff --git a/src/initscripts/system/firewall b/src/initscripts/system/firewall
index c4d2fef..cab791c 100644
--- a/src/initscripts/system/firewall
+++ b/src/initscripts/system/firewall
@@ -310,6 +310,10 @@ iptables_init() {
 	iptables -t nat -N NAT_SOURCE
 	iptables -t nat -A POSTROUTING -j NAT_SOURCE
 
+	# Captive Portal
+	iptables -t nat -N CAPTIVE_PORTAL
+	iptables -t nat -A PREROUTING -j CAPTIVE_PORTAL
+
 	# Custom prerouting chains (for transparent proxy)
 	iptables -t nat -N SQUID
 	iptables -t nat -A PREROUTING -j SQUID
@@ -344,10 +348,6 @@ iptables_init() {
 	iptables -N UPNPFW
 	iptables -A FORWARD -m conntrack --ctstate NEW -j UPNPFW
 
-	# Captive Portal
-	iptables -t nat -N CAPTIVE_PORTAL
-	iptables -t nat -A PREROUTING -j CAPTIVE_PORTAL
-
 	# RED chain, used for the red interface
 	iptables -N REDINPUT
 	iptables -A INPUT -j REDINPUT


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