X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/3056e3c10bd31f5dda5d484efccde8fb5683860c..2bb798169d0ed5dc2b3d9b21a417a0d606c94994:/package/firewall/files/uci_firewall.sh

diff --git a/package/firewall/files/uci_firewall.sh b/package/firewall/files/uci_firewall.sh
index a09e7079c..f6fa82b9c 100755
--- a/package/firewall/files/uci_firewall.sh
+++ b/package/firewall/files/uci_firewall.sh
@@ -41,6 +41,7 @@ create_zone() {
 	config_set $ZONE_LIST $1 1 
 
 	$IPTABLES -N zone_$1
+	$IPTABLES -N zone_$1_MSSFIX
 	$IPTABLES -N zone_$1_ACCEPT
 	$IPTABLES -N zone_$1_DROP
 	$IPTABLES -N zone_$1_REJECT
@@ -54,37 +55,56 @@ create_zone() {
 }
 
 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_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
+	uci_set_state firewall core "${network}_ifname" "$ifname"
+	uci_set_state firewall core "${network}_zone" "$zone"
 }
 
 delif() {
-	logger "removing $1 from firewall zone $2"
-	$IPTABLES -D input -i $1 -j zone_$2
-	$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"
 }
 
 load_synflood() {
@@ -134,22 +154,22 @@ fw_defaults() {
 	$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
+
+	config_get_bool drop_invalid $1 drop_invalid 1
+
+	[ "$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
+	}
+
 	$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 -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
 	$IPTABLES -A FORWARD -m state --state RELATED,ESTABLISHED -j ACCEPT
-	
+
 	$IPTABLES -A INPUT -i lo -j ACCEPT
 	$IPTABLES -A OUTPUT -o lo -j ACCEPT
 
@@ -157,6 +177,9 @@ 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
 
 	$IPTABLES -N input
 	$IPTABLES -N output
@@ -170,9 +193,6 @@ fw_defaults() {
 	$IPTABLES -A reject -p tcp -j REJECT --reject-with tcp-reset
 	$IPTABLES -A reject -j REJECT --reject-with icmp-port-unreachable
 
-	echo "Adding custom chains"
-	fw_custom_chains
-
 	fw_set_chain_policy INPUT "$DEF_INPUT"
 	fw_set_chain_policy OUTPUT "$DEF_OUTPUT"
 	fw_set_chain_policy FORWARD "$DEF_FORWARD"
@@ -217,9 +237,22 @@ fw_rule() {
 	config_get target $1 target
 	config_get ruleset $1 ruleset
 
+	src_port_first=${src_port%-*}
+	src_port_last=${src_port#*-}
+	[ "$src_port_first" -ne "$src_port_last" ] && { \
+		src_port="$src_port_first:$src_port_last"; }
+
+	dest_port_first=${dest_port%-*}
+	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" ] && ZONE=zone_$src || ZONE=input
-	[ -n "$dest" ] && TARGET=zone_${dest}_$target || TARGET=$target
+	[ -n "$src" -a -z "$dest" ] && ZONE=zone_$src
+	[ -n "$src" -a -n "$dest" ] && ZONE=zone_${src}_forward
+	[ -n "$dest" ] && TARGET=zone_${dest}_$target
 	add_rule() {
 		$IPTABLES -I $ZONE 1 \
 			${proto:+-p $proto} \
@@ -247,9 +280,11 @@ 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
 }
 
 fw_redirect() {
@@ -354,9 +389,9 @@ fw_custom_chains_zone() {
 	$IPTABLES -N input_${zone}
 	$IPTABLES -N forwarding_${zone}
 	$IPTABLES -N prerouting_${zone} -t nat
-	$IPTABLES -A zone_${zone} -j input_${zone}
-	$IPTABLES -A zone_${zone}_forward -j forwarding_${zone}
-	$IPTABLES -A zone_${zone}_prerouting -t nat -j prerouting_${zone}
+	$IPTABLES -I zone_${zone} 1 -j input_${zone}
+	$IPTABLES -I zone_${zone}_forward 1 -j forwarding_${zone}
+	$IPTABLES -I zone_${zone}_prerouting 1 -t nat -j prerouting_${zone}
 }
 
 fw_init() {
@@ -382,9 +417,7 @@ fw_init() {
 
 fw_stop() {
 	$IPTABLES -F
-	$IPTABLES -t mangle -F
 	$IPTABLES -t nat -F
-	$IPTABLES -t mangle -X
 	$IPTABLES -t nat -X
 	$IPTABLES -X
 	$IPTABLES -P INPUT ACCEPT