Forward Firewall: some changes in firewall script to make collectd work

[people/teissler/ipfire-2.x.git] / config / forwardfw / firewall-policy

diff --git a/config/forwardfw/firewall-policy b/config/forwardfw/firewall-policy
index 90d8065aa1f57a9256da00399047d79517019d0f..9af835cc9cc92261f6333572a1ad855a7bf4f9d3 100755 (executable)
--- a/config/forwardfw/firewall-policy
+++ b/config/forwardfw/firewall-policy
@@ -2,11 +2,17 @@
 
 eval $(/usr/local/bin/readhash /var/ipfire/forward/settings)
 eval $(/usr/local/bin/readhash /var/ipfire/optionsfw/settings)
+eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
 
 iptables -F POLICYFWD
 iptables -F POLICYOUT
+iptables -F POLICYIN
 
+if [ -f "/var/ipfire/red/iface" ]; then
+       IFACE=`cat /var/ipfire/red/iface`
+fi
 
+#FORWARDFW
 if [ "$POLICY" == "MODE1" ]; then
                if [ "$FWPOLICY" == "REJECT" ]; then
                        if [ "$DROPFORWARD" == "on" ]; then
@@ -20,20 +26,40 @@ if [ "$POLICY" == "MODE1" ]; then
                        fi
                        /sbin/iptables -A POLICYFWD -j DROP -m comment --comment "DROP_FORWARD"
                fi
+else
+       if [  "$BLUE_DEV" ] && [ "$IFACE" ]; then
+               /sbin/iptables -A POLICYFWD -i blue0 ! -o $IFACE -j DROP 
+       fi
+       /sbin/iptables -A POLICYFWD -j ACCEPT 
 fi
+
+#OUTGOINGFW
 if [ "$POLICY1" == "MODE1" ]; then
-       /sbin/iptables -I OUTGOINGFW 1 -m state --state ESTABLISHED,RELATED -j ACCEPT
-               if [ "$FWPOLICY1" == "REJECT" ]; then
-                       if [ "$DROPOUTGOING" == "on" ]; then
-                               /sbin/iptables -A POLICYOUT -m limit --limit 10/minute -j LOG --log-prefix "REJECT_OUTPUT"
-                       fi
-                               /sbin/iptables -A POLICYOUT -j REJECT --reject-with icmp-host-unreachable -m comment --comment "DROP_OUTPUT"
+       if [ "$FWPOLICY1" == "REJECT" ]; then
+               if [ "$DROPOUTGOING" == "on" ]; then
+                       /sbin/iptables -A POLICYOUT -m limit --limit 10/minute -j LOG --log-prefix "REJECT_OUTPUT"
                fi
-               if [ "$FWPOLICY1" == "DROP" ]; then
-                       if [ "$DROPOUTGOING" == "on" ]; then
-                               /sbin/iptables -A POLICYOUT -m limit --limit 10/minute -j LOG --log-prefix "DROP_OUTPUT"
-                       fi
-                               /sbin/iptables -A POLICYOUT -j DROP -m comment --comment "DROP_OUTPUT"
+               /sbin/iptables -A POLICYOUT -j REJECT --reject-with icmp-host-unreachable -m comment --comment "DROP_OUTPUT"
+       fi
+       if [ "$FWPOLICY1" == "DROP" ]; then
+               if [ "$DROPOUTGOING" == "on" ]; then
+                       /sbin/iptables -A POLICYOUT -m limit --limit 10/minute -j LOG --log-prefix "DROP_OUTPUT"
                fi
+                       /sbin/iptables -A POLICYOUT -j DROP -m comment --comment "DROP_OUTPUT"
+       fi
+else
+       /sbin/iptables -A POLICYOUT -j ACCEPT 
+fi
+#INPUT
+if [ "$FWPOLICY2" == "REJECT" ]; then
+       if [ "$DROPINPUT" == "on" ]; then
+               /sbin/iptables -A POLICYIN -m limit --limit 10/minute -j LOG --log-prefix "REJECT_INPUT"
+       fi
+       /sbin/iptables -A POLICYIN -j REJECT --reject-with icmp-host-unreachable -m comment --comment "DROP_INPUT"
+fi
+if [ "$FWPOLICY2" == "DROP" ]; then
+       if [ "$DROPINPUT" == "on" ]; then
+               /sbin/iptables -A POLICYIN -m limit --limit 10/minute -j LOG --log-prefix "DROP_INPUT"
+       fi
+       /sbin/iptables -A POLICYIN -j DROP -m comment --comment "DROP_INPUT"
 fi
-