firewall: extend nat reflection support
authorJo-Philipp Wich <jow@openwrt.org>
Tue, 4 Dec 2012 15:24:21 +0000 (15:24 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Tue, 4 Dec 2012 15:24:21 +0000 (15:24 +0000)
- use comment match to keep track of per-network rules
- setup reflection for any interface which is part of a masqueraded zone, not just "wan"
- delete per-network reflection rules if network is brought down

SVN-Revision: 34472

package/network/config/firewall/Makefile
package/network/config/firewall/files/reflection.hotplug

index 05f42a62eab7e2139f631d3b163906f569bbc548..16a683c48a698eeaf5770485af2a75f1f0c9eada 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=firewall
 
 PKG_VERSION:=2
-PKG_RELEASE:=53
+PKG_RELEASE:=54
 
 include $(INCLUDE_DIR)/package.mk
 
index 843c615bcbb6d17d678a3e96ae93752f6713ad30..935ab425241ab460b98724a6df4ff20f7ed9ad20 100644 (file)
@@ -3,34 +3,59 @@
 . /lib/functions.sh
 . /lib/functions/network.sh
 
-if [ "$ACTION" = "add" ] && [ "$INTERFACE" = "wan" ]; then
-       local wanip
-       network_get_ipaddr wanip wan || return
-
-       iptables -t nat -F nat_reflection_in 2>/dev/null || {
-               iptables -t nat -N nat_reflection_in
-               iptables -t nat -A prerouting_rule -j nat_reflection_in
+if [ "$ACTION" = "remove" ]; then
+
+       delete_rules_by_comment() {
+               local table="$1"
+               local chain="$2"
+               local comment="$3"
+
+               iptables -t "$table" --line-numbers -nL "$chain" 2>/dev/null | \
+                       sed -e '
+                               1d;
+                               1! {
+                                       \#^[0-9]\+ .* /\* '"$comment"' \*/.*$# {
+                                               s/ .*$//;
+                                               G; h;
+                                       }
+                               };
+                               $!d;
+                       ' | xargs -n1 iptables -t "$table" -D "$chain" 2>/dev/null
        }
 
-       iptables -t nat -F nat_reflection_out 2>/dev/null || {
-               iptables -t nat -N nat_reflection_out
-               iptables -t nat -A postrouting_rule -j nat_reflection_out
-       }
+       delete_rules_by_comment nat    nat_reflection_in  "$INTERFACE"
+       delete_rules_by_comment nat    nat_reflection_out "$INTERFACE"
+       delete_rules_by_comment filter nat_reflection_fwd "$INTERFACE"
+
+elif [ "$ACTION" = "add" ]; then
+
+       prepare_chains() {
+               iptables -t nat -N nat_reflection_in 2>/dev/null && {
+                       iptables -t nat -A prerouting_rule -j nat_reflection_in
+               }
+
+               iptables -t nat -N nat_reflection_out 2>/dev/null && {
+                       iptables -t nat -A postrouting_rule -j nat_reflection_out
+               }
 
-       iptables -t filter -F nat_reflection_fwd 2>/dev/null || {
-               iptables -t filter -N nat_reflection_fwd
-               iptables -t filter -A forwarding_rule -j nat_reflection_fwd
+               iptables -t filter -N nat_reflection_fwd 2>/dev/null && {
+                       iptables -t filter -A forwarding_rule -j nat_reflection_fwd
+               }
        }
 
        find_networks() {
                find_networks_cb() {
                        local cfg="$1"
                        local zone="$2"
+                       local need_masq="${3:-0}"
 
                        local name
                        config_get name "$cfg" name
 
-                       [ "$name" = "$zone" ] && {
+                       local masq
+                       config_get_bool masq "$cfg" masq 0
+
+                       [ "$name" = "$zone" ] && [ "$masq" -ge "$need_masq" ] && {
                                local network
                                config_get network "$cfg" network
 
@@ -51,82 +76,94 @@ if [ "$ACTION" = "add" ] && [ "$INTERFACE" = "wan" ]; then
 
                local src
                config_get src "$cfg" src
+               [ "$src" == "$ZONE" ] || return
+
+               local dest
+               config_get dest "$cfg" dest
+               [ "$dest" != "*" ] || return
 
                local target
                config_get target "$cfg" target DNAT
-
-               [ "$src" = wan ] && [ "$target" = DNAT ] && {
-                       local dest
-                       config_get dest "$cfg" dest "lan"
-                       [ "$dest" != "*" ] || return
-
-                       local net
-                       for net in $(find_networks "$dest"); do
-                               local lannet
-                               network_get_subnet lannet "$net" || return
-
-                               local proto
-                               config_get proto "$cfg" proto
-
-                               local epmin epmax extport
-                               config_get extport "$cfg" src_dport "1-65535"
-                               [ -n "$extport" ] || return
-
-                               epmin="${extport%[-:]*}"; epmax="${extport#*[-:]}"
-                               [ "${epmin#!}" != "$epmax" ] || epmax=""
-
-                               local ipmin ipmax intport
-                               config_get intport "$cfg" dest_port "$extport"
-
-                               ipmin="${intport%[-:]*}"; ipmax="${intport#*[-:]}"
-                               [ "${ipmin#!}" != "$ipmax" ] || ipmax=""
-
-                               local exthost
-                               config_get exthost "$cfg" src_dip "$wanip"
-
-                               local inthost
-                               config_get inthost "$cfg" dest_ip
-                               [ -n "$inthost" ] || return
-
-                               [ "$proto" = all    ] && proto="tcp udp"
-                               [ "$proto" = tcpudp ] && proto="tcp udp"
-
-                               [ "${inthost#!}" = "$inthost" ] || return 0
-                               [ "${exthost#!}" = "$exthost" ] || return 0
-
-                               [ "${epmin#!}" != "$epmin" ] && \
-                                       extport="! --dport ${epmin#!}${epmax:+:$epmax}" || \
-                                       extport="--dport $epmin${epmax:+:$epmax}"
-
-                               [ "${ipmin#!}" != "$ipmin" ] && \
-                                       intport="! --dport ${ipmin#!}${ipmax:+:$ipmax}" || \
-                                       intport="--dport $ipmin${ipmax:+:$ipmax}"
-
-                               local p
-                               for p in ${proto:-tcp udp}; do
-                                       case "$p" in
-                                               tcp|udp|6|17)
-                                                       iptables -t nat -A nat_reflection_in \
-                                                               -s $lannet -d $exthost \
-                                                               -p $p $extport \
-                                                               -j DNAT --to $inthost:${ipmin#!}${ipmax:+-$ipmax}
-
-                                                       iptables -t nat -A nat_reflection_out \
-                                                               -s $lannet -d $inthost \
-                                                               -p $p $intport \
-                                                               -j SNAT --to-source ${lannet%%/*}
-
-                                                       iptables -t filter -A nat_reflection_fwd \
-                                                               -s $lannet -d $inthost \
-                                                               -p $p $intport \
-                                                               -j ACCEPT
-                                               ;;
-                                       esac
-                               done
+               [ "$target" = DNAT ] || return
+
+               prepare_chains
+
+               local net
+               for net in $(find_networks "$dest" 0); do
+                       local intnet
+                       network_get_subnet intnet "$net" || continue
+
+                       local proto
+                       config_get proto "$cfg" proto
+
+                       local epmin epmax extport
+                       config_get extport "$cfg" src_dport "1-65535"
+                       [ -n "$extport" ] || return
+
+                       epmin="${extport%[-:]*}"; epmax="${extport#*[-:]}"
+                       [ "${epmin#!}" != "$epmax" ] || epmax=""
+
+                       local ipmin ipmax intport
+                       config_get intport "$cfg" dest_port "$extport"
+
+                       ipmin="${intport%[-:]*}"; ipmax="${intport#*[-:]}"
+                       [ "${ipmin#!}" != "$ipmax" ] || ipmax=""
+
+                       local exthost
+                       config_get exthost "$cfg" src_dip "$extip"
+
+                       local inthost
+                       config_get inthost "$cfg" dest_ip
+                       [ -n "$inthost" ] || return
+
+                       [ "$proto" = all    ] && proto="tcp udp"
+                       [ "$proto" = tcpudp ] && proto="tcp udp"
+
+                       [ "${inthost#!}" = "$inthost" ] || return 0
+                       [ "${exthost#!}" = "$exthost" ] || return 0
+
+                       [ "${epmin#!}" != "$epmin" ] && \
+                               extport="! --dport ${epmin#!}${epmax:+:$epmax}" || \
+                               extport="--dport $epmin${epmax:+:$epmax}"
+
+                       [ "${ipmin#!}" != "$ipmin" ] && \
+                               intport="! --dport ${ipmin#!}${ipmax:+:$ipmax}" || \
+                               intport="--dport $ipmin${ipmax:+:$ipmax}"
+
+                       local p
+                       for p in ${proto:-tcp udp}; do
+                               case "$p" in
+                                       tcp|udp|6|17)
+                                               iptables -t nat -A nat_reflection_in \
+                                                       -s $intnet -d $exthost \
+                                                       -p $p $extport \
+                                                       -m comment --comment "$INTERFACE" \
+                                                       -j DNAT --to $inthost:${ipmin#!}${ipmax:+-$ipmax}
+
+                                               iptables -t nat -A nat_reflection_out \
+                                                       -s $intnet -d $inthost \
+                                                       -p $p $intport \
+                                                       -m comment --comment "$INTERFACE" \
+                                                       -j SNAT --to-source ${intnet%%/*}
+
+                                               iptables -t filter -A nat_reflection_fwd \
+                                                       -s $intnet -d $inthost \
+                                                       -p $p $intport \
+                                                       -m comment --comment "$INTERFACE" \
+                                                       -j ACCEPT
+                                       ;;
+                               esac
                        done
-               }
+               done
        }
 
        config_load firewall
+
+       local is_masq_zone="$(find_networks "$ZONE" 1)"
+       [ -n "$is_masq_zone" ] || exit 0
+
+       local extip
+       network_get_ipaddr extip "$INTERFACE" || exit 0
+
        config_foreach setup_fwd redirect
 fi