captive portal: Require authorization before redirecting to proxy

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/core/117/filelists/files b/config/rootfiles/core/117/filelists/files
index 6fef8c08ec2ff3370cb1088f830212bc1f831e7e..59bd5dfcca6ed3b83d82ca72d905ab889fadc237 100644 (file)
--- 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 c4d2fefe41d3308823b4250d15e26c998db56db3..cab791c1f7a599059483bfe3257179df49f01658 100644 (file)
--- 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