X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/adbb0c8af69d65e65544c9a74ef081019e41b5bb..4ccd13ebfa22d9ae1dee2091ee780147088d6eec:/package/firewall/files/uci_firewall.sh

diff --git a/package/firewall/files/uci_firewall.sh b/package/firewall/files/uci_firewall.sh
index 67662c1ac..8d7538201 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
@@ -43,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
@@ -90,8 +90,8 @@ addif() {
 	$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 -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"
@@ -113,8 +113,8 @@ delif() {
 	$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 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"
@@ -160,17 +160,17 @@ 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
@@ -197,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
 
@@ -253,7 +253,7 @@ fw_zone() {
 }
 
 fw_rule() {
-	local src 
+	local src
 	local src_ip
 	local src_mac
 	local src_port
@@ -287,15 +287,18 @@ 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
 	[ -n "$src" -a -z "$dest" ] && ZONE=zone_$src
 	[ -n "$src" -a -n "$dest" ] && ZONE=zone_${src}_forward
 	[ -n "$dest" ] && TARGET=zone_${dest}_$target
+
+	eval 'RULE_COUNT=$((++RULE_COUNT_'$ZONE'))'
+
 	add_rule() {
-		$IPTABLES -A $ZONE \
+		$IPTABLES -I $ZONE $RULE_COUNT \
 			${proto:+-p $proto} \
 			${icmp_type:+--icmp-type $icmp_type} \
 			${src_ip:+-s $src_ip} \
@@ -303,7 +306,7 @@ fw_rule() {
 			${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
@@ -340,9 +343,10 @@ 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_dip $1 src_dip
 	config_get src_port $1 src_port
 	config_get src_dport $1 src_dport
 	config_get src_mac $1 src_mac
@@ -351,27 +355,28 @@ 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" ] && { \
+	[ "$src_port_first" != "$src_port_last" ] && { \
 		src_port="$src_port_first:$src_port_last"; }
 
 	src_dport_first=${src_dport%-*}
 	src_dport_last=${src_dport#*-}
-	[ "$src_dport_first" -ne "$src_dport_last" ] && { \
+	[ "$src_dport_first" != "$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" ] && { \
+	[ "$dest_port_first" != "$dest_port_last" ] && { \
 		dest_port2="$dest_port_first:$dest_port_last"; }
 
 	add_rule() {
 		$IPTABLES -A zone_${src}_prerouting -t nat \
 			${proto:+-p $proto} \
 			${src_ip:+-s $src_ip} \
+			${src_dip:+-d $src_dip} \
 			${src_port:+--sport $src_port} \
 			${src_dport:+--dport $src_dport} \
 			${src_mac:+-m mac --mac-source $src_mac} \
@@ -384,7 +389,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
@@ -402,13 +407,53 @@ fw_include() {
 	[ -e $path ] && . $path
 }
 
+get_interface_zones() {
+	local interface="$2"
+	local name
+	local network
+	config_get name $1 name
+	config_get network $1 network
+	[ -z "$network" ] && network=$name 
+	for n in $network; do
+		[ "$n" = "$interface" ] && append add_zone "$name"
+	done
+}
+
+fw_event() {
+	local action="$1"
+	local interface="$2"
+	local ifname="$(sh -c ". /etc/functions.sh; include /lib/network; scan_interfaces; config_get "$interface" ifname")"
+	add_zone=
+	local up
+
+	[ -z "$ifname" ] && return 0
+	config_foreach get_interface_zones zone "$interface"
+	[ -z "$add_zone" ] && return 0
+
+	case "$action" in
+		ifup)
+			for z in $add_zone; do 
+				local loaded
+				config_get loaded core loaded
+				[ -n "$loaded" ] && addif "$interface" "$ifname" "$z"
+			done
+		;;
+		ifdown)
+			config_get up "$interface" up
+
+			for z in $ZONE; do 
+				[ "$up" == "1" ] && delif "$interface" "$ifname" "$z"
+			done
+		;;
+	esac
+}
+
 fw_addif() {
 	local up
 	local ifname
 	config_get up $1 up
-	config_get ifname $1 ifname
 	[ -n "$up" ] || return 0
-	(ACTION="ifup" INTERFACE="$1" . /etc/hotplug.d/iface/20-firewall)
+	fw_event ifup "$1"
 }
 
 fw_custom_chains() {
@@ -418,7 +463,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
@@ -464,10 +509,16 @@ fw_init() {
 	echo "Loading zone defaults"
 	config_foreach fw_zone_defaults zone
 	uci_set_state firewall core loaded 1
+	config_set core loaded 1
 	config_foreach fw_check_notrack zone
-	unset CONFIG_APPEND
-	config_load network
-	config_foreach fw_addif interface
+	INTERFACES="$(sh -c '
+		. /etc/functions.sh; config_load network
+		echo_up() { local up; config_get_bool up "$1" up 0; [ $up = 1 ] && echo "$1"; }
+		config_foreach echo_up interface
+	')"
+	for interface in $INTERFACES; do
+		fw_event ifup "$interface"
+	done
 }
 
 fw_stop() {