KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

firewall: allow multiple interfaces to be part of one zone, fix the sanity checks for that

Browse source 
SVN-Revision: 14058
This commit is contained in:
Felix Fietkau 2009-01-16 17:39:03 +00:00
parent 5ebc074df4
commit 5b58a8db1f
2 changed files with 52 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
package/firewall/files/20-firewall
View file

@ -1,8 +1,8 @@
. /lib/firewall/uci_firewall.sh . /lib/firewall/uci_firewall.sh
unset ZONE unset ZONE
config_get ifname $INTERFACE ifname config_get ifname $INTERFACE ifname
INTERFACE=$ifname [ "$ifname" == "lo" ] && exit 0
[ "$INTERFACE" == "lo" ] && exit 0
load_zones() { load_zones() {
local name local name
local network local network
@ -10,11 +10,7 @@ load_zones() {
config_get network $1 network config_get network $1 network
[ -z "$network" ] && network=$name [ -z "$network" ] && network=$name
for n in $network; do for n in $network; do
local ifname [ "$n" = "$INTERFACE" ] && ZONE="$ZONE $name"
config_get ifname $n ifname
list_contains ifname $INTERFACE && {
list_contains ZONE $name || ZONE="$ZONE $name"
}
done done
} }
@ -26,7 +22,7 @@ config_foreach load_zones zone
for z in $ZONE; do for z in $ZONE; do
local loaded local loaded
config_get loaded core loaded config_get loaded core loaded
[ -n "$loaded" ] && addif $INTERFACE $z [ -n "$loaded" ] && addif "$INTERFACE" "$ifname" "$z"
done done
} }
@ -34,6 +30,6 @@ config_foreach load_zones zone
for z in $ZONE; do for z in $ZONE; do
local up local up
config_get up $z up config_get up $z up
[ "$up" == "1" ] && delif $INTERFACE $z [ "$up" == "1" ] && delif "$INTERFACE" "$ifname" "$z"
done done
} }

77
package/firewall/files/uci_firewall.sh
View file

@ -55,39 +55,56 @@ create_zone() {
} }
addif() { addif() {
local dev local network="$1"
config_get dev core $2 local ifname="$2"
[ -n "$dev" -a "$dev" != "$1" ] && delif "$dev" "$2" local zone="$3"
[ -n "$dev" -a "$dev" == "$1" ] && return
logger "adding $1 to firewall zone $2" local n_if n_zone
$IPTABLES -A input -i $1 -j zone_$2 config_get n_if core "${network}_ifname"
$IPTABLES -I zone_$2_MSSFIX 1 -o $1 -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu config_get n_zone core "${network}_zone"
$IPTABLES -I zone_$2_ACCEPT 1 -o $1 -j ACCEPT [ -n "$n_zone" ] && {
$IPTABLES -I zone_$2_DROP 1 -o $1 -j DROP if [ "$n_zone" != "$zone" ]; then
$IPTABLES -I zone_$2_REJECT 1 -o $1 -j reject delif "$network" "$n_if" "$n_zone"
$IPTABLES -I zone_$2_ACCEPT 1 -i $1 -j ACCEPT else
$IPTABLES -I zone_$2_DROP 1 -i $1 -j DROP return
$IPTABLES -I zone_$2_REJECT 1 -i $1 -j reject fi
$IPTABLES -I zone_$2_nat 1 -t nat -o $1 -j MASQUERADE }
$IPTABLES -I PREROUTING 1 -t nat -i $1 -j zone_$2_prerouting
$IPTABLES -A forward -i $1 -j zone_$2_forward logger "adding $network ($ifname) to firewall zone $zone"
uci_set_state firewall core "$2" "$1" $IPTABLES -A input -i "$ifname" -j zone_${zone}
$IPTABLES -I zone_${zone}_MSSFIX 1 -o "$ifname" -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
$IPTABLES -I zone_${zone}_ACCEPT 1 -o "$ifname" -j ACCEPT
$IPTABLES -I zone_${zone}_DROP 1 -o "$ifname" -j DROP
$IPTABLES -I zone_${zone}_REJECT 1 -o "$ifname" -j reject
$IPTABLES -I zone_${zone}_ACCEPT 1 -i "$ifname" -j ACCEPT
$IPTABLES -I zone_${zone}_DROP 1 -i "$ifname" -j DROP
$IPTABLES -I zone_${zone}_REJECT 1 -i "$ifname" -j reject
$IPTABLES -I zone_${zone}_nat 1 -t nat -o "$ifname" -j MASQUERADE
$IPTABLES -I PREROUTING 1 -t nat -i "$ifname" -j zone_${zone}_prerouting
$IPTABLES -A forward -i "$ifname" -j zone_${zone}_forward
uci_set_state firewall core "${network}_ifname" "$ifname"
uci_set_state firewall core "${network}_zone" "$zone"
} }
delif() { delif() {
logger "removing $1 from firewall zone $2" local network="$1"
$IPTABLES -D input -i $1 -j zone_$2 local ifname="$2"
$IPTABLES -D zone_$2_MSSFIX -o $1 -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu local zone="$3"
$IPTABLES -D zone_$2_ACCEPT -o $1 -j ACCEPT
$IPTABLES -D zone_$2_DROP -o $1 -j DROP logger "removing $network ($ifname) from firewall zone $zone"
$IPTABLES -D zone_$2_REJECT -o $1 -j reject $IPTABLES -D input -i "$ifname" -j zone_$zone
$IPTABLES -D zone_$2_ACCEPT -i $1 -j ACCEPT $IPTABLES -D zone_${zone}_MSSFIX -o "$ifname" -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
$IPTABLES -D zone_$2_DROP -i $1 -j DROP $IPTABLES -D zone_${zone}_ACCEPT -o "$ifname" -j ACCEPT
$IPTABLES -D zone_$2_REJECT -i $1 -j reject $IPTABLES -D zone_${zone}_DROP -o "$ifname" -j DROP
$IPTABLES -D zone_$2_nat -t nat -o $1 -j MASQUERADE $IPTABLES -D zone_${zone}_REJECT -o "$ifname" -j reject
$IPTABLES -D PREROUTING -t nat -i $1 -j zone_$2_prerouting $IPTABLES -D zone_${zone}_ACCEPT -i "$ifname" -j ACCEPT
$IPTABLES -D forward -i $1 -j zone_$2_forward $IPTABLES -D zone_${zone}_DROP -i "$ifname" -j DROP
uci_revert_state firewall core "$2" $IPTABLES -D zone_${zone}_REJECT -i "$ifname" -j reject
$IPTABLES -D zone_${zone}_nat -t nat -o "$ifname" -j MASQUERADE
$IPTABLES -D PREROUTING -t nat -i "$ifname" -j zone_${zone}_prerouting
$IPTABLES -D forward -i "$ifname" -j zone_${zone}_forward
uci_revert_state firewall core "${network}_ifname"
uci_revert_state firewall core "${network}_zone"
} }
load_synflood() { load_synflood() {