diff --git a/init.d/openwrt/functions b/init.d/openwrt/functions index e20ad69..d3f46e2 100644 --- a/init.d/openwrt/functions +++ b/init.d/openwrt/functions @@ -1,59 +1,129 @@ -. /lib/functions/network.sh +# init script functions library for desktop linux systems [ -n "$ZAPRET_BASE" ] || ZAPRET_BASE=/opt/zapret +# SHOULD EDIT config . "$ZAPRET_BASE/config" -[ -n "$QNUM" ] || QNUM=200 -[ -n "$TPPORT" ] || TPPORT=988 -[ -n "$WS_USER" ] || WS_USER=daemon -TPWS_LOCALHOST4=127.0.0.127 -[ -n "$DESYNC_MARK" ] || DESYNC_MARK=0x40000000 -[ -n "$OPENWRT_LAN" ] || OPENWRT_LAN=lan +exists() +{ + which "$1" >/dev/null 2>/dev/null +} +existf() +{ + type "$1" >/dev/null 2>/dev/null +} +is_linked_to_busybox() +{ + local IFS F P + + IFS=: + for path in $PATH; do + F=$path/$1 + P="$(readlink $F)" + if [ -z "$P" ] && [ -x $F ] && [ ! -L $F ]; then return 1; fi + [ "${P%busybox*}" != "$P" ] && return + done +} +user_exists() +{ + id -u $1 >/dev/null 2>/dev/null +} +useradd_compat() +{ + # $1 - username -# max wait time for the link local ipv6 on the LAN interface -LINKLOCAL_WAIT_SEC=5 + # skip for readonly systems + [ -w "/etc" ] && { + if exists useradd ; then + useradd --no-create-home --system --shell /bin/false $1 + elif is_linked_to_busybox adduser ; then + # busybox has special adduser syntax + adduser -S -H -D $1 + elif exists adduser; then + adduser --no-create-home --system --disabled-login $1 + fi + } + user_exists $1 +} +prepare_user() +{ + # $WS_USER is required to prevent redirection of the traffic originating from TPWS itself + # otherwise infinite loop will occur + # also its good idea not to run tpws as root + user_exists $WS_USER || { + # fallback to daemon if we cant add WS_USER + useradd_compat $WS_USER || { + for user in daemon nobody; do + user_exists $user && { + WS_USER=$user + return 0 + } + done + return 1 + } + } +} +# this complex user selection allows to survive in any locked/readonly/minimalistic environment +[ -n "$WS_USER" ] || WS_USER=tpws +if prepare_user; then + USEROPT="--user=$WS_USER" +else + WS_USER=1 + USEROPT="--uid $WS_USER:$WS_USER" +fi + +PIDDIR=/var/run IPSET_CR="$ZAPRET_BASE/ipset/create_ipset.sh" -CUSTOM_SCRIPT="$ZAPRET_BASE/init.d/openwrt/custom" -[ -f "$CUSTOM_SCRIPT" ] && . "$CUSTOM_SCRIPT" - -IPSET_EXCLUDE="-m set ! --match-set nozapret" -IPSET_EXCLUDE6="-m set ! --match-set nozapret6" - +[ -n "$QNUM" ] || QNUM=200 +[ -n "$NFQWS" ] || NFQWS="$ZAPRET_BASE/nfq/nfqws" +NFQWS_OPT_BASE="$USEROPT --dpi-desync-fwmark=$DESYNC_MARK" NFQWS_OPT_DESYNC_HTTP="${NFQWS_OPT_DESYNC_HTTP:-$NFQWS_OPT_DESYNC}" NFQWS_OPT_DESYNC_HTTPS="${NFQWS_OPT_DESYNC_HTTPS:-$NFQWS_OPT_DESYNC}" NFQWS_OPT_DESYNC_HTTP6="${NFQWS_OPT_DESYNC_HTTP6:-$NFQWS_OPT_DESYNC_HTTP}" NFQWS_OPT_DESYNC_HTTPS6="${NFQWS_OPT_DESYNC_HTTPS6:-$NFQWS_OPT_DESYNC_HTTPS}" -exists() -{ - which "$1" >/dev/null 2>/dev/null -} -existf() -{ - type "$1" >/dev/null 2>/dev/null -} +[ -n "$TPPORT" ] || TPPORT=988 +[ -n "$TPWS" ] || TPWS="$ZAPRET_BASE/tpws/tpws" +TPWS_LOCALHOST4=127.0.0.127 +HOSTLIST="$ZAPRET_BASE/ipset/zapret-hosts.txt.gz" +[ -f "$HOSTLIST" ] || HOSTLIST="$ZAPRET_BASE/ipset/zapret-hosts.txt" +[ -f "$HOSTLIST" ] || HOSTLIST="$ZAPRET_BASE/ipset/zapret-hosts-user.txt" + +TPWS_OPT_BASE="$USEROPT" +TPWS_OPT_BASE4="--bind-addr=$TPWS_LOCALHOST4" +TPWS_OPT_BASE6="--bind-addr=::1" +TPWS_WAIT="--bind-wait-ifup=30 --bind-wait-ip=30" +TPWS_WAIT_SOCKS6="$TPWS_WAIT --bind-wait-ip-linklocal=30" +# first wait for lan to ifup, then wait for bind-wait-ip-linklocal seconds for link local address and bind-wait-ip for any ipv6 as the worst case +TPWS_OPT_BASE6_PRE="--bind-linklocal=prefer $TPWS_WAIT --bind-wait-ip-linklocal=3" + +[ -n "$DESYNC_MARK" ] || DESYNC_MARK=0x40000000 + +# max wait time for the link local ipv6 on the LAN interface +LINKLOCAL_WAIT_SEC=5 + +CUSTOM_SCRIPT="$ZAPRET_BASE/init.d/sysv/custom" +[ -f "$CUSTOM_SCRIPT" ] && . "$CUSTOM_SCRIPT" + +IPSET_EXCLUDE="-m set ! --match-set nozapret" +IPSET_EXCLUDE6="-m set ! --match-set nozapret6" -# can be multiple ipv6 outgoing interfaces -# uplink from isp, tunnelbroker, vpn, ... -# want them all. who knows what's the real one that blocks sites -# dont want any manual configuration - want to do it automatically -# standard network_find_wan[6] return only the first -# we use low level function from network.sh to avoid this limitation -# it can change theoretically and stop working +on_off_function() +{ + # $1 : function name on + # $2 : function name off + # $3 : 0 - off, 1 - on + local F="$1" + [ "$3" = "1" ] || F="$2" + shift + shift + shift + "$F" "$@" +} -network_find_wan_all() -{ - __network_ifstatus "$1" "" "[@.route[@.target='0.0.0.0' && !@.table]].interface" "" 10 2>/dev/null && return - network_find_wan $1 -} -network_find_wan6_all() -{ - __network_ifstatus "$1" "" "[@.route[@.target='::' && !@.table]].interface" "" 10 2>/dev/null && return - network_find_wan6 $1 -} ipt() { @@ -63,6 +133,10 @@ ipt_del() { iptables -C "$@" >/dev/null 2>/dev/null && iptables -D "$@" } +ipt_add_del() +{ + on_off_function ipt ipt_del "$@" +} ipt6() { ip6tables -C "$@" >/dev/null 2>/dev/null || ip6tables -I "$@" @@ -71,6 +145,10 @@ ipt6_del() { ip6tables -C "$@" >/dev/null 2>/dev/null && ip6tables -D "$@" } +ipt6_add_del() +{ + on_off_function ipt6 ipt6_del "$@" +} # there's no route_localnet for ipv6 # the best we can is to route to link local of the incoming interface @@ -80,212 +158,355 @@ ipt6_del() get_ipv6_linklocal() { - # $1 - interface name. if empty - any interface - if exists ip ; then - local dev - [ -n "$1" ] && dev="dev $1" - ip addr show $dev | sed -e 's/^.*inet6 \([^ ]*\)\/[0-9]* scope link.*$/\1/;t;d' | head -n 1 - else - ifconfig $1 | sed -re 's/^.*inet6 addr: ([^ ]*)\/[0-9]* Scope:Link.*$/\1/;t;d' | head -n 1 - fi + # $1 - interface name. if empty - any interface + local dev + [ -n "$1" ] && dev="dev $1" + ip addr show $dev | sed -e 's/^.*inet6 \([^ ]*\)\/[0-9]* scope link.*$/\1/;t;d' | head -n 1 } get_ipv6_global() { - # $1 - interface name. if empty - any interface - if exists ip ; then - local dev - [ -n "$1" ] && dev="dev $1" - ip addr show $dev | sed -e 's/^.*inet6 \([^ ]*\)\/[0-9]* scope global.*$/\1/;t;d' | head -n 1 - else - ifconfig $1 | sed -re 's/^.*inet6 addr: ([^ ]*)\/[0-9]* Scope:Global.*$/\1/;t;d' | head -n 1 - fi + # $1 - interface name. if empty - any interface + local dev + [ -n "$1" ] && dev="dev $1" + ip addr show $dev | sed -e 's/^.*inet6 \([^ ]*\)\/[0-9]* scope global.*$/\1/;t;d' | head -n 1 } +iface_is_up() +{ + # $1 - interface name + [ -f /sys/class/net/$1/operstate ] || return + local state + read state /dev/null + iptables -F input_rule_zapret + iptables -A input_rule_zapret -d $TPWS_LOCALHOST4 -j RETURN + iptables -A input_rule_zapret -d 127.0.0.0/8 -j DROP + for lan in $IFACE_LAN ; do + ipt INPUT -i $lan -j input_rule_zapret + sysctl -q -w net.ipv4.conf.$lan.route_localnet=1 + done + } +} +unprepare_tpws_fw4() +{ + [ -n "$IFACE_LAN" ] && { + for lan in $IFACE_LAN ; do + ipt_del INPUT -i $lan -j input_rule_zapret + sysctl -q -w net.ipv4.conf.$lan.route_localnet=0 + done + iptables -F input_rule_zapret 2>/dev/null + iptables -X input_rule_zapret 2>/dev/null + } +} +unprepare_tpws_fw() +{ + unprepare_tpws_fw4 +} - [ -n "$DNAT6_TARGET" ] || { - echo $DEVICE: no link local. getting global - DNAT6_TARGET=$(get_ipv6_global $DEVICE) - [ -n "$DNAT6_TARGET" ] || { - echo $DEVICE: could not get any address - DNAT6_TARGET=- - } - } - eval $DVAR="$DNAT6_TARGET" - } - [ -n "$2" ] && eval $2="$DNAT6_TARGET" + +print_op() +{ + if [ "$1" = "1" ]; then + echo "Adding ip$4tables rule for $3 : $2" + else + echo "Deleting ip$4tables rule for $3 : $2" + fi +} + +fw_tpws4() +{ + # $1 - 1 - add, 0 - del + # $2 - iptable filter for ipv4 + # $3 - tpws port + [ "$DISABLE_IPV4" = "1" ] || { + [ "$1" = 1 ] && prepare_tpws_fw4 + print_op $1 "$2" "tpws (port $3)" + for lan in $IFACE_LAN ; do + ipt_add_del $1 PREROUTING -t nat -i $lan -p tcp $2 $IPSET_EXCLUDE dst -j DNAT --to $TPWS_LOCALHOST4:$3 + done + if [ -n "$IFACE_WAN" ]; then + for wan in $IFACE_WAN; do + ipt_add_del $1 OUTPUT -t nat -o $wan -m owner ! --uid-owner $WS_USER -p tcp $2 $IPSET_EXCLUDE dst -j DNAT --to $TPWS_LOCALHOST4:$3 + done + else + ipt_add_del $1 OUTPUT -t nat -m owner ! --uid-owner $WS_USER -p tcp $2 $IPSET_EXCLUDE dst -j DNAT --to $TPWS_LOCALHOST4:$3 + fi + } +} +fw_tpws6() +{ + # $1 - 1 - add, 0 - del + # $2 - iptable filter for ipv6 + # $3 - tpws port + [ "$DISABLE_IPV6" = "1" ] || { + print_op $1 "$2" "tpws (port $3)" 6 + local DNAT6 + for lan in $IFACE_LAN ; do + dnat6_target $lan DNAT6 + [ "$DNAT6" != "-" ] && ipt6_add_del $1 PREROUTING -t nat -i $lan -p tcp $2 $IPSET_EXCLUDE6 dst -j DNAT --to [$DNAT6]:$3 + done + if [ -n "$IFACE_WAN" ]; then + for wan in $IFACE_WAN; do + ipt6_add_del $1 OUTPUT -t nat -o $wan -m owner ! --uid-owner $WS_USER -p tcp $2 $IPSET_EXCLUDE6 dst -j DNAT --to [::1]:$3 + done + else + ipt6_add_del $1 OUTPUT -t nat -m owner ! --uid-owner $WS_USER -p tcp $2 $IPSET_EXCLUDE6 dst -j DNAT --to [::1]:$3 + fi + } +} +fw_tpws() +{ + # $1 - 1 - add, 0 - del + # $2 - iptable filter for ipv4 + # $3 - iptable filter for ipv6 + # $4 - tpws port + fw_tpws4 $1 "$2" $4 + fw_tpws6 $1 "$3" $4 } fw_nfqws_pre4() { - # $1 - filter ipv4 - # $2 - queue number - - local DEVICE wan_iface - - [ "$DISABLE_IPV4" = "1" ] || { - network_find_wan_all wan_iface - for ext_iface in $wan_iface; do - network_get_device DEVICE $ext_iface - ipt PREROUTING -t mangle -i $DEVICE -p tcp $1 $IPSET_EXCLUDE src -j NFQUEUE --queue-num $2 --queue-bypass - done - } + # $1 - 1 - add, 0 - del + # $2 - iptable filter for ipv4 + # $3 - queue number + [ "$DISABLE_IPV4" = "1" ] || { + print_op $1 "$2" "nfqws prerouting (qnum $3)" + if [ -n "$IFACE_WAN" ]; then + for wan in $IFACE_WAN; do + ipt_add_del $1 PREROUTING -t mangle -i $wan -p tcp $2 $IPSET_EXCLUDE src -j NFQUEUE --queue-num $3 --queue-bypass + done + else + ipt_add_del $1 PREROUTING -t mangle -p tcp $2 $IPSET_EXCLUDE src -j NFQUEUE --queue-num $3 --queue-bypass + fi + } } fw_nfqws_pre6() { - # $1 - filter ipv6 - # $2 - queue number - - local DEVICE wan_iface - - [ "$DISABLE_IPV6" = "1" ] || { - network_find_wan6_all wan_iface - for ext_iface in $wan_iface; do - network_get_device DEVICE $ext_iface - ipt6 PREROUTING -t mangle -i $DEVICE -p tcp $1 $IPSET_EXCLUDE6 src -j NFQUEUE --queue-num $2 --queue-bypass - done - } + # $1 - 1 - add, 0 - del + # $2 - iptable filter for ipv6 + # $3 - queue number + [ "$DISABLE_IPV6" = "1" ] || { + print_op $1 "$2" "nfqws prerouting (qnum $3)" 6 + if [ -n "$IFACE_WAN" ]; then + for wan in $IFACE_WAN; do + ipt6_add_del $1 PREROUTING -t mangle -i $wan -p tcp $2 $IPSET_EXCLUDE6 src -j NFQUEUE --queue-num $3 --queue-bypass + done + else + ipt6_add_del $1 PREROUTING -t mangle -p tcp $2 $IPSET_EXCLUDE6 src -j NFQUEUE --queue-num $3 --queue-bypass + fi + } } fw_nfqws_pre() { - # $1 - filter ipv4 - # $2 - filter ipv6 - # $3 - queue number - - fw_nfqws_pre4 "$1" $3 - fw_nfqws_pre6 "$2" $3 + # $1 - 1 - add, 0 - del + # $2 - iptable filter for ipv4 + # $3 - iptable filter for ipv6 + # $4 - queue number + fw_nfqws_pre4 $1 "$2" $4 + fw_nfqws_pre6 $1 "$3" $4 } fw_nfqws_post4() { - # $1 - filter ipv4 - # $2 - queue number - - local DEVICE wan_iface - - [ "$DISABLE_IPV4" = "1" ] || { - network_find_wan_all wan_iface - for ext_iface in $wan_iface; do - network_get_device DEVICE $ext_iface - ipt POSTROUTING -t mangle -o $DEVICE -p tcp $1 $IPSET_EXCLUDE dst -j NFQUEUE --queue-num $2 --queue-bypass - done - } + # $1 - 1 - add, 0 - del + # $2 - iptable filter for ipv4 + # $3 - queue number + [ "$DISABLE_IPV4" = "1" ] || { + print_op $1 "$2" "nfqws postrouting (qnum $3)" + if [ -n "$IFACE_WAN" ]; then + for wan in $IFACE_WAN; do + ipt_add_del $1 POSTROUTING -t mangle -o $wan -p tcp $2 $IPSET_EXCLUDE dst -j NFQUEUE --queue-num $3 --queue-bypass + done + else + ipt_add_del $1 POSTROUTING -t mangle -p tcp $2 $IPSET_EXCLUDE dst -j NFQUEUE --queue-num $3 --queue-bypass + fi + } } fw_nfqws_post6() { - # $1 - filter ipv6 - # $2 - queue number - - local DEVICE wan_iface - - [ "$DISABLE_IPV6" = "1" ] || { - network_find_wan6_all wan_iface - for ext_iface in $wan_iface; do - network_get_device DEVICE $ext_iface - ipt6 POSTROUTING -t mangle -o $DEVICE -p tcp $1 $IPSET_EXCLUDE6 dst -j NFQUEUE --queue-num $2 --queue-bypass - done - } + # $1 - 1 - add, 0 - del + # $2 - iptable filter for ipv6 + # $3 - queue number + [ "$DISABLE_IPV6" = "1" ] || { + print_op $1 "$2" "nfqws postrouting (qnum $3)" 6 + if [ -n "$IFACE_WAN" ]; then + for wan in $IFACE_WAN; do + ipt6_add_del $1 POSTROUTING -t mangle -o $wan -p tcp $2 $IPSET_EXCLUDE6 dst -j NFQUEUE --queue-num $3 --queue-bypass + done + else + ipt6_add_del $1 POSTROUTING -t mangle -p tcp $2 $IPSET_EXCLUDE6 dst -j NFQUEUE --queue-num $3 --queue-bypass + fi + } } fw_nfqws_post() { - # $1 - filter ipv4 - # $2 - filter ipv6 - # $3 - queue number - - fw_nfqws_post4 "$1" $3 - fw_nfqws_post6 "$2" $3 + # $1 - 1 - add, 0 - del + # $2 - iptable filter for ipv4 + # $3 - iptable filter for ipv6 + # $4 - queue number + fw_nfqws_post4 $1 "$2" $4 + fw_nfqws_post6 $1 "$3" $4 } -IPT_OWNER="-m owner ! --uid-owner $WS_USER" -fw_tpws4() +run_daemon() { - # $1 - filter ipv6 - # $2 - tpws port + # $1 - daemon number : 1,2,3,... + # $2 - daemon + # $3 - daemon args + # use $PIDDIR/$DAEMONBASE$1.pid as pidfile - local DEVICE wan_iface - - [ "$DISABLE_IPV4" = "1" ] || { - network_find_wan_all wan_iface - for ext_iface in $wan_iface; do - network_get_device DEVICE $ext_iface - ipt OUTPUT -t nat -o $DEVICE $IPT_OWNER -p tcp $1 $IPSET_EXCLUDE dst -j DNAT --to $TPWS_LOCALHOST4:$2 - done - - # allow localnet route only to special tpws IP - iptables -N input_rule_zapret 2>/dev/null - ipt input_rule_zapret -d 127.0.0.0/8 -j DROP - ipt input_rule_zapret -d $TPWS_LOCALHOST4 -j RETURN - - for lan in $OPENWRT_LAN; do - network_get_device DEVICE $lan - [ -n "$DEVICE" ] || continue - ipt prerouting_rule -t nat -i $DEVICE -p tcp $1 $IPSET_EXCLUDE dst -j DNAT --to $TPWS_LOCALHOST4:$2 - ipt input_rule -i $DEVICE -j input_rule_zapret - sysctl -qw net.ipv4.conf.$DEVICE.route_localnet=1 - done - } + local DAEMONBASE=$(basename $2) + local PIDFILE=$PIDDIR/$DAEMONBASE$1.pid + echo "Starting daemon $1: $2 $3" + if exists start-stop-daemon ; then + start-stop-daemon -S -p "$PIDFILE" -m -b -x "$2" -- $3 + else + if [ -f "$PIDFILE" ] && pgrep -F "$PIDFILE" "$DAEMONBASE" >/dev/null; then + echo already running + else + "$2" $3 >/dev/null 2>/dev/null & + PID=$! + if [ -n "$PID" ]; then + echo $PID >$PIDFILE + else + echo could not start daemon $1 : $2 $3 + false + fi + fi + fi } -fw_tpws6() +stop_daemon() { - # $1 - filter ipv6 - # $2 - tpws port - - local DEVICE wan_iface DNAT6 - - [ "$DISABLE_IPV6" = "1" ] || { - network_find_wan6_all wan_iface - for ext_iface in $wan_iface; do - network_get_device DEVICE $ext_iface - ipt6 OUTPUT -t nat -o $DEVICE $IPT_OWNER -p tcp $1 $IPSET_EXCLUDE6 dst -j DNAT --to [::1]:$2 - done - for lan in $OPENWRT_LAN; do - network_get_device DEVICE $lan - [ -n "$DEVICE" ] || continue - dnat6_target $lan DNAT6 - [ "$DNAT6" != '-' ] && ipt6 PREROUTING -t nat -i $DEVICE -p tcp $1 $IPSET_EXCLUDE6 dst -j DNAT --to [$DNAT6]:$2 - done - } + # $1 - daemon number : 1,2,3,... + # $2 - daemon + # use $PIDDIR/$DAEMONBASE$1.pid as pidfile + local DAEMONBASE=$(basename $2) + local PIDFILE=$PIDDIR/$DAEMONBASE$1.pid + echo "Stopping daemon $1: $2" + if exists start-stop-daemon ; then + start-stop-daemon -K -p "$PIDFILE" -x "$2" + else + if [ -f "$PIDFILE" ]; then + read PID <"$PIDFILE" + kill $PID + rm -f "$PIDFILE" + else + echo no pidfile : $PIDFILE + fi + fi } -fw_tpws() +do_daemon() { - # $1 - filter ipv4 - # $2 - filter ipv6 - # $3 - tpws port - - fw_tpws4 "$1" $3 - fw_tpws6 "$2" $3 + # $1 - 1 - run, 0 - stop + on_off_function run_daemon stop_daemon "$@" } + +do_tpws() +{ + # $1 : 1 - run, 0 - stop + # $2 : daemon number + # $3 : daemon args + + [ "$DISABLE_IPV4" = "1" ] && [ "$DISABLE_IPV6" = "1" ] && return 0 + + local OPT="$TPWS_OPT_BASE" + + [ "$DISABLE_IPV4" = "1" ] || OPT="$OPT $TPWS_OPT_BASE4" + [ "$DISABLE_IPV6" = "1" ] || { + OPT="$OPT $TPWS_OPT_BASE6" + for lan in $IFACE_LAN; do + OPT="$OPT --bind-iface6=$lan $TPWS_OPT_BASE6_PRE" + done + } + + do_daemon $1 $2 "$TPWS" "$OPT $3" +} +do_tpws_socks() +{ + # $1 : 1 - run, 0 - stop + # $2 : daemon number + # $3 : daemon args + + [ "$DISABLE_IPV4" = "1" ] && [ "$DISABLE_IPV6" = "1" ] && return 0 + + local opt="$TPWS_OPT_BASE --socks" + + tpws_apply_socks_binds opt + + do_daemon $1 $2 "$TPWS" "$opt $3" +} + +do_nfqws() +{ + # $1 : 1 - run, 0 - stop + # $2 : daemon number + # $3 : daemon args + + do_daemon $1 $2 "$NFQWS" "$NFQWS_OPT_BASE $3" +} + + filter_apply_port_target() { # $1 - var name of iptables filter @@ -301,6 +522,7 @@ filter_apply_port_target() fi eval $1="\"\$$1 $f\"" } + filter_apply_ipset_target4() { # $1 - var name of ipv4 iptables filter @@ -322,6 +544,11 @@ filter_apply_ipset_target() filter_apply_ipset_target4 $1 filter_apply_ipset_target6 $2 } +filter_apply_hostlist_target() +{ + # $1 - var name of tpws or nfqws params + [ "$MODE_FILTER" = "hostlist" ] && eval $1="\"\$$1 --hostlist=$HOSTLIST\"" +} get_nfqws_qnums() { @@ -329,7 +556,7 @@ get_nfqws_qnums() # $2 - var name for ipv4 https # $3 - var name for ipv6 http # $4 - var name for ipv6 https - local _qn=x _qns=x _qn6=x _qns6=x + local _qn _qns _qn6 _qns6 [ "$DISABLE_IPV4" = "1" ] || { _qn=$QNUM @@ -353,99 +580,49 @@ get_nfqws_qnums() } [ "$NFQWS_OPT_DESYNC_HTTPS6" = "$NFQWS_OPT_DESYNC_HTTP6" ] && _qns6=$_qn6; } - eval $1=$_qn - eval $2=$_qns - eval $3=$_qn6 - eval $4=$_qns6 + [ "$MODE_HTTP" = 1 ] && { + eval $1=$_qn + eval $3=$_qn6 + } + [ "$MODE_HTTPS" = 1 ] && { + eval $2=$_qns + eval $4=$_qns6 + } } +tpws_apply_socks_binds() +{ + local o + + [ "$DISABLE_IPV4" = "1" ] || o="--bind-addr=127.0.0.1" + [ "$DISABLE_IPV6" = "1" ] || o="$o --bind-addr=::1" + + for lan in $IFACE_LAN; do + [ "$DISABLE_IPV4" = "1" ] || o="$o --bind-iface4=$lan $TPWS_WAIT" + [ "$DISABLE_IPV6" = "1" ] || o="$o --bind-iface6=$lan --bind-linklocal=unwanted $TPWS_WAIT_SOCKS6" + done + eval $1="\"\$$1 $o\"" +} + + create_ipset() { - echo "Creating ipset" - "$IPSET_CR" "$@" + echo "Creating ipset" + "$IPSET_CR" "$@" } -is_flow_offload_avail() + +zapret_do_firewall() { - # $1 = '' for ipv4, '6' for ipv6 - grep -q FLOWOFFLOAD /proc/net/ip$1_tables_targets -} -list_nfqws_rules() -{ - # $1 = '' for ipv4, '6' for ipv6 - ip$1tables -S POSTROUTING -t mangle | \ - grep -E "NFQUEUE --queue-num $QNUM --queue-bypass|NFQUEUE --queue-num $(($QNUM+1)) --queue-bypass|NFQUEUE --queue-num $(($QNUM+2)) --queue-bypass|NFQUEUE --queue-num $(($QNUM+3)) --queue-bypass" | \ - sed -re 's/^-A POSTROUTING (.*) -j NFQUEUE.*$/\1/' -e "s/-m mark ! --mark $DESYNC_MARK\/$DESYNC_MARK//" -} -reverse_nfqws_rule() -{ - sed -e 's/-o /-i /' -e 's/--dport /--sport /' -e 's/--dports /--sports /' -e 's/ dst$/ src/' -e 's/ dst / src /' -} -apply_flow_offloading_enable_rule() -{ - # $1 = '' for ipv4, '6' for ipv6 - local i off='-j FLOWOFFLOAD' - [ "$FLOWOFFLOAD" = "hardware" ] && off="$off --hw" - i="forwarding_rule_zapret -m comment --comment zapret_traffic_offloading_enable -m conntrack --ctstate RELATED,ESTABLISHED $off" - echo enabling ipv${1:-4} flow offloading : $i - ip$1tables -A $i -} -apply_flow_offloading_exempt_rule() -{ - # $1 = '' for ipv4, '6' for ipv6 - local i v - v=$1 - shift - i="forwarding_rule_zapret $@ -m comment --comment zapret_traffic_offloading_exemption -j RETURN" - echo applying ipv${v:-4} flow offloading exemption : $i - ip${v}tables -A $i -} -flow_offloading_exempt_v() -{ - # $1 = '' for ipv4, '6' for ipv6 + # $1 - 1 - add, 0 - del - is_flow_offload_avail $1 || return 0 - - ipt$1_del forwarding_rule -j forwarding_rule_zapret - ip$1tables -F forwarding_rule_zapret 2>/dev/null - ip$1tables -X forwarding_rule_zapret 2>/dev/null - - [ "$FLOWOFFLOAD" = 'software' -o "$FLOWOFFLOAD" = 'hardware' ] && { - ip$1tables -N forwarding_rule_zapret - - list_nfqws_rules $1 | - while read rule; do - apply_flow_offloading_exempt_rule "$1" $rule - done - - list_nfqws_rules $1 | grep -v "connbytes" | reverse_nfqws_rule | - while read rule; do - apply_flow_offloading_exempt_rule "$1" $rule - done - - apply_flow_offloading_enable_rule $1 - - ipt$1 forwarding_rule -j forwarding_rule_zapret - } - - return 0 -} -flow_offloading_exempt() -{ - [ "$DISABLE_IPV4" = "1" ] || flow_offloading_exempt_v - [ "$DISABLE_IPV6" = "1" ] || flow_offloading_exempt_v 6 -} - - -zapret_apply_firewall() -{ local first_packet_only="-m connbytes --connbytes-dir=original --connbytes-mode=packets --connbytes 1:4" local desync="-m mark ! --mark $DESYNC_MARK/$DESYNC_MARK" local f4 f6 qn qns qn6 qns6 # always create ipsets. ip_exclude ipset is required - create_ipset no-update + [ "$1" != "1" ] || create_ipset no-update case "${MODE}" in tpws) @@ -455,60 +632,123 @@ zapret_apply_firewall() filter_apply_port_target f4 f6=$f4 filter_apply_ipset_target f4 f6 - fw_tpws "$f4" "$f6" $TPPORT + fw_tpws $1 "$f4" "$f6" $TPPORT fi ;; nfqws) - # quite complex but we need to minimize nfqws processes to save RAM if [ ! "$MODE_HTTP" = "1" ] && [ ! "$MODE_HTTPS" = "1" ]; then echo both http and https are disabled. not applying redirection. else get_nfqws_qnums qn qns qn6 qns6 - if [ "$MODE_HTTP_KEEPALIVE" != "1" ] && [ $qn = $qns ]; then + if [ "$MODE_HTTP_KEEPALIVE" != "1" ] && [ -n "$qn" ] && [ "$qn" = "$qns" ]; then filter_apply_port_target f4 f4="$f4 $first_packet_only" filter_apply_ipset_target4 f4 - fw_nfqws_post4 "$f4 $desync" $qn + fw_nfqws_post4 $1 "$f4 $desync" $qn else - if [ "$MODE_HTTP" = "1" ]; then + if [ -n "$qn" ]; then f4="--dport 80" [ "$MODE_HTTP_KEEPALIVE" = "1" ] || f4="$f4 $first_packet_only" filter_apply_ipset_target4 f4 - fw_nfqws_post4 "$f4 $desync" $qn + fw_nfqws_post4 $1 "$f4 $desync" $qn fi - if [ "$MODE_HTTPS" = "1" ]; then + if [ -n "$qns" ]; then f4="--dport 443 $first_packet_only" filter_apply_ipset_target4 f4 - fw_nfqws_post4 "$f4 $desync" $qns + fw_nfqws_post4 $1 "$f4 $desync" $qns fi fi - if [ "$MODE_HTTP_KEEPALIVE" != "1" ] && [ $qn6 = $qns6 ]; then + if [ "$MODE_HTTP_KEEPALIVE" != "1" ] && [ -n "$qn6" ] && [ "$qn6" = "$qns6" ]; then filter_apply_port_target f6 f6="$f6 $first_packet_only" filter_apply_ipset_target6 f6 - fw_nfqws_post6 "$f6 $desync" $qn6 + fw_nfqws_post6 $1 "$f6 $desync" $qn6 else - if [ "$MODE_HTTP" = "1" ]; then + if [ -n "$qn6" ]; then f6="--dport 80" [ "$MODE_HTTP_KEEPALIVE" = "1" ] || f6="$f6 $first_packet_only" filter_apply_ipset_target6 f6 - fw_nfqws_post6 "$f6 $desync" $qn6 + fw_nfqws_post6 $1 "$f6 $desync" $qn6 fi - if [ "$MODE_HTTPS" = "1" ]; then + if [ -n "$qns6" ]; then f6="--dport 443 $first_packet_only" filter_apply_ipset_target6 f6 - fw_nfqws_post6 "$f6 $desync" $qns6 + fw_nfqws_post6 $1 "$f6 $desync" $qns6 fi fi fi ;; custom) - existf zapret_custom_firewall && zapret_custom_firewall + existf zapret_custom_firewall && zapret_custom_firewall $1 ;; esac - - flow_offloading_exempt + [ "$1" = 0 ] && unprepare_tpws_fw return 0 } +zapret_apply_firewall() +{ + zapret_do_firewall 1 "$@" +} +zapret_unapply_firewall() +{ + zapret_do_firewall 0 "$@" +} + +zapret_do_daemons() +{ + # $1 - 1 - run, 0 - stop + + local opt qn qns qn6 qns6 + + case "${MODE}" in + tpws) + opt="--port=$TPPORT $TPWS_OPT" + filter_apply_hostlist_target opt + do_tpws $1 1 "$opt" + ;; + tpws-socks) + opt="--port=$TPPORT $TPWS_OPT" + filter_apply_hostlist_target opt + do_tpws_socks $1 1 "$opt" + ;; + nfqws) + get_nfqws_qnums qn qns qn6 qns6 + [ -z "$qn" ] || { + opt="--qnum=$qn $NFQWS_OPT_DESYNC_HTTP" + filter_apply_hostlist_target opt + do_nfqws $1 1 "$opt" + } + [ -z "$qns" ] || [ "$qns" = "$qn" ] || { + opt="--qnum=$qns $NFQWS_OPT_DESYNC_HTTPS" + filter_apply_hostlist_target opt + do_nfqws $1 2 "$opt" + } + [ -z "$qn6" ] || [ "$qn6" = "$qn" ] || [ "$qn6" = "$qns" ] || { + opt="--qnum=$qn6 $NFQWS_OPT_DESYNC_HTTP6" + filter_apply_hostlist_target opt + do_nfqws $1 3 "$opt" + } + [ -z "$qns6" ] || [ "$qns6" = "$qn" ] || [ "$qns6" = "$qns" ] || [ "$qns6" = "$qn6" ] || { + opt="--qnum=$qns6 $NFQWS_OPT_DESYNC_HTTPS6" + filter_apply_hostlist_target opt + do_nfqws $1 4 "$opt" + } + ;; + custom) + existf zapret_custom_daemons && zapret_custom_daemons $1 + ;; + esac + + return 0 +} + +zapret_run_daemons() +{ + zapret_do_daemons 1 "$@" +} +zapret_stop_daemons() +{ + zapret_do_daemons 0 "$@" +} diff --git a/init.d/openwrt/zapret b/init.d/openwrt/zapret index ffda5b1..232ee59 100755 --- a/init.d/openwrt/zapret +++ b/init.d/openwrt/zapret @@ -121,27 +121,25 @@ start_service() { nfqws) # quite complex but we need to minimize nfqws processes to save RAM get_nfqws_qnums qn qns qn6 qns6 - [ "$DISABLE_IPV4" = "1" ] || { + [ -z "$qn" ] || { opt="--qnum=$qn $NFQWS_OPT_BASE $NFQWS_OPT_DESYNC_HTTP" filter_apply_hostlist_target opt run_daemon 1 "$NFQWS" "$opt" - [ "$qns" = "$qn" ] || { - opt="--qnum=$qns $NFQWS_OPT_BASE $NFQWS_OPT_DESYNC_HTTPS" - filter_apply_hostlist_target opt - run_daemon 2 "$NFQWS" "$opt" - } } - [ "$DISABLE_IPV6" = "1" ] || { - [ "$qn6" = "$qn" ] || [ "$qn6" = "$qns" ] || { - opt="--qnum=$qn6 $NFQWS_OPT_BASE $NFQWS_OPT_DESYNC_HTTP6" - filter_apply_hostlist_target opt - run_daemon 3 "$NFQWS" "$opt" - } - [ "$qns6" = "$qn" ] || [ "$qns6" = "$qns" ] || [ "$qns6" = "$qn6" ] || { - opt="--qnum=$qns6 $NFQWS_OPT_BASE $NFQWS_OPT_DESYNC_HTTPS6" - filter_apply_hostlist_target opt - run_daemon 4 "$NFQWS" "$opt" - } + [ -z "$qns" ] || [ "$qns" = "$qn" ] || { + opt="--qnum=$qns $NFQWS_OPT_BASE $NFQWS_OPT_DESYNC_HTTPS" + filter_apply_hostlist_target opt + run_daemon 2 "$NFQWS" "$opt" + } + [ -z "$qn6" ] || [ "$qn6" = "$qn" ] || [ "$qn6" = "$qns" ] || { + opt="--qnum=$qn6 $NFQWS_OPT_BASE $NFQWS_OPT_DESYNC_HTTP6" + filter_apply_hostlist_target opt + run_daemon 3 "$NFQWS" "$opt" + } + [ -z "$qns6" ] || [ "$qns6" = "$qn" ] || [ "$qns6" = "$qns" ] || [ "$qns6" = "$qn6" ] || { + opt="--qnum=$qns6 $NFQWS_OPT_BASE $NFQWS_OPT_DESYNC_HTTPS6" + filter_apply_hostlist_target opt + run_daemon 4 "$NFQWS" "$opt" } ;; custom) diff --git a/init.d/sysv/functions b/init.d/sysv/functions index a848499..d3f46e2 100644 --- a/init.d/sysv/functions +++ b/init.d/sysv/functions @@ -556,7 +556,7 @@ get_nfqws_qnums() # $2 - var name for ipv4 https # $3 - var name for ipv6 http # $4 - var name for ipv6 https - local _qn=x _qns=x _qn6=x _qns6=x + local _qn _qns _qn6 _qns6 [ "$DISABLE_IPV4" = "1" ] || { _qn=$QNUM @@ -580,10 +580,14 @@ get_nfqws_qnums() } [ "$NFQWS_OPT_DESYNC_HTTPS6" = "$NFQWS_OPT_DESYNC_HTTP6" ] && _qns6=$_qn6; } - eval $1=$_qn - eval $2=$_qns - eval $3=$_qn6 - eval $4=$_qns6 + [ "$MODE_HTTP" = 1 ] && { + eval $1=$_qn + eval $3=$_qn6 + } + [ "$MODE_HTTPS" = 1 ] && { + eval $2=$_qns + eval $4=$_qns6 + } } tpws_apply_socks_binds() @@ -637,37 +641,37 @@ zapret_do_firewall() echo both http and https are disabled. not applying redirection. else get_nfqws_qnums qn qns qn6 qns6 - if [ "$MODE_HTTP_KEEPALIVE" != "1" ] && [ $qn = $qns ]; then + if [ "$MODE_HTTP_KEEPALIVE" != "1" ] && [ -n "$qn" ] && [ "$qn" = "$qns" ]; then filter_apply_port_target f4 f4="$f4 $first_packet_only" filter_apply_ipset_target4 f4 fw_nfqws_post4 $1 "$f4 $desync" $qn else - if [ "$MODE_HTTP" = "1" ]; then + if [ -n "$qn" ]; then f4="--dport 80" [ "$MODE_HTTP_KEEPALIVE" = "1" ] || f4="$f4 $first_packet_only" filter_apply_ipset_target4 f4 fw_nfqws_post4 $1 "$f4 $desync" $qn fi - if [ "$MODE_HTTPS" = "1" ]; then + if [ -n "$qns" ]; then f4="--dport 443 $first_packet_only" filter_apply_ipset_target4 f4 fw_nfqws_post4 $1 "$f4 $desync" $qns fi fi - if [ "$MODE_HTTP_KEEPALIVE" != "1" ] && [ $qn6 = $qns6 ]; then + if [ "$MODE_HTTP_KEEPALIVE" != "1" ] && [ -n "$qn6" ] && [ "$qn6" = "$qns6" ]; then filter_apply_port_target f6 f6="$f6 $first_packet_only" filter_apply_ipset_target6 f6 fw_nfqws_post6 $1 "$f6 $desync" $qn6 else - if [ "$MODE_HTTP" = "1" ]; then + if [ -n "$qn6" ]; then f6="--dport 80" [ "$MODE_HTTP_KEEPALIVE" = "1" ] || f6="$f6 $first_packet_only" filter_apply_ipset_target6 f6 fw_nfqws_post6 $1 "$f6 $desync" $qn6 fi - if [ "$MODE_HTTPS" = "1" ]; then + if [ -n "$qns6" ]; then f6="--dport 443 $first_packet_only" filter_apply_ipset_target6 f6 fw_nfqws_post6 $1 "$f6 $desync" $qns6 @@ -711,27 +715,25 @@ zapret_do_daemons() ;; nfqws) get_nfqws_qnums qn qns qn6 qns6 - [ "$DISABLE_IPV4" = "1" ] || { + [ -z "$qn" ] || { opt="--qnum=$qn $NFQWS_OPT_DESYNC_HTTP" filter_apply_hostlist_target opt do_nfqws $1 1 "$opt" - [ "$qns" = "$qn" ] || { - opt="--qnum=$qns $NFQWS_OPT_DESYNC_HTTPS" - filter_apply_hostlist_target opt - do_nfqws $1 2 "$opt" - } } - [ "$DISABLE_IPV6" = "1" ] || { - [ "$qn6" = "$qn" ] || [ "$qn6" = "$qns" ] || { - opt="--qnum=$qn6 $NFQWS_OPT_DESYNC_HTTP6" - filter_apply_hostlist_target opt - do_nfqws $1 3 "$opt" - } - [ "$qns6" = "$qn" ] || [ "$qns6" = "$qns" ] || [ "$qns6" = "$qn6" ] || { - opt="--qnum=$qns6 $NFQWS_OPT_DESYNC_HTTPS6" - filter_apply_hostlist_target opt - do_nfqws $1 4 "$opt" - } + [ -z "$qns" ] || [ "$qns" = "$qn" ] || { + opt="--qnum=$qns $NFQWS_OPT_DESYNC_HTTPS" + filter_apply_hostlist_target opt + do_nfqws $1 2 "$opt" + } + [ -z "$qn6" ] || [ "$qn6" = "$qn" ] || [ "$qn6" = "$qns" ] || { + opt="--qnum=$qn6 $NFQWS_OPT_DESYNC_HTTP6" + filter_apply_hostlist_target opt + do_nfqws $1 3 "$opt" + } + [ -z "$qns6" ] || [ "$qns6" = "$qn" ] || [ "$qns6" = "$qns" ] || [ "$qns6" = "$qn6" ] || { + opt="--qnum=$qns6 $NFQWS_OPT_DESYNC_HTTPS6" + filter_apply_hostlist_target opt + do_nfqws $1 4 "$opt" } ;; custom)