Forward Firewall: BUGFIX: When editing a rule and changing position, no other changes...

[ipfire-2.x.git] / src / initscripts / init.d / firewall

diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index 4287d33f180cf0808da8918fc7fa5f5d5f3fe505..af488b0d75b00c9577fbfa4af17e15d47995bca5 100644 (file)
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -211,7 +211,7 @@ case "$1" in
        /sbin/iptables -A FORWARD -s 127.0.0.0/8 -m state --state NEW -j DROP
        /sbin/iptables -A FORWARD -d 127.0.0.0/8 -m state --state NEW -j DROP
        /sbin/iptables -A INPUT   -i $GREEN_DEV  -m state --state NEW -j ACCEPT ! -p icmp
-       /sbin/iptables -A FORWARD -i $GREEN_DEV  -m state --state NEW -j ACCEPT
+       #/sbin/iptables -A FORWARD -i $GREEN_DEV  -m state --state NEW -j ACCEPT
 
        # If a host on orange tries to initiate a connection to IPFire's red IP and
        # the connection gets DNATed back through a port forward to a server on orange
@@ -221,17 +221,17 @@ case "$1" in
        # allow DHCP on BLUE to be turned on/off
        /sbin/iptables -N DHCPBLUEINPUT 
        /sbin/iptables -A INPUT -j DHCPBLUEINPUT
-
-       # OPenSSL
-       /sbin/iptables -N OPENSSLPHYSICAL
-       /sbin/iptables -A INPUT -j OPENSSLPHYSICAL
-
+       
        # WIRELESS chains
        /sbin/iptables -N WIRELESSINPUT
        /sbin/iptables -A INPUT -m state --state NEW -j WIRELESSINPUT
        /sbin/iptables -N WIRELESSFORWARD
        /sbin/iptables -A FORWARD -m state --state NEW -j WIRELESSFORWARD
 
+       # OPenSSL
+       /sbin/iptables -N OPENSSLPHYSICAL
+       /sbin/iptables -A INPUT -j OPENSSLPHYSICAL
+
        # RED chain, used for the red interface
        /sbin/iptables -N REDINPUT
        /sbin/iptables -A INPUT -j REDINPUT
@@ -241,7 +241,14 @@ case "$1" in
        /sbin/iptables -t nat -A POSTROUTING -j REDNAT
 
        iptables_red
-
+       
+       # DMZ pinhole chain.  setdmzholes setuid prog adds rules here to allow
+       # ORANGE to talk to GREEN / BLUE.
+       /sbin/iptables -N DMZHOLES
+       if [ "$ORANGE_DEV" != "" ]; then
+               /sbin/iptables -A FORWARD -i $ORANGE_DEV -m state --state NEW -j FORWARDFW
+       fi
+       
        # PORTFWACCESS chain, used for portforwarding
        /sbin/iptables -N PORTFWACCESS
        /sbin/iptables -A FORWARD -m state --state NEW -j PORTFWACCESS
@@ -283,11 +290,17 @@ case "$1" in
                /sbin/iptables -A INPUT -m limit --limit 10/minute -j LOG --log-prefix "DROP_INPUT "
        fi
        /sbin/iptables -A INPUT -j DROP -m comment --comment "DROP_INPUT"
-       if [ "$DROPOUTPUT" == "on" ]; then
-               /sbin/iptables -A FORWARD -m limit --limit 10/minute -j LOG --log-prefix "DROP_OUTPUT "
-       fi
-       /sbin/iptables -A FORWARD -j DROP -m comment --comment "DROP_OUTPUT"
-        ;;
+       #if [ "$DROPFORWARD" == "on" ]; then
+       #       /sbin/iptables -A FORWARD -m limit --limit 10/minute -j LOG --log-prefix "DROP_FORWARD "
+       #fi
+       #/sbin/iptables -A FORWARD -j DROP -m comment --comment "DROP_FORWARD"
+       
+       #POLICY CHAIN
+       /sbin/iptables -N POLICY
+       /sbin/iptables -A FORWARD -j POLICY
+       
+       /usr/sbin/firewall-forward-policy
+       ;;
   startovpn)  
        # run openvpn
        /usr/local/bin/openvpnctrl --create-chains-and-rules
@@ -319,11 +332,11 @@ case "$1" in
                /sbin/iptables -A INPUT   -m limit --limit 10/minute -j LOG --log-prefix "DROP_INPUT "
        fi
        /sbin/iptables -A INPUT -j DROP -m comment --comment "DROP_INPUT"
-       if [ "$DROPOUTPUT" == "on" ]; then
-               /sbin/iptables -A FORWARD -m limit --limit 10/minute -j LOG --log-prefix "DROP_OUTPUT "
+       if [ "$DROPFORWARD" == "on" ]; then
+               /sbin/iptables -A FORWARD -m limit --limit 10/minute -j LOG --log-prefix "DROP_FORWARD "
        fi
-       /sbin/iptables -A FORWARD -j DROP -m comment --comment "DROP_OUTPUT"
-        ;;
+       /sbin/iptables -A FORWARD -j DROP -m comment --comment "DROP_FORWARD"
+       ;;
   stopovpn)
        # stop openvpn
        /usr/local/bin/openvpnctrl --delete-chains-and-rules