diff options
| author | David Vazgenovich Shakaryan <dvshakaryan@gmail.com> | 2026-11-01 13:51:30 -0800 |
|---|---|---|
| committer | David Vazgenovich Shakaryan <dvshakaryan@gmail.com> | 2026-11-01 13:51:30 -0800 |
| commit | f688a0f4599e8e58ec2ba2ce3db4c09343483830 (patch) | |
| tree | 11e5cd9b5936d74c5e675d6871aced2abea64168 | |
| parent | d31a69a9dde0cc47030639e1f24a63c7d225a63c (diff) | |
| download | wg-netns-exec-f688a0f4599e8e58ec2ba2ce3db4c09343483830.tar.gz wg-netns-exec-f688a0f4599e8e58ec2ba2ce3db4c09343483830.tar.xz | |
significantly improve tap and dnat handling
| -rwxr-xr-x | wg-netns-exec | 191 |
1 files changed, 111 insertions, 80 deletions
diff --git a/wg-netns-exec b/wg-netns-exec index 0259e07..bfeb010 100755 --- a/wg-netns-exec +++ b/wg-netns-exec @@ -59,19 +59,113 @@ echo "config: $wg_conf" : ${netns:=$(LC_ALL=C tr -dc 'a-z0-9' < /dev/urandom | head -c 8)} wg_if="wg-${netns}" -((!${#tap_addrs[@]})) && tap_addrs=(10.0.0.1/32 fd00::1/64) -def_taddr= -def_taddr6= -for addr in "${tap_addrs[@]}"; do - addr="${addr%%/*}" - if [[ "${addr}" == *:* ]]; then - [[ -z "${def_taddr6}" ]] && def_taddr6="${addr%:1}:2" && - [[ -n "${def_taddr}" ]] && break - else - [[ -z "${def_taddr}" ]] && def_taddr="${addr%.1}.2" && - [[ -n "${def_taddr6}" ]] && break - fi -done +ADDR_RE=$( + t='([^][{}:./]+|\[[^][]*\]|\{[^{}]*\})' + a='any(/('$t'*))?' + b='(([.:/]|'$t')*\.(/|'$t')*):('$t'*)(/('$t'*))?' + c='(([./]|'$t')*):((\.|'$t')*)(/('$t'*))?' + d='(([.:/]|'$t')*)' + echo '^('$a'|'$b'|'$c'|'$d')$' +) +parse_addr() { + local __s="${1}" + local -n __addr="${2}" __port="${3}" + [[ -v 4 ]] && local -n __proto="${4}" || local __proto + + [[ "${__s}" =~ ^\ *(.*[^ ])?\ *$ ]]; __s="${BASH_REMATCH[1]}" + [[ "${__s}" =~ ${ADDR_RE} ]] || return 1 + __addr="${BASH_REMATCH[5]:-${BASH_REMATCH[15]:-${BASH_REMATCH[24]}}}" + __port="${BASH_REMATCH[10]:-${BASH_REMATCH[18]}}" + __proto="${BASH_REMATCH[3]:-${BASH_REMATCH[13]:-${BASH_REMATCH[22]}}}" + + [[ -z "${__proto}" || -v 4 ]] +} + +nft_pre= +nft_post= + +if ((enable_tap)); then + ((!${#tap_addrs[@]})) && tap_addrs=(10.0.0.1/32 fd00::1/64) + + printf -v nft_post '%s\n' \ + 'chain postrouting {' \ + 'type nat hook postrouting priority srcnat' \ + 'policy accept' \ + "oifname ${wg_if} masquerade" \ + '}' +else + tap_addrs=() +fi + +if ((${#dnat_rules[@]})); then + def_taddr= def_taddr6= + for addr in "${tap_addrs[@]}"; do + [[ "${addr}" == *:* && -n "${def_taddr6}" ]] && continue + + # doesn't handle rollover, not worth the complexity + if [[ "${addr}" == *:*.* ]]; then + def_taddr6="${addr%.*}.$((${addr##*.}+1))" + elif [[ "${addr}" == *:: ]]; then + [[ "${addr}" == *:*:*:*:*:*:*:: ]] && + def_taddr6="${addr%:}1" || + def_taddr6="${addr}1" + elif [[ "${addr}" == *:* ]]; then + def_taddr6="${addr%:*}:$( + printf '%x' "$((16#${addr##*:}+1))")" + elif [[ -z "${def_taddr}" ]]; then + def_taddr="${addr%.*}.$((${addr##*.}+1))" + fi + + [[ -n "${def_taddr}" && -n "${def_taddr6}" ]] && break + done + + printf -v nft_pre '%s\n' \ + 'chain prerouting {' \ + 'type nat hook prerouting priority dstnat' \ + 'policy accept' + for rule in "${dnat_rules[@]}"; do + saddr= sport= + daddr="${rule}" dport= proto= + taddr= tport= + + if [[ "${daddr}" =~ ^((.*)\ )?to\ (.*) ]]; then + daddr="${BASH_REMATCH[2]}" + taddr="${BASH_REMATCH[3]}" + fi + if [[ "${daddr}" =~ ^\ *from\ (.*)\ for\ (.*) || + "${daddr}" =~ ^\ *from\ (.*)() ]]; then + saddr="${BASH_REMATCH[1]}" + daddr="${BASH_REMATCH[2]}" + fi + + parse_addr "${daddr}" daddr dport proto || + die "invalid destination address in rule: ${rule}" + [[ -z "${saddr}" ]] || parse_addr "${saddr}" saddr sport || + die "invalid source address in rule: ${rule}" + [[ -z "${taddr}" ]] || parse_addr "${taddr}" taddr tport || + die "invalid target address in rule: ${rule}" + + [[ "${saddr}${daddr}${taddr}" == *:* ]] && ip6=1 || ip6= + [[ -n "${sport}${dport}${tport}" ]] && : "${proto:=tcp}" + printf -v r '%s' "iifname ${wg_if}" \ + "${saddr:+ ip${ip6:+6} saddr ${saddr}}" \ + "${daddr:+ ip${ip6:+6} daddr ${daddr}}" \ + "${proto:+ meta l4proto {${proto}\}}" \ + "${sport:+ th sport ${sport}}" \ + "${dport:+ th dport ${dport}}" + + tport="${tport:+:${tport}}" + ((!ip6)) && + d="${taddr:-${def_taddr}}" && + [[ -n "${d}" ]] && + nft_pre+="${r} dnat ip to ${d}${tport}"$'\n' + ((ip6)) || [[ -z "${saddr}${daddr}${taddr}" ]] && + d="${taddr:-${def_taddr6:+[${def_taddr6}]}}" && + [[ -n "${d}" ]] && + nft_pre+="${r} dnat ip6 to ${d}${tport}"$'\n' + done + nft_pre+='}' +fi run ip netns del "${netns}" 2>/dev/null run ip netns add "${netns}" @@ -101,78 +195,15 @@ if ((enable_tap)); then for addr in "${tap_addrs[@]}"; do run ip netns exec "${netns}" ip addr add "${addr}" dev tap0 done +fi +if [[ -n "${nft_pre}${nft_post}" ]]; then run ip netns exec "${netns}" sysctl -wq net.ipv4.conf.all.forwarding=1 run ip netns exec "${netns}" sysctl -wq net.ipv6.conf.all.forwarding=1 - - pre= - if ((${#dnat_rules[@]})); then - printf -v pre '%s\n' 'chain prerouting {' \ - 'type nat hook prerouting priority dstnat' \ - 'policy accept' - for daddr in "${dnat_rules[@]}"; do - saddr= sport= dport= proto= taddr= tport= - - if [[ "${daddr}" =~ ^((.*)\ +)?to\ +(.*) ]]; then - daddr="${BASH_REMATCH[2]}" - taddr="${BASH_REMATCH[3]}" - fi - if [[ "${daddr}" =~ ^\ *from\ +(.*)\ +for\ +(.*) || - "${daddr}" =~ ^\ *from\ +(.*)() - ]]; then - saddr="${BASH_REMATCH[1]}" - daddr="${BASH_REMATCH[2]}" - fi - - [[ "${daddr}" =~ ^\ *any\ *(/.*)?$ ]] && - daddr=":${BASH_REMATCH[1]}" - ip_re='(([^:]*\[[^]]*\]([^:]*\[[^]]*\])*)?[^:]*)' - [[ "${daddr}" =~ ^${ip_re}:?([^/]*)/?(.*) ]] - daddr="${BASH_REMATCH[1]}" - dport="${BASH_REMATCH[4]}" - proto="${BASH_REMATCH[5]}" - if [[ -n "${saddr}" ]]; then - [[ "${saddr}" =~ ^${ip_re}:?(.*) ]] - saddr="${BASH_REMATCH[1]}" - sport="${BASH_REMATCH[4]}" - fi - if [[ -n "${taddr}" ]]; then - [[ "${taddr}" =~ ^${ip_re}:?(.*) ]] - taddr="${BASH_REMATCH[1]}" - tport="${BASH_REMATCH[4]}" - fi - - [[ "${saddr}${daddr}${taddr}" == *:* ]] && - ip6=1 || ip6= - [[ -n "${sport}${dport}${tport}" ]] && - : "${proto:=tcp}" - printf -v r '%s' "iifname ${wg_if}" \ - "${saddr:+ ip${ip6:+6} saddr ${saddr}}" \ - "${daddr:+ ip${ip6:+6} daddr ${daddr}}" \ - "${proto:+ meta l4proto {${proto}\}}" \ - "${sport:+ th sport ${sport}}" \ - "${dport:+ th dport ${dport}}" - - tport="${tport:+:${tport}}" - ((!ip6)) && - d="${taddr:-${def_taddr}}" && - [[ -n "${d}" ]] && - pre+="${r} dnat ip to ${d}${tport}"$'\n' - ((ip6)) || [[ -z "${saddr}${daddr}${taddr}" ]] && - d="${taddr:-[${def_taddr6}]}" && - [[ -n "${d}" ]] && - pre+="${r} dnat ip6 to ${d}${tport}"$'\n' - done - pre+='}' - fi run ip netns exec "${netns}" nft -f - <<-EOF table inet nat { - ${pre} - chain postrouting { - type nat hook postrouting priority srcnat - policy accept - oifname ${wg_if} masquerade - } + ${nft_pre} + ${nft_post} } EOF run ip netns exec "${netns}" nft list ruleset |
