X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Ffirewall%2Ffiles%2Fuci_firewall.sh;h=478b95c931aa2bdbfd9fcc1eca597ae7689c5415;hp=579a8a6c3a5beaa7f000b639a1cf92c45eaab59a;hb=a26262f2fcfd331a68e3c6510f5f7285da51265f;hpb=8b89480af1e2dd439fba133662e91650839298d7

diff --git a/package/firewall/files/uci_firewall.sh b/package/firewall/files/uci_firewall.sh
index 579a8a6c3a..478b95c931 100755
--- a/package/firewall/files/uci_firewall.sh
+++ b/package/firewall/files/uci_firewall.sh
@@ -1,4 +1,4 @@
-#!/bin/sh 
+#!/bin/sh
 # Copyright (C) 2008 John Crispin <blogic@openwrt.org>
 
 . /etc/functions.sh
@@ -20,6 +20,16 @@ CUSTOM_CHAINS=1
 DEF_INPUT=DROP
 DEF_OUTPUT=DROP
 DEF_FORWARD=DROP
+CONNTRACK_ZONES=
+NOTRACK_DISABLED=
+
+find_item() {
+	local item="$1"; shift
+	for i in "$@"; do
+		[ "$i" = "$item" ] && return 0
+	done
+	return 1
+}
 
 load_policy() {
 	config_get input $1 input
@@ -33,12 +43,12 @@ load_policy() {
 
 create_zone() {
 	local exists
-	
+
 	[ "$1" == "loopback" ] && return
 
 	config_get exists $ZONE_LIST $1
 	[ -n "$exists" ] && return
-	config_set $ZONE_LIST $1 1 
+	config_set $ZONE_LIST $1 1
 
 	$IPTABLES -N zone_$1
 	$IPTABLES -N zone_$1_MSSFIX
@@ -46,48 +56,69 @@ create_zone() {
 	$IPTABLES -N zone_$1_DROP
 	$IPTABLES -N zone_$1_REJECT
 	$IPTABLES -N zone_$1_forward
-	$IPTABLES -A zone_$1_forward -j zone_$1_$5
-	$IPTABLES -A zone_$1 -j zone_$1_$3
-	$IPTABLES -A output -j zone_$1_$4
+	[ "$4" ] && $IPTABLES -A output -j zone_$1_$4
 	$IPTABLES -N zone_$1_nat -t nat
 	$IPTABLES -N zone_$1_prerouting -t nat
+	$IPTABLES -t raw -N zone_$1_notrack
 	[ "$6" == "1" ] && $IPTABLES -t nat -A POSTROUTING -j zone_$1_nat
+	[ "$7" == "1" ] && $IPTABLES -I FORWARD 1 -j zone_$1_MSSFIX
 }
 
+
 addif() {
-	local dev
-	config_get dev core $2
-	[ -n "$dev" -a "$dev" != "$1" ] && delif "$dev" "$2"
-	[ -n "$dev" -a "$dev" == "$1" ] && return
-	logger "adding $1 to firewall zone $2"
-	$IPTABLES -A input -i $1 -j zone_$2
-	$IPTABLES -I zone_$2_MSSFIX 1 -o $1 -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
-	$IPTABLES -I zone_$2_ACCEPT 1 -o $1 -j ACCEPT
-	$IPTABLES -I zone_$2_DROP 1 -o $1 -j DROP
-	$IPTABLES -I zone_$2_REJECT 1 -o $1 -j reject
-	$IPTABLES -I zone_$2_ACCEPT 1 -i $1 -j ACCEPT
-	$IPTABLES -I zone_$2_DROP 1 -i $1 -j DROP
-	$IPTABLES -I zone_$2_REJECT 1 -i $1 -j reject
-	$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
-	uci_set_state firewall core "$2" "$1"
+	local network="$1"
+	local ifname="$2"
+	local zone="$3"
+
+	local n_if n_zone
+	config_get n_if core "${network}_ifname"
+	config_get n_zone core "${network}_zone"
+	[ -n "$n_zone" ] && {
+		if [ "$n_zone" != "$zone" ]; then
+			delif "$network" "$n_if" "$n_zone"
+		else
+			return
+		fi
+	}
+
+	logger "adding $network ($ifname) to firewall zone $zone"
+	$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
+	$IPTABLES -t raw -I PREROUTING 1 -i "$ifname" -j zone_${zone}_notrack
+	uci_set_state firewall core "${network}_ifname" "$ifname"
+	uci_set_state firewall core "${network}_zone" "$zone"
+	ACTION=add ZONE="$zone" INTERFACE="$network" DEVICE="$ifname" /sbin/hotplug-call firewall
 }
 
 delif() {
-	logger "removing $1 from firewall zone $2"
-	$IPTABLES -D input -i $1 -j zone_$2
-	$IPTABLES -D zone_$2_MSSFIX -o $1 -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
-	$IPTABLES -D zone_$2_ACCEPT -o $1 -j ACCEPT
-	$IPTABLES -D zone_$2_DROP -o $1 -j DROP
-	$IPTABLES -D zone_$2_REJECT -o $1 -j reject
-	$IPTABLES -D zone_$2_ACCEPT -i $1 -j ACCEPT
-	$IPTABLES -D zone_$2_DROP -i $1 -j DROP
-	$IPTABLES -D zone_$2_REJECT -i $1 -j reject
-	$IPTABLES -D zone_$2_nat -t nat -o $1 -j MASQUERADE 
-	$IPTABLES -D PREROUTING -t nat -i $1 -j zone_$2_prerouting 
-	$IPTABLES -D forward -i $1 -j zone_$2_forward
-	uci_revert_state firewall core "$2"
+	local network="$1"
+	local ifname="$2"
+	local zone="$3"
+
+	logger "removing $network ($ifname) from firewall zone $zone"
+	$IPTABLES -D input -i "$ifname" -j zone_$zone
+	$IPTABLES -D zone_${zone}_MSSFIX -o "$ifname" -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
+	$IPTABLES -D zone_${zone}_ACCEPT -o "$ifname" -j ACCEPT
+	$IPTABLES -D zone_${zone}_DROP -o "$ifname" -j DROP
+	$IPTABLES -D zone_${zone}_REJECT -o "$ifname" -j reject
+	$IPTABLES -D zone_${zone}_ACCEPT -i "$ifname" -j ACCEPT
+	$IPTABLES -D zone_${zone}_DROP -i "$ifname" -j DROP
+	$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"
+	ACTION=remove ZONE="$zone" INTERFACE="$network" DEVICE="$ifname" /sbin/hotplug-call firewall
 }
 
 load_synflood() {
@@ -110,6 +141,15 @@ fw_set_chain_policy() {
 	$IPTABLES -P $chain $target
 }
 
+fw_clear() {
+	$IPTABLES -F
+	$IPTABLES -t nat -F
+	$IPTABLES -t nat -X
+	$IPTABLES -t raw -F
+	$IPTABLES -t raw -X
+	$IPTABLES -X
+}
+
 fw_defaults() {
 	[ -n "$DEFAULTS_APPLIED" ] && {
 		echo "Error: multiple defaults sections detected"
@@ -120,38 +160,36 @@ fw_defaults() {
 	load_policy "$1"
 
 	echo 1 > /proc/sys/net/ipv4/tcp_syncookies
-	for f in /proc/sys/net/ipv4/conf/*/accept_redirects 
+	for f in /proc/sys/net/ipv4/conf/*/accept_redirects
 	do
 		echo 0 > $f
 	done
-	for f in /proc/sys/net/ipv4/conf/*/accept_source_route 
+	for f in /proc/sys/net/ipv4/conf/*/accept_source_route
 	do
 		echo 0 > $f
-	done                                                                   
-	
+	done
+
 	uci_revert_state firewall core
-	uci_set_state firewall core "" firewall_state 
+	uci_set_state firewall core "" firewall_state
 
 	$IPTABLES -P INPUT DROP
 	$IPTABLES -P OUTPUT DROP
 	$IPTABLES -P FORWARD DROP
 
-	$IPTABLES -F
-	$IPTABLES -t mangle -F
-	$IPTABLES -t nat -F
-	$IPTABLES -t mangle -X
-	$IPTABLES -t nat -X
-	$IPTABLES -X
-	
-	$IPTABLES -A INPUT -m state --state INVALID -j DROP
+	fw_clear
+	config_get_bool drop_invalid $1 drop_invalid 0
+
+	[ "$drop_invalid" -gt 0 ] && {
+		$IPTABLES -A INPUT -m state --state INVALID -j DROP
+		$IPTABLES -A OUTPUT -m state --state INVALID -j DROP
+		$IPTABLES -A FORWARD -m state --state INVALID -j DROP
+		NOTRACK_DISABLED=1
+	}
+
 	$IPTABLES -A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT
-		
-	$IPTABLES -A OUTPUT -m state --state INVALID -j DROP
 	$IPTABLES -A OUTPUT -m state --state RELATED,ESTABLISHED -j ACCEPT
-	
-	$IPTABLES -A FORWARD -m state --state INVALID -j DROP
 	$IPTABLES -A FORWARD -m state --state RELATED,ESTABLISHED -j ACCEPT
-	
+
 	$IPTABLES -A INPUT -i lo -j ACCEPT
 	$IPTABLES -A OUTPUT -o lo -j ACCEPT
 
@@ -159,7 +197,7 @@ fw_defaults() {
 	config_get syn_rate $1 syn_rate
 	config_get syn_burst $1 syn_burst
 	[ "$syn_flood" == "1" ] && load_synflood $syn_rate $syn_burst
-	
+
 	echo "Adding custom chains"
 	fw_custom_chains
 
@@ -180,23 +218,42 @@ fw_defaults() {
 	fw_set_chain_policy FORWARD "$DEF_FORWARD"
 }
 
-fw_zone() {
+fw_zone_defaults() {
 	local name
 	local network
 	local masq
 
 	config_get name $1 name
 	config_get network $1 network
-	config_get masq $1 masq
+	config_get_bool masq $1 masq "0"
+	config_get_bool conntrack $1 conntrack "0"
+	config_get_bool mtu_fix $1 mtu_fix 0
+
 	load_policy $1
+	[ "$forward" ] && $IPTABLES -A zone_${name}_forward -j zone_${name}_${forward}
+	[ "$input" ] && $IPTABLES -A zone_${name} -j zone_${name}_${input}
+}
 
+fw_zone() {
+	local name
+	local network
+	local masq
+
+	config_get name $1 name
+	config_get network $1 network
+	config_get_bool masq $1 masq "0"
+	config_get_bool conntrack $1 conntrack "0"
+	config_get_bool mtu_fix $1 mtu_fix 0
+
+	load_policy $1
+	[ "$conntrack" = "1" -o "$masq" = "1" ] && append CONNTRACK_ZONES "$name"
 	[ -z "$network" ] && network=$name
-	create_zone "$name" "$network" "$input" "$output" "$forward" "$masq"
+	create_zone "$name" "$network" "$input" "$output" "$forward" "$masq" "$mtu_fix"
 	fw_custom_chains_zone "$name"
 }
 
 fw_rule() {
-	local src 
+	local src
 	local src_ip
 	local src_mac
 	local src_port
@@ -205,6 +262,7 @@ fw_rule() {
 	local dest_ip
 	local dest_port
 	local proto
+	local icmp_type
 	local target
 	local ruleset
 
@@ -216,6 +274,7 @@ fw_rule() {
 	config_get dest_ip $1 dest_ip
 	config_get dest_port $1 dest_port
 	config_get proto $1 proto
+	config_get icmp_type $1 icmp_type
 	config_get target $1 target
 	config_get ruleset $1 ruleset
 
@@ -228,7 +287,7 @@ fw_rule() {
 	dest_port_last=${dest_port#*-}
 	[ "$dest_port_first" -ne "$dest_port_last" ] && { \
 		dest_port="$dest_port_first:$dest_port_last"; }
-	
+
 	ZONE=input
 	TARGET=$target
 	[ -z "$target" ] && target=DROP
@@ -236,14 +295,15 @@ fw_rule() {
 	[ -n "$src" -a -n "$dest" ] && ZONE=zone_${src}_forward
 	[ -n "$dest" ] && TARGET=zone_${dest}_$target
 	add_rule() {
-		$IPTABLES -I $ZONE 1 \
+		$IPTABLES -A $ZONE \
 			${proto:+-p $proto} \
+			${icmp_type:+--icmp-type $icmp_type} \
 			${src_ip:+-s $src_ip} \
 			${src_port:+--sport $src_port} \
 			${src_mac:+-m mac --mac-source $src_mac} \
 			${dest_ip:+-d $dest_ip} \
 			${dest_port:+--dport $dest_port} \
-			-j $TARGET 
+			-j $TARGET
 	}
 	[ "$proto" == "tcpudp" -o -z "$proto" ] && {
 		proto=tcp
@@ -262,11 +322,13 @@ fw_forwarding() {
 
 	config_get src $1 src
 	config_get dest $1 dest
-	config_get_bool mtu_fix $1 mtu_fix 0
 	[ -n "$src" ] && z_src=zone_${src}_forward || z_src=forward
 	[ -n "$dest" ] && z_dest=zone_${dest}_ACCEPT || z_dest=ACCEPT
 	$IPTABLES -I $z_src 1 -j $z_dest
-	[ "$mtu_fix" -gt 0 -a -n "$dest" ] && $IPTABLES -I $z_src 1 -j zone_${dest}_MSSFIX
+
+	# propagate masq zone flag
+	find_item "$src" $CONNTRACK_ZONES && append CONNTRACK_ZONES $dest
+	find_item "$dest" $CONNTRACK_ZONES && append CONNTRACK_ZONES $src
 }
 
 fw_redirect() {
@@ -278,7 +340,7 @@ fw_redirect() {
 	local dest_ip
 	local dest_port dest_port2
 	local proto
-	
+
 	config_get src $1 src
 	config_get src_ip $1 src_ip
 	config_get src_port $1 src_port
@@ -289,7 +351,7 @@ fw_redirect() {
 	config_get proto $1 proto
 	[ -z "$src" -o -z "$dest_ip" ] && { \
 		echo "redirect needs src and dest_ip"; return ; }
-	
+
 	src_port_first=${src_port%-*}
 	src_port_last=${src_port#*-}
 	[ "$src_port_first" -ne "$src_port_last" ] && { \
@@ -300,7 +362,7 @@ fw_redirect() {
 	[ "$src_dport_first" -ne "$src_dport_last" ] && { \
 		src_dport="$src_dport_first:$src_dport_last"; }
 
-	dest_port2=$dest_port
+	dest_port2=${dest_port:-$src_dport}
 	dest_port_first=${dest_port2%-*}
 	dest_port_last=${dest_port2#*-}
 	[ "$dest_port_first" -ne "$dest_port_last" ] && { \
@@ -322,7 +384,7 @@ fw_redirect() {
 			${src_port:+--sport $src_port} \
 			${dest_port2:+--dport $dest_port2} \
 			${src_mac:+-m mac --mac-source $src_mac} \
-			-j ACCEPT 
+			-j ACCEPT
 	}
 	[ "$proto" == "tcpudp" -o -z "$proto" ] && {
 		proto=tcp
@@ -356,7 +418,7 @@ fw_custom_chains() {
 	$IPTABLES -N forwarding_rule
 	$IPTABLES -N prerouting_rule -t nat
 	$IPTABLES -N postrouting_rule -t nat
-			
+
 	$IPTABLES -A INPUT -j input_rule
 	$IPTABLES -A OUTPUT -j output_rule
 	$IPTABLES -A FORWARD -j forwarding_rule
@@ -376,6 +438,14 @@ fw_custom_chains_zone() {
 	$IPTABLES -I zone_${zone}_prerouting 1 -t nat -j prerouting_${zone}
 }
 
+fw_check_notrack() {
+	local zone="$1"
+	config_get name "$zone" name
+	[ -n "$NOTRACK_DISABLED" ] || \
+		find_item "$name" $CONNTRACK_ZONES || \
+		$IPTABLES -t raw -A zone_${name}_notrack -j NOTRACK
+}
+
 fw_init() {
 	DEFAULTS_APPLIED=
 
@@ -383,29 +453,27 @@ fw_init() {
 	config_foreach fw_defaults defaults
 	echo "Loading zones"
 	config_foreach fw_zone zone
-	echo "Loading rules"
-	config_foreach fw_rule rule
 	echo "Loading forwarding"
 	config_foreach fw_forwarding forwarding
 	echo "Loading redirects"
 	config_foreach fw_redirect redirect
+	echo "Loading rules"
+	config_foreach fw_rule rule
 	echo "Loading includes"
 	config_foreach fw_include include
+	echo "Loading zone defaults"
+	config_foreach fw_zone_defaults zone
 	uci_set_state firewall core loaded 1
+	config_foreach fw_check_notrack zone
 	unset CONFIG_APPEND
 	config_load network
 	config_foreach fw_addif interface
 }
 
 fw_stop() {
-	$IPTABLES -F
-	$IPTABLES -t mangle -F
-	$IPTABLES -t nat -F
-	$IPTABLES -t mangle -X
-	$IPTABLES -t nat -X
-	$IPTABLES -X
+	fw_clear
 	$IPTABLES -P INPUT ACCEPT
 	$IPTABLES -P OUTPUT ACCEPT
 	$IPTABLES -P FORWARD ACCEPT
-	uci_revert_state firewall core
+	uci_revert_state firewall
 }