firewall-policy: Clarify policy rules.

There are no functional changes here. Everything that
is not explicitely allowed is now forbidden when the
forward policy is "ALLOWED".

diff --git a/config/firewall/firewall-policy b/config/firewall/firewall-policy
index 6990fa9f66d8438e93e1fa1d8120d3472d6aa769..2176d6b9e5a2c2d8e3ebacd9213109d48dce6666 100755 (executable)
--- a/config/firewall/firewall-policy
+++ b/config/firewall/firewall-policy
@@ -110,33 +110,28 @@ case "${POLICY}" in
                ;;
 
        *)
+               # Access from GREEN is granted to everywhere
+               iptables -A POLICYFWD -i "${GREEN_DEV}" -s "${GREEN_NETADDRESS}/${GREEN_NETMASK}" -j ACCEPT
+
+               # Grant access for IPsec VPN connections
+               iptables -A POLICYFWD -m policy --pol ipsec --dir in -j ACCEPT
+
+               # Grant access for OpenVPN connections
+               iptables -A POLICYFWD -i tun+ -j ACCEPT
+
                if [ -n "${IFACE}" ]; then
                        if [ "${HAVE_BLUE}" = "true" ] && [ -n "${BLUE_DEV}" ]; then
-                               if [ "${DROPFORWARD}" = "on" ]; then
-                                       iptables -A POLICYFWD -i "${BLUE_DEV}" ! -o "${IFACE}" -m limit --limit 10/minute -j LOG --log-prefix "DROP_FORWARD "
-                               fi
-                               iptables -A POLICYFWD -i "${BLUE_DEV}" ! -o "${IFACE}" -j DROP
-                       fi
-                       if [ "${HAVE_ORANGE}" = "true" ] && [ -n "${ORANGE_DEV}" ]; then
-                               if [ "${DROPFORWARD}" = "on" ]; then
-                                       iptables -A POLICYFWD -i "${ORANGE_DEV}" ! -o "${IFACE}" -m limit --limit 10/minute -j LOG --log-prefix "DROP_FORWARD "
-                               fi
-                               iptables -A POLICYFWD -i "${ORANGE_DEV}" ! -o "${IFACE}" -j DROP
+                               iptables -A POLICYFWD -i "${BLUE_DEV}" -s "${BLUE_NETADDRESS}/${BLUE_NETMASK}" -o "${IFACE}" -j ACCEPT
                        fi
 
-                       if [ "${DROPFORWARD}" = "on" ]; then
-                               iptables -A POLICYFWD -i "${IFACE}" -m limit --limit 10/minute -j LOG --log-prefix "DROP_FORWARD "
+                       if [ "${HAVE_ORANGE}" = "true" ] && [ -n "${ORANGE_DEV}" ]; then
+                               iptables -A POLICYFWD -i "${ORANGE_DEV}" -s "${ORANGE_NETADDRESS}/${ORANGE_NETMASK}" -o "${IFACE}" -j ACCEPT
                        fi
-                       iptables -A POLICYFWD -i "${IFACE}" -j DROP
+               fi
 
-                       if [ "${IFACE}" != "${RED_DEV}" ]; then
-                               if [ "${DROPFORWARD}" = "on" ]; then
-                                       iptables -A POLICYFWD -i "${RED_DEV}" -m limit --limit 10/minute -j LOG --log-prefix "DROP_FORWARD "
-                               fi
-                               iptables -A POLICYFWD -i "${RED_DEV}" -j DROP
-                       fi
+               if [ "${DROPFORWARD}" = "on" ]; then
+                       iptables -A POLICYFWD -m limit --limit 10/minute -j LOG --log-prefix "DROP_FORWARD "
                fi
-               iptables -A POLICYFWD -j ACCEPT
                iptables -A POLICYFWD -m comment --comment "DROP_FORWARD" -j DROP
                ;;
 esac