Forward firewall: commented out line in init.d/firewall that all Forward traffic...

diff --git a/config/forwardfw/firewall-lib.pl b/config/forwardfw/firewall-lib.pl
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/config/forwardfw/rules.pl b/config/forwardfw/rules.pl
index 8c9e2ba523d95e81dbe1f4abdb19c2bcf237efb6..960951fc00fc7df4d176e333c06371a31fd7852c 100755 (executable)
--- a/config/forwardfw/rules.pl
+++ b/config/forwardfw/rules.pl
@@ -88,9 +88,11 @@ if($param eq 'flush'){
        &preparerules;
        if($MODE eq '0'){
                if ($fwdfwsettings{'POLICY'} eq 'MODE1'){
-                       system ("iptables -A $CHAIN -j DROP"); 
+                       #system ("iptables -A $CHAIN -j DROP"); 
                }elsif($fwdfwsettings{'POLICY'} eq 'MODE2'){
-                       system ("iptables -A $CHAIN -j ACCEPT");
+                       #system ("iptables -A $CHAIN -j ACCEPT");
+               }elsif($fwdfwsettings{'POLICY'} eq 'MODE0' || $fwdfwsettings{'POLICY'} eq 'MODE2'){
+                       system ("iptables -A $CHAIN -m state --state NEW -j ACCEPT");
                }
        }
 }

diff --git a/config/fwhosts/icmp-types b/config/fwhosts/icmp-types
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index f4cc2afa8780cf528f3b0cfc756834a56bb61c32..c1daa59b5266da97274357b3933a0f7c3f44c345 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
@@ -283,18 +283,12 @@ 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 FORWARDFW -m limit --limit 10/minute -j LOG --log-prefix "DROP_FORWARDFW "
+               /sbin/iptables -A FORWARD -m limit --limit 10/minute -j LOG --log-prefix "DROP_FORWARD "
        fi
-       /sbin/iptables -A FORWARDFW -j DROP -m comment --comment "DROP_FORWARDFW"
-       
+       /sbin/iptables -A FORWARD -j DROP -m comment --comment "DROP_FORWARD"
        
-        ;;
+       ;;
   startovpn)  
        # run openvpn
        /usr/local/bin/openvpnctrl --create-chains-and-rules
@@ -326,14 +320,14 @@ 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 [ "$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 FORWARDFW -m limit --limit 10/minute -j LOG --log-prefix "DROP_FORWARDFW "
        fi
-       /sbin/iptables -A FORWARDFW -j DROP -m comment --comment "DROP_FORWARDFW"
+       /sbin/iptables -A FORWARDFW -j DROP -m comment --comment "DROP_FORWARDFW-oberdropper"
        ;;
   stopovpn)
        # stop openvpn