X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/312627976edac54eaa668cd0f9c1130c605c7818..d268e4037b374ce0008cc671bc1f7347e0285333:/package/firewall/files/uci_firewall.sh

diff --git a/package/firewall/files/uci_firewall.sh b/package/firewall/files/uci_firewall.sh
index fd108993c..44dd48b4e 100755
--- a/package/firewall/files/uci_firewall.sh
+++ b/package/firewall/files/uci_firewall.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
@@ -51,6 +61,7 @@ create_zone() {
 	$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
 }
 
@@ -82,8 +93,10 @@ addif() {
 	$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() {
@@ -105,6 +118,7 @@ delif() {
 	$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() {
@@ -127,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"
@@ -153,22 +176,20 @@ fw_defaults() {
 	$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
 
@@ -204,9 +225,11 @@ fw_zone() {
 
 	config_get name $1 name
 	config_get network $1 network
-	config_get masq $1 masq
-	load_policy $1
+	config_get_bool masq $1 masq "0"
+	config_get_bool conntrack $1 conntrack "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"
 	fw_custom_chains_zone "$name"
@@ -222,6 +245,7 @@ fw_rule() {
 	local dest_ip
 	local dest_port
 	local proto
+	local icmp_type
 	local target
 	local ruleset
 
@@ -233,6 +257,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
 
@@ -255,6 +280,7 @@ fw_rule() {
 	add_rule() {
 		$IPTABLES -I $ZONE 1 \
 			${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} \
@@ -284,6 +310,10 @@ fw_forwarding() {
 	[ -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() {
@@ -393,6 +423,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=
 
@@ -400,29 +438,25 @@ 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
 	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
 }