[package] firewall: initialize dest_port with src_dport if omitted in redirect sectio...

[openwrt/svn-archive/archive.git] / package / firewall / files / uci_firewall.sh

diff --git a/package/firewall/files/uci_firewall.sh b/package/firewall/files/uci_firewall.sh
index b71b25de7c184097e4798c5bc99102721fbe7c31..478b95c931aa2bdbfd9fcc1eca597ae7689c5415 100755 (executable)
--- 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
 # Copyright (C) 2008 John Crispin <blogic@openwrt.org>
 
 . /etc/functions.sh


@@ -43,12 +43,12 @@ load_policy() {
 
 create_zone() {
        local exists
 
 create_zone() {
        local exists

-       
+

        [ "$1" == "loopback" ] && return
 
        config_get exists $ZONE_LIST $1
        [ -n "$exists" ] && return
        [ "$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
 
        $IPTABLES -N zone_$1
        $IPTABLES -N zone_$1_MSSFIX


@@ -56,15 +56,15 @@ create_zone() {
        $IPTABLES -N zone_$1_DROP
        $IPTABLES -N zone_$1_REJECT
        $IPTABLES -N zone_$1_forward
        $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
        $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 network="$1"
        local ifname="$2"
 addif() {
        local network="$1"
        local ifname="$2"


@@ -90,12 +90,13 @@ 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}_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"
        uci_set_state firewall core "${network}_zone" "$zone"
        $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() {
 }
 
 delif() {


@@ -112,11 +113,12 @@ 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}_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"
        $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() {
 }
 
 load_synflood() {


@@ -158,17 +160,17 @@ fw_defaults() {
        load_policy "$1"
 
        echo 1 > /proc/sys/net/ipv4/tcp_syncookies
        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
        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
        do
                echo 0 > $f

-       done                                                                   
-       
+       done
+

        uci_revert_state firewall core
        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 INPUT DROP
        $IPTABLES -P OUTPUT DROP


@@ -195,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
        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
 
        echo "Adding custom chains"
        fw_custom_chains
 


@@ -216,6 +218,22 @@ fw_defaults() {
        fw_set_chain_policy FORWARD "$DEF_FORWARD"
 }
 
        fw_set_chain_policy FORWARD "$DEF_FORWARD"
 }
 

+fw_zone_defaults() {
+       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
+       [ "$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
 fw_zone() {
        local name
        local network


@@ -225,16 +243,17 @@ fw_zone() {
        config_get network $1 network
        config_get_bool masq $1 masq "0"
        config_get_bool conntrack $1 conntrack "0"
        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
 
        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() {
        fw_custom_chains_zone "$name"
 }
 
 fw_rule() {

-       local src 
+       local src

        local src_ip
        local src_mac
        local src_port
        local src_ip
        local src_mac
        local src_port


@@ -268,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"; }
        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
        ZONE=input
        TARGET=$target
        [ -z "$target" ] && target=DROP


@@ -276,7 +295,7 @@ fw_rule() {
        [ -n "$src" -a -n "$dest" ] && ZONE=zone_${src}_forward
        [ -n "$dest" ] && TARGET=zone_${dest}_$target
        add_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} \
                        ${proto:+-p $proto} \
                        ${icmp_type:+--icmp-type $icmp_type} \
                        ${src_ip:+-s $src_ip} \


@@ -284,7 +303,7 @@ fw_rule() {
                        ${src_mac:+-m mac --mac-source $src_mac} \
                        ${dest_ip:+-d $dest_ip} \
                        ${dest_port:+--dport $dest_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
        }
        [ "$proto" == "tcpudp" -o -z "$proto" ] && {
                proto=tcp


@@ -303,11 +322,9 @@ fw_forwarding() {
 
        config_get src $1 src
        config_get dest $1 dest
 
        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
        [ -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
 
        # propagate masq zone flag
        find_item "$src" $CONNTRACK_ZONES && append CONNTRACK_ZONES $dest


@@ -323,7 +340,7 @@ fw_redirect() {
        local dest_ip
        local dest_port dest_port2
        local proto
        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
        config_get src $1 src
        config_get src_ip $1 src_ip
        config_get src_port $1 src_port


@@ -334,7 +351,7 @@ fw_redirect() {
        config_get proto $1 proto
        [ -z "$src" -o -z "$dest_ip" ] && { \
                echo "redirect needs src and dest_ip"; return ; }
        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%-*}
        src_port_last=${src_port#*-}
        [ "$src_port_first" -ne "$src_port_last" ] && { \


@@ -345,7 +362,7 @@ fw_redirect() {
        [ "$src_dport_first" -ne "$src_dport_last" ] && { \
                src_dport="$src_dport_first:$src_dport_last"; }
 
        [ "$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" ] && { \
        dest_port_first=${dest_port2%-*}
        dest_port_last=${dest_port2#*-}
        [ "$dest_port_first" -ne "$dest_port_last" ] && { \


@@ -367,7 +384,7 @@ fw_redirect() {
                        ${src_port:+--sport $src_port} \
                        ${dest_port2:+--dport $dest_port2} \
                        ${src_mac:+-m mac --mac-source $src_mac} \
                        ${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
        }
        [ "$proto" == "tcpudp" -o -z "$proto" ] && {
                proto=tcp


@@ -401,7 +418,7 @@ fw_custom_chains() {
        $IPTABLES -N forwarding_rule
        $IPTABLES -N prerouting_rule -t nat
        $IPTABLES -N postrouting_rule -t nat
        $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
        $IPTABLES -A INPUT -j input_rule
        $IPTABLES -A OUTPUT -j output_rule
        $IPTABLES -A FORWARD -j forwarding_rule


@@ -444,6 +461,8 @@ fw_init() {
        config_foreach fw_rule rule
        echo "Loading includes"
        config_foreach fw_include include
        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
        uci_set_state firewall core loaded 1
        config_foreach fw_check_notrack zone
        unset CONFIG_APPEND