Fix VPS host persistence and direct WAN routing in v111
This commit is contained in:
1 parent
411f95d6ba
commit
b854d3a001
20 files changed
+2097
-49
No files matched your search
@@ -9,6 +9,10 @@ config remote 'main'
|
||||
option xray_bin '/usr/bin/xray'
|
||||
option xray_config '/etc/xray/owrt-remote-client.json'
|
||||
option vps_host ''
|
||||
option vps_host_mode 'manual'
|
||||
option wan_direct '0'
|
||||
option wan_interface 'wan'
|
||||
option wan_dns ''
|
||||
option vps_port '8443'
|
||||
option vless_uuid ''
|
||||
option vless_encryption 'none'
|
||||
|
||||
@@ -82,6 +82,7 @@ reload_service() {
|
||||
|
||||
stop_service() {
|
||||
stop_xray_processes
|
||||
/usr/sbin/owrt-remote wan-cleanup >/dev/null 2>&1 || true
|
||||
}
|
||||
|
||||
service_triggers() {
|
||||
|
||||
@@ -0,0 +1,366 @@
|
||||
#!/bin/sh
|
||||
# Private routing state for router-originated Remote traffic only. No LAN,
|
||||
# dnsmasq, Podkop configuration or sing-box service is modified.
|
||||
WAN_STATE="${TMPDIR:-/tmp}/owrt-remote-wan"
|
||||
# BusyBox ip accepts a limited range of table IDs; stay below 256.
|
||||
WAN_TABLE=210
|
||||
WAN_PRIORITY=104
|
||||
# Only used to recognize and remove the previous implementation's rules.
|
||||
WAN_MARK=0x40000000
|
||||
PODKOP_BYPASS_MARK=0x00200000
|
||||
|
||||
wan_ip_literal() {
|
||||
[ -n "$1" ] || return 1
|
||||
case "$1" in
|
||||
*:* ) printf '%s' "$1" | grep -Eq '^[0-9a-fA-F:]+$' ;;
|
||||
*) printf '%s' "$1" | awk -F. 'NF != 4 { exit 1 } { for (i=1;i<=4;i++) if ($i !~ /^[0-9]+$/ || $i > 255) exit 1 }' ;;
|
||||
esac
|
||||
}
|
||||
|
||||
wan_url_host() {
|
||||
local authority
|
||||
authority="${1#*://}"
|
||||
authority="${authority%%/*}"
|
||||
case "$authority" in
|
||||
\[*\]*) authority="${authority#\[}"; printf '%s' "${authority%%\]*}" ;;
|
||||
*) printf '%s' "${authority%%:*}" ;;
|
||||
esac
|
||||
}
|
||||
|
||||
wan_url_port() {
|
||||
local authority port
|
||||
authority="${1#*://}"; authority="${authority%%/*}"
|
||||
case "$authority" in
|
||||
\[*\]:*) port="${authority##*\]:}" ;;
|
||||
*:* ) port="${authority##*:}" ;;
|
||||
*) case "$1" in https://*) port=443 ;; *) port=80 ;; esac ;;
|
||||
esac
|
||||
port="$(safe_num "$port" 0)"
|
||||
[ "$port" -gt 0 ] && [ "$port" -le 65535 ] || return 1
|
||||
printf '%s' "$port"
|
||||
}
|
||||
|
||||
wan_device() {
|
||||
local iface device
|
||||
iface="${OWRT_REMOTE_WAN_INTERFACE:-$(uci_get wan_interface wan)}"
|
||||
device="$(ubus call "network.interface.$iface" status 2>/dev/null | jsonfilter -e '@.l3_device' 2>/dev/null)"
|
||||
[ -n "$device" ] || return 1
|
||||
case "$device" in *[!a-zA-Z0-9_.:-]*) return 1 ;; esac
|
||||
printf '%s' "$device"
|
||||
}
|
||||
|
||||
wan_dns_server() {
|
||||
local dns
|
||||
dns="$(uci_get wan_dns '')"
|
||||
if [ -z "$dns" ]; then
|
||||
dns="$(ubus call "network.interface.$(uci_get wan_interface wan)" status 2>/dev/null | jsonfilter -e '@["dns-server"][0]' 2>/dev/null)"
|
||||
fi
|
||||
[ -n "$dns" ] || dns=1.1.1.1
|
||||
wan_ip_literal "$dns" || return 1
|
||||
case "$dns" in 127.*|::1) dns=1.1.1.1 ;; esac
|
||||
printf '%s' "$dns"
|
||||
}
|
||||
|
||||
wan_resolve_host() {
|
||||
local host dns answer cache now saved_ts saved_ip
|
||||
host="$1"
|
||||
wan_ip_literal "$host" && { printf '%s' "$host"; return; }
|
||||
case "$host" in ''|*[!a-zA-Z0-9_.-]*) return 1 ;; esac
|
||||
dns="$(wan_dns_server)" || return 1
|
||||
cache="$WAN_STATE/resolve-$(safe_id "$host-$dns")"
|
||||
now="$(date +%s)"
|
||||
saved_ts=0; saved_ip=''
|
||||
[ ! -r "$cache" ] || read -r saved_ts saved_ip <"$cache"
|
||||
if [ -n "$saved_ip" ] && [ $((now - saved_ts)) -lt 300 ]; then
|
||||
printf '%s' "$saved_ip"; return
|
||||
fi
|
||||
# Query WAN's resolver explicitly, never the local dnsmasq/sing-box resolver.
|
||||
answer="$(nslookup -timeout=3 -retry=1 "$host" "$dns" 2>/dev/null | awk '
|
||||
/^Name:/ { in_answer=1 }
|
||||
in_answer && /^Address([[:space:]][0-9]+)?:/ {
|
||||
for (i=2;i<=NF;i++) if ($i ~ /^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/) { print $i; exit }
|
||||
}')"
|
||||
case "$answer" in 198.18.*|198.19.*) answer='' ;; esac
|
||||
if wan_ip_literal "$answer"; then
|
||||
mkdir -p "$WAN_STATE"
|
||||
printf '%s %s\n' "$now" "$answer" >"$cache.tmp.$$"
|
||||
mv "$cache.tmp.$$" "$cache"
|
||||
printf '%s' "$answer"; return
|
||||
fi
|
||||
if [ -n "$saved_ip" ] && [ $((now - saved_ts)) -lt 3600 ]; then
|
||||
log "WAN DNS unavailable for $host; using last successful WAN address $saved_ip"
|
||||
printf '%s' "$saved_ip"; return
|
||||
fi
|
||||
log "WAN DNS failed: host=$host resolver=$dns"
|
||||
return 1
|
||||
}
|
||||
|
||||
wan_endpoint_ip() {
|
||||
local host pinned
|
||||
host="$(wan_url_host "$1")"
|
||||
pinned="$(uci_get vps_host '')"
|
||||
# Preserve HTTP Host and TLS SNI while connecting to the manually pinned VPS.
|
||||
if ! wan_ip_literal "$host" && [ "$(vps_host_mode)" = manual ] && wan_ip_literal "$pinned"; then
|
||||
printf '%s' "$pinned"
|
||||
else
|
||||
wan_resolve_host "$host"
|
||||
fi
|
||||
}
|
||||
|
||||
wan_owned_rule_pattern() {
|
||||
# iif lo selects locally originated traffic, never forwarded LAN packets.
|
||||
printf '^%s:[[:space:]]*from all (fwmark %s(/0xffffffff)?|to [0-9a-fA-F:.]+(/32|/128)? iif lo) lookup %s[[:space:]]*$' "$WAN_PRIORITY" "$WAN_MARK" "$WAN_TABLE"
|
||||
}
|
||||
|
||||
wan_address_key() {
|
||||
# Compare IPv6 rules even when ip prints a different compression/zero form.
|
||||
printf '%s\n' "${1%%/*}" | awk '
|
||||
/:/ {
|
||||
s=tolower($0); split(s, halves, "::")
|
||||
left=split(halves[1], a, ":"); right=split(halves[2], b, ":")
|
||||
for(i=1;i<=left;i++) parts[++n]=a[i]
|
||||
if(index(s,"::")) for(i=left+right;i<8;i++) parts[++n]="0"
|
||||
for(i=1;i<=right;i++) parts[++n]=b[i]
|
||||
for(i=1;i<=n;i++) { sub(/^0+/, "", parts[i]); if(parts[i]=="") parts[i]="0"; printf "%s%s", i==1?"":":", parts[i] }
|
||||
print ""; next
|
||||
}
|
||||
{ print }
|
||||
'
|
||||
}
|
||||
|
||||
wan_destination_addresses() {
|
||||
ip -"$1" rule show | grep -E "$(wan_owned_rule_pattern)" | awk '{ for(i=1;i<NF;i++) if($i=="to") print $(i+1) }'
|
||||
}
|
||||
|
||||
wan_has_destination_rule() {
|
||||
local family key old
|
||||
family="$1"; key="$(wan_address_key "$2")"
|
||||
for old in $(wan_destination_addresses "$family"); do
|
||||
[ "$(wan_address_key "$old")" != "$key" ] || return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
wan_remove_legacy_rules() {
|
||||
# Match the complete old selector before each deletion, including duplicates.
|
||||
# A different mark mask/source/interface belongs to another application.
|
||||
while ip -"$1" rule show 2>/dev/null | grep -Eq "^$WAN_PRIORITY:[[:space:]]*from all fwmark $WAN_MARK(/0xffffffff)? lookup $WAN_TABLE[[:space:]]*$"; do
|
||||
ip -"$1" rule del priority "$WAN_PRIORITY" fwmark "$WAN_MARK" table "$WAN_TABLE" || return 1
|
||||
done
|
||||
}
|
||||
|
||||
wan_xray_addresses() {
|
||||
local config tag address
|
||||
config="$(uci_get xray_config /etc/xray/owrt-remote-client.json)"
|
||||
[ -r "$config" ] || return 0
|
||||
# Retain the address of the running tunnel until its config is regenerated.
|
||||
for tag in vps-interconn vps-ssh-interconn; do
|
||||
address="$(jsonfilter -i "$config" -e "@.outbounds[@.tag=\"$tag\"].settings.address" 2>/dev/null)"
|
||||
if wan_ip_literal "$address"; then printf '%s\n' "$address"; fi
|
||||
done
|
||||
}
|
||||
|
||||
wan_apply_destination_rules() {
|
||||
local dns endpoints targets keys address family old key
|
||||
dns="$1"; endpoints="$2"
|
||||
targets="$WAN_STATE/targets.new.$$"; keys="$WAN_STATE/target-keys.$$"
|
||||
{
|
||||
printf '%s\n' "$dns"
|
||||
[ ! -r "$endpoints" ] || awk 'NF { print $1 }' "$endpoints"
|
||||
wan_xray_addresses
|
||||
if [ "${3:-0}" = 1 ]; then
|
||||
wan_destination_addresses 4
|
||||
wan_destination_addresses 6
|
||||
fi
|
||||
} | awk 'NF && !seen[$0]++' >"$targets"
|
||||
: >"$keys"
|
||||
while read -r address; do
|
||||
address="${address%%/*}"
|
||||
wan_ip_literal "$address" || return 1
|
||||
case "$address" in *:*) family=6 ;; *) family=4 ;; esac
|
||||
key="$(wan_address_key "$address")"
|
||||
printf '%s\n' "$key" >>"$keys"
|
||||
if ! wan_has_destination_rule "$family" "$address"; then
|
||||
ip -"$family" rule add priority "$WAN_PRIORITY" iif lo to "$address" table "$WAN_TABLE" || return 1
|
||||
fi
|
||||
done <"$targets"
|
||||
# Add replacements first; remove obsolete addresses only after all succeed.
|
||||
for family in 4 6; do
|
||||
for old in $(wan_destination_addresses "$family"); do
|
||||
key="$(wan_address_key "$old")"
|
||||
if ! grep -Fqx "$key" "$keys"; then
|
||||
while ip -"$family" rule del priority "$WAN_PRIORITY" iif lo to "$old" table "$WAN_TABLE" 2>/dev/null; do :; done
|
||||
fi
|
||||
done
|
||||
# Migrate only the old Remote mark rule, never Podkop's own policy rules.
|
||||
wan_remove_legacy_rules "$family" || return 1
|
||||
done
|
||||
mv "$targets" "$WAN_STATE/targets"
|
||||
rm -f "$keys"
|
||||
}
|
||||
|
||||
wan_remove_legacy_firewall() {
|
||||
if nft list table inet owrt_remote_wan >/dev/null 2>&1; then
|
||||
nft delete table inet owrt_remote_wan || { log 'Cannot remove legacy Remote marking table'; return 1; }
|
||||
fi
|
||||
}
|
||||
|
||||
wan_check_table() {
|
||||
local family rules routes own error
|
||||
family="$1"
|
||||
rules="$(ip -"$family" rule show)" || return 1
|
||||
own="$(wan_owned_rule_pattern)"
|
||||
# Never reuse another service's policy priority or routing table.
|
||||
if printf '%s\n' "$rules" | grep -E "^$WAN_PRIORITY:|lookup $WAN_TABLE([[:space:]]|$)" | grep -Ev "$own" | grep -q .; then
|
||||
log "WAN IPv$family table $WAN_TABLE or priority $WAN_PRIORITY is already used by another rule"; return 1
|
||||
fi
|
||||
error="$WAN_STATE/table-error.$$"
|
||||
if ! routes="$(ip -"$family" route show table "$WAN_TABLE" 2>"$error")"; then
|
||||
# iproute2 returns an error for an empty, not-yet-created table.
|
||||
if ! grep -qi 'FIB table does not exist' "$error"; then
|
||||
cat "$error" >&2; rm -f "$error"; return 1
|
||||
fi
|
||||
fi
|
||||
rm -f "$error"
|
||||
if [ -n "$routes" ] && [ ! -f "$WAN_STATE/route-owner-$family" ] && ! printf '%s\n' "$rules" | grep -Eq "$own"; then
|
||||
log "WAN IPv$family table $WAN_TABLE is not empty and does not belong to Remote"; return 1
|
||||
fi
|
||||
}
|
||||
|
||||
wan_preflight() {
|
||||
local device tool
|
||||
for tool in ip nft ubus jsonfilter curl nslookup; do
|
||||
command -v "$tool" >/dev/null 2>&1 || { log "WAN direct requires $tool"; return 1; }
|
||||
done
|
||||
device="$(wan_device)" || { log "WAN interface is not ready: $(uci_get wan_interface wan)"; return 1; }
|
||||
case "$device" in tun*|sing*|podkop*) log "WAN direct cannot use a proxy/TUN device: $device"; return 1 ;; esac
|
||||
ip -4 route show table main default dev "$device" | grep -q '^default' || {
|
||||
log "WAN has no IPv4 default route on $device"; return 1
|
||||
}
|
||||
mkdir -p "$WAN_STATE"
|
||||
wan_check_table 4 || return 1
|
||||
if ip -6 rule show >/dev/null 2>&1; then wan_check_table 6 || return 1; fi
|
||||
}
|
||||
|
||||
wan_prepare_locked() {
|
||||
local device dns gateway family host ip url port
|
||||
wan_preflight || return 1
|
||||
device="$(wan_device)" || return 1
|
||||
dns="$(wan_dns_server)" || return 1
|
||||
# Use only routes belonging to the selected physical WAN, never a TUN default.
|
||||
for family in 4 6; do
|
||||
# Some OpenWrt kernels disable IPv6 completely; IPv4 Remote must still work.
|
||||
if [ "$family" = 6 ] && ! ip -6 rule show >/dev/null 2>&1; then continue; fi
|
||||
# Remember ownership before the first mutation, including partial failures.
|
||||
: >"$WAN_STATE/route-owner-$family"
|
||||
gateway="$(ip -"$family" route show table main default dev "$device" | awk 'NR==1 { for(i=1;i<NF;i++) if($i=="via") print $(i+1) }')"
|
||||
if ip -"$family" route show table main default dev "$device" | grep -q '^default'; then
|
||||
if [ -n "$gateway" ]; then
|
||||
ip -"$family" route replace default via "$gateway" dev "$device" onlink table "$WAN_TABLE" || return 1
|
||||
else
|
||||
ip -"$family" route replace default dev "$device" table "$WAN_TABLE" || return 1
|
||||
fi
|
||||
else
|
||||
ip -"$family" route flush table "$WAN_TABLE" 2>/dev/null || true
|
||||
fi
|
||||
# Do not fall through to a proxy route when the physical WAN is absent.
|
||||
# A default route wins over this terminal unreachable route while WAN is up.
|
||||
ip -"$family" route replace unreachable default metric 42760 table "$WAN_TABLE" || return 1
|
||||
done
|
||||
# Route DNS before resolving Hub, retaining existing tunnel/HTTP addresses.
|
||||
[ -e "$WAN_STATE/endpoints" ] || : >"$WAN_STATE/endpoints"
|
||||
wan_apply_destination_rules "$dns" "$WAN_STATE/endpoints" 1 || return 1
|
||||
wan_remove_legacy_firewall || return 1
|
||||
host="$(uci_get vps_host '')"
|
||||
ip="$(wan_resolve_host "$host")" || return 1
|
||||
port="$(safe_num "$(uci_get vps_port 8443)" 8443)"
|
||||
[ "$port" -gt 0 ] && [ "$port" -le 65535 ] || return 1
|
||||
printf '%s %s\n' "$ip" "$port" >"$WAN_STATE/endpoints.new.$$"
|
||||
# Include fallback web ports, with curl still verifying HTTPS certificates.
|
||||
for port in 80 443 8088; do printf '%s %s\n' "$ip" "$port" >>"$WAN_STATE/endpoints.new.$$"; done
|
||||
for url in "$(uci_get hub_url '')" "$(uci_get public_url '')"; do
|
||||
[ -n "$url" ] || continue
|
||||
ip="$(wan_endpoint_ip "$url")" || continue
|
||||
port="$(wan_url_port "$url")" || continue
|
||||
printf '%s %s\n' "$ip" "$port" >>"$WAN_STATE/endpoints.new.$$"
|
||||
done
|
||||
awk '!seen[$0]++' "$WAN_STATE/endpoints.new.$$" >"$WAN_STATE/endpoints.dedup.$$"
|
||||
mv "$WAN_STATE/endpoints.dedup.$$" "$WAN_STATE/endpoints.new.$$"
|
||||
wan_apply_destination_rules "$dns" "$WAN_STATE/endpoints.new.$$" || return 1
|
||||
mv "$WAN_STATE/endpoints.new.$$" "$WAN_STATE/endpoints"
|
||||
}
|
||||
|
||||
wan_prepare() (
|
||||
local try_num owner
|
||||
mkdir -p "$WAN_STATE"
|
||||
try_num=0
|
||||
while ! mkdir "$WAN_STATE/lock" 2>/dev/null; do
|
||||
owner="$(cat "$WAN_STATE/lock/pid" 2>/dev/null)"
|
||||
case "$owner" in ''|*[!0-9]*) ;; *)
|
||||
if ! kill -0 "$owner" 2>/dev/null; then
|
||||
rm -f "$WAN_STATE/lock/pid"
|
||||
rmdir "$WAN_STATE/lock" 2>/dev/null || true
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
try_num=$((try_num+1)); [ "$try_num" -lt 15 ] || return 1
|
||||
sleep 1
|
||||
done
|
||||
printf '%s' "$$" >"$WAN_STATE/lock/pid"
|
||||
trap 'rm -f "$WAN_STATE/lock/pid" "$WAN_STATE/endpoints.new.$$" "$WAN_STATE/endpoints.dedup.$$" "$WAN_STATE/targets.new.$$" "$WAN_STATE/target-keys.$$"; rmdir "$WAN_STATE/lock" 2>/dev/null || true' EXIT
|
||||
trap 'exit 1' INT TERM
|
||||
wan_prepare_locked
|
||||
)
|
||||
|
||||
wan_post_json() {
|
||||
local url token file host port ip device
|
||||
url="$1"; token="$2"; file="$3"
|
||||
host="$(wan_url_host "$url")"
|
||||
port="$(wan_url_port "$url")" || return 1
|
||||
ip="$(wan_endpoint_ip "$url")" || return 1
|
||||
device="$(wan_device)" || return 1
|
||||
# A resolver cache may expire between prepare and this request. Refresh
|
||||
# direct routes before sending to a newly resolved IP.
|
||||
if ! grep -Fqx "$ip $port" "$WAN_STATE/endpoints" 2>/dev/null; then
|
||||
wan_prepare || return 1
|
||||
grep -Fqx "$ip $port" "$WAN_STATE/endpoints" || return 1
|
||||
fi
|
||||
case "$ip" in *:*) ip="[$ip]" ;; esac
|
||||
# No redirect-following or certificate bypass; Host and SNI remain the URL's.
|
||||
curl -fsS --noproxy '*' --interface "$device" --connect-timeout 4 --max-time 10 \
|
||||
--resolve "$host:$port:$ip" \
|
||||
-H "Authorization: Bearer $token" -H 'Content-Type: application/json' \
|
||||
--data-binary "@$file" "$url"
|
||||
}
|
||||
|
||||
wan_cleanup() {
|
||||
local family owned address
|
||||
nft delete table inet owrt_remote_wan 2>/dev/null || true
|
||||
for family in 4 6; do
|
||||
owned=0
|
||||
if [ -f "$WAN_STATE/route-owner-$family" ] || ip -"$family" rule show 2>/dev/null | grep -Eq "$(wan_owned_rule_pattern)"; then owned=1; fi
|
||||
for address in $(wan_destination_addresses "$family"); do
|
||||
while ip -"$family" rule del priority "$WAN_PRIORITY" iif lo to "$address" table "$WAN_TABLE" 2>/dev/null; do :; done
|
||||
done
|
||||
wan_remove_legacy_rules "$family" 2>/dev/null || true
|
||||
if [ "$owned" = 1 ]; then ip -"$family" route flush table "$WAN_TABLE" 2>/dev/null || true; fi
|
||||
rm -f "$WAN_STATE/route-owner-$family"
|
||||
done
|
||||
# Only volatile resolver cache owned by this module.
|
||||
rm -f "$WAN_STATE"/resolve-* "$WAN_STATE/endpoints" "$WAN_STATE/targets"
|
||||
rm -f "$WAN_STATE/lock/pid"
|
||||
rmdir "$WAN_STATE/lock" "$WAN_STATE" 2>/dev/null || true
|
||||
}
|
||||
|
||||
wan_diagnostics() {
|
||||
printf 'vps_host=%s mode=%s WAN_direct=%s\n' "$(uci_get vps_host '')" "$(vps_host_mode)" "$(uci_get wan_direct 0)"
|
||||
printf 'WAN_device=%s WAN_DNS=%s\n' "$(wan_device)" "$(wan_dns_server)"
|
||||
printf 'System DNS (compare with WAN DNS):\n'
|
||||
nslookup -timeout=3 -retry=1 "$(wan_url_host "$(uci_get hub_url '')")" 2>&1 || true
|
||||
printf '\nWAN DNS:\n'
|
||||
nslookup -timeout=3 -retry=1 "$(wan_url_host "$(uci_get hub_url '')")" "$(wan_dns_server)" 2>&1 || true
|
||||
printf '\nRemote routes/rules:\n'
|
||||
ip -4 rule show
|
||||
ip -4 route show table "$WAN_TABLE"
|
||||
printf 'Remote does not create additional nftables marking rules.\n'
|
||||
}
|
||||
+84
-16
@@ -8,6 +8,7 @@ XRAY_RELEASE_BASE_URL="${XRAY_RELEASE_BASE_URL:-https://github.com/XTLS/Xray-cor
|
||||
|
||||
log() {
|
||||
printf '%s\n' "$*" >&2
|
||||
logger -t owrt-remote "$*" 2>/dev/null || true
|
||||
}
|
||||
|
||||
die() {
|
||||
@@ -26,6 +27,7 @@ usage() {
|
||||
owrt-remote run
|
||||
owrt-remote heartbeat
|
||||
owrt-remote heartbeat-loop
|
||||
owrt-remote network-diagnostics
|
||||
|
||||
Настройки лежат в /etc/config/owrtremote.
|
||||
EOF
|
||||
@@ -101,6 +103,20 @@ uci_set_if_changed() {
|
||||
return 0
|
||||
}
|
||||
|
||||
# Existing installations also default to manual: only an explicit opt-in may
|
||||
# let a heartbeat replace the administrator's tunnel endpoint.
|
||||
vps_host_mode() {
|
||||
case "$(uci_get vps_host_mode manual)" in
|
||||
auto) printf auto ;;
|
||||
*) printf manual ;;
|
||||
esac
|
||||
}
|
||||
|
||||
WAN_HELPER="${OWRT_REMOTE_WAN_HELPER:-/usr/lib/owrt-remote/wan.sh}"
|
||||
if [ -r "$WAN_HELPER" ]; then
|
||||
. "$WAN_HELPER"
|
||||
fi
|
||||
|
||||
host_model() {
|
||||
if [ -r /tmp/sysinfo/model ]; then
|
||||
cat /tmp/sysinfo/model
|
||||
@@ -507,6 +523,14 @@ render_client_config() {
|
||||
|
||||
router_id="$(safe_id "$(uci_get router_id main)")"
|
||||
vps_host="$(uci_get vps_host '')"
|
||||
local wan_sockopt
|
||||
wan_sockopt=''
|
||||
if truthy "$(uci_get wan_direct 0)"; then
|
||||
command -v wan_prepare >/dev/null 2>&1 || die "WAN helper missing: $WAN_HELPER"
|
||||
wan_prepare || die "не удалось подготовить прямое соединение через WAN"
|
||||
vps_host="$(wan_resolve_host "$vps_host")" || die "VPS host не разрешается через WAN DNS"
|
||||
wan_sockopt=", \"sockopt\": {\"mark\": $((PODKOP_BYPASS_MARK)), \"interface\": \"$(json_escape "$(wan_device)")\"}"
|
||||
fi
|
||||
vps_port="$(safe_num "$(uci_get vps_port 8443)" 8443)"
|
||||
uuid="$(uci_get vless_uuid '')"
|
||||
ssh_uuid="$(uci_get ssh_vless_uuid '')"
|
||||
@@ -567,7 +591,7 @@ render_client_config() {
|
||||
},
|
||||
"streamSettings": {
|
||||
"network": "tcp",
|
||||
"security": "none"
|
||||
"security": "none"$wan_sockopt
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -585,7 +609,7 @@ render_client_config() {
|
||||
},
|
||||
"streamSettings": {
|
||||
"network": "tcp",
|
||||
"security": "none"
|
||||
"security": "none"$wan_sockopt
|
||||
}
|
||||
}
|
||||
],
|
||||
@@ -678,6 +702,9 @@ heartbeat_json() {
|
||||
"ssh_host": $(json_string "$(uci_get ssh_host 127.0.0.1)"),
|
||||
"ssh_port": $(safe_num "$(uci_get ssh_port 22)" 22),
|
||||
"hub_url": $(json_string "$hub_url"),
|
||||
"vps_host": $(json_string "$(uci_get vps_host '')"),
|
||||
"vps_host_mode": $(json_string "$(vps_host_mode)"),
|
||||
"wan_direct": $(json_string "$(uci_get wan_direct 0)"),
|
||||
"uptime": $(safe_num "$(uptime_seconds)" 0),
|
||||
"load": $(json_string "$(load_text)"),
|
||||
"memory": $(json_string "$(memory_text)"),
|
||||
@@ -696,23 +723,27 @@ post_json() {
|
||||
url="$1"
|
||||
token="$2"
|
||||
file="$3"
|
||||
|
||||
if command -v wget >/dev/null 2>&1; then
|
||||
wget -q -O - \
|
||||
--header="Authorization: Bearer $token" \
|
||||
--header="Content-Type: application/json" \
|
||||
--post-file="$file" "$url"
|
||||
if truthy "$(uci_get wan_direct 0)"; then
|
||||
wan_post_json "$url" "$token" "$file"
|
||||
return
|
||||
fi
|
||||
|
||||
if command -v curl >/dev/null 2>&1; then
|
||||
curl -fsS \
|
||||
curl -fsS --connect-timeout 4 --max-time 10 --noproxy '*' \
|
||||
-H "Authorization: Bearer $token" \
|
||||
-H "Content-Type: application/json" \
|
||||
--data-binary "@$file" "$url"
|
||||
return
|
||||
fi
|
||||
if command -v wget >/dev/null 2>&1; then
|
||||
http_proxy= https_proxy= HTTP_PROXY= HTTPS_PROXY= ALL_PROXY= all_proxy= wget -q -T 10 -O - \
|
||||
--header="Authorization: Bearer $token" \
|
||||
--header="Content-Type: application/json" \
|
||||
--post-file="$file" "$url"
|
||||
return
|
||||
fi
|
||||
if command -v uclient-fetch >/dev/null 2>&1; then
|
||||
uclient-fetch -q -O - \
|
||||
http_proxy= https_proxy= HTTP_PROXY= HTTPS_PROXY= ALL_PROXY= all_proxy= uclient-fetch -q -T 10 -O - \
|
||||
--header="Authorization: Bearer $token" \
|
||||
--header="Content-Type: application/json" \
|
||||
--post-file="$file" "$url"
|
||||
@@ -760,12 +791,14 @@ heartbeat_candidate_endpoints() {
|
||||
}
|
||||
|
||||
heartbeat_apply_hub_update() {
|
||||
local response_file fallback_base next_hub_url next_public_url next_vps_host changed
|
||||
local response_file fallback_base next_hub_url next_public_url next_vps_host changed old_vps_host mode ignored_file ignored
|
||||
response_file="$1"
|
||||
fallback_base="$2"
|
||||
next_hub_url="$(json_extract_object_string "$response_file" hub_update hub_url)"
|
||||
next_public_url="$(json_extract_object_string "$response_file" hub_update public_url)"
|
||||
next_vps_host="$(json_extract_object_string "$response_file" hub_update vps_host)"
|
||||
old_vps_host="$(uci_get vps_host '')"
|
||||
mode="$(vps_host_mode)"
|
||||
[ -n "$next_hub_url" ] || next_hub_url="$fallback_base"
|
||||
changed=0
|
||||
if uci_set_if_changed hub_url "$next_hub_url"; then
|
||||
@@ -774,12 +807,26 @@ heartbeat_apply_hub_update() {
|
||||
if uci_set_if_changed public_url "$next_public_url"; then
|
||||
changed=1
|
||||
fi
|
||||
if uci_set_if_changed vps_host "$next_vps_host"; then
|
||||
changed=1
|
||||
if [ "$mode" = auto ]; then
|
||||
if uci_set_if_changed vps_host "$next_vps_host"; then
|
||||
changed=1
|
||||
fi
|
||||
elif [ -n "$next_vps_host" ] && [ "$old_vps_host" != "$next_vps_host" ]; then
|
||||
ignored_file="${TMPDIR:-/tmp}/owrt-remote-vps-host-ignored"
|
||||
ignored="$old_vps_host|$next_vps_host"
|
||||
if [ "$(cat "$ignored_file" 2>/dev/null)" != "$ignored" ]; then
|
||||
log "heartbeat kept vps_host: current=$old_vps_host proposed=$next_vps_host reason=manual"
|
||||
printf '%s' "$ignored" >"$ignored_file"
|
||||
fi
|
||||
fi
|
||||
[ "$changed" = "1" ] || return 0
|
||||
uci commit "$CONFIG" >/dev/null 2>&1 || true
|
||||
uci commit "$CONFIG" >/dev/null 2>&1 || return 1
|
||||
log "heartbeat updated hub settings: hub_url=$(uci_get hub_url '') public_url=$(uci_get public_url '') vps_host=$(uci_get vps_host '')"
|
||||
if [ "$mode" = auto ] && [ -n "$next_vps_host" ] && [ "$old_vps_host" != "$next_vps_host" ]; then
|
||||
log "heartbeat updated vps_host: old=$old_vps_host new=$next_vps_host reason=hub_update mode=auto"
|
||||
# The running Xray keeps its old address until it is restarted.
|
||||
( sleep 2; /etc/init.d/owrt-remote restart >/dev/null 2>&1 ) </dev/null >/dev/null 2>&1 &
|
||||
fi
|
||||
}
|
||||
|
||||
send_heartbeat() {
|
||||
@@ -789,6 +836,10 @@ send_heartbeat() {
|
||||
token="$(uci_get hub_token '')"
|
||||
[ -n "$hub_url" ] || die "hub_url пустой"
|
||||
[ -n "$token" ] || die "hub_token пустой"
|
||||
if truthy "$(uci_get wan_direct 0)"; then
|
||||
command -v wan_prepare >/dev/null 2>&1 || die "WAN helper missing: $WAN_HELPER"
|
||||
wan_prepare || return 1
|
||||
fi
|
||||
|
||||
endpoint="${hub_url%/}/api/heartbeat"
|
||||
tmp="${TMPDIR:-/tmp}/owrt-remote-heartbeat.$$"
|
||||
@@ -799,14 +850,17 @@ send_heartbeat() {
|
||||
used=1
|
||||
if post_json "$endpoint" "$token" "$tmp" >"$response"; then
|
||||
fallback_base="$(heartbeat_base_from_endpoint "$endpoint")"
|
||||
heartbeat_apply_hub_update "$response" "$fallback_base"
|
||||
if ! heartbeat_apply_hub_update "$response" "$fallback_base"; then
|
||||
rm -f "$tmp" "$response"
|
||||
return 1
|
||||
fi
|
||||
cat "$response"
|
||||
rm -f "$tmp" "$response"
|
||||
return 0
|
||||
fi
|
||||
done
|
||||
rm -f "$tmp" "$response"
|
||||
[ "$used" = "1" ] || die "hub_url/public_url/vps_host пустые"
|
||||
[ "$used" = "1" ] || die "hub_url/public_url/vps_host пустые"
|
||||
return 1
|
||||
}
|
||||
|
||||
@@ -867,6 +921,8 @@ status() {
|
||||
printf 'enabled: %s\n' "$(uci_get enabled 0)"
|
||||
printf 'hub_url: %s\n' "$(uci_get hub_url '')"
|
||||
printf 'vps_host: %s\n' "$(uci_get vps_host '')"
|
||||
printf 'vps_host_mode: %s\n' "$(vps_host_mode)"
|
||||
printf 'wan_direct: %s\n' "$(uci_get wan_direct 0)"
|
||||
printf 'vps_port: %s\n' "$(uci_get vps_port 8443)"
|
||||
printf 'xray_bin: %s\n' "$(xray_bin_path)"
|
||||
printf 'xray_config: %s\n' "$(uci_get xray_config /etc/xray/owrt-remote-client.json)"
|
||||
@@ -1124,6 +1180,18 @@ case "$cmd" in
|
||||
doctor)
|
||||
doctor
|
||||
;;
|
||||
wan-prepare)
|
||||
wan_prepare
|
||||
;;
|
||||
wan-preflight)
|
||||
wan_preflight
|
||||
;;
|
||||
wan-cleanup)
|
||||
wan_cleanup
|
||||
;;
|
||||
network-diagnostics)
|
||||
wan_diagnostics
|
||||
;;
|
||||
install-xray-tmp)
|
||||
install_xray_tmp
|
||||
;;
|
||||
|
||||
@@ -136,13 +136,17 @@ save_config() {
|
||||
for field in router_id router_name role hub_url hub_token heartbeat_interval xray_bin xray_config vps_host vps_port vless_uuid vless_encryption vless_flow reverse_tag ssh_vless_uuid ssh_reverse_tag admin_host admin_port ssh_host ssh_port public_url; do
|
||||
uci_set "$field" "$(param "$field")"
|
||||
done
|
||||
if has_param vps_host_auto; then uci_set vps_host_mode auto; else uci_set vps_host_mode manual; fi
|
||||
if has_param wan_direct; then uci_set wan_direct 1; else uci_set wan_direct 0; fi
|
||||
uci_set wan_interface "$(param wan_interface)"
|
||||
uci_set wan_dns "$(param wan_dns)"
|
||||
uci commit owrtremote
|
||||
set_result "Настройки сохранены" "Если менял Xray или VPS-поля, перезапусти сервис." "ok"
|
||||
}
|
||||
|
||||
clear_config() {
|
||||
local field
|
||||
for field in role public_url hub_url hub_token heartbeat_interval xray_bin xray_config vps_host vps_port vless_uuid vless_encryption vless_flow reverse_tag ssh_vless_uuid ssh_reverse_tag admin_host admin_port ssh_host ssh_port; do
|
||||
for field in role public_url hub_url hub_token heartbeat_interval xray_bin xray_config vps_host vps_host_mode wan_direct wan_interface wan_dns vps_port vless_uuid vless_encryption vless_flow reverse_tag ssh_vless_uuid ssh_reverse_tag admin_host admin_port ssh_host ssh_port; do
|
||||
uci -q delete "owrtremote.main.$field"
|
||||
done
|
||||
uci commit owrtremote
|
||||
@@ -279,6 +283,10 @@ EOF
|
||||
|
||||
render_page() {
|
||||
local key router_id router_name hub_url service_state service_tone xray_state xray_tone enabled_checked status_text
|
||||
local vps_host_auto_checked wan_direct_checked
|
||||
vps_host_auto_checked=''; wan_direct_checked=''
|
||||
[ "$(uci_get vps_host_mode manual)" != auto ] || vps_host_auto_checked=checked
|
||||
[ "$(uci_get wan_direct 0)" != 1 ] || wan_direct_checked=checked
|
||||
key="$(param key)"
|
||||
router_id="$(uci_get router_id main)"
|
||||
router_name="$(uci_get router_name "$router_id")"
|
||||
@@ -314,7 +322,7 @@ render_page() {
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta name="owrt-remote-ui-version" content="$OWRT_REMOTE_UI_VERSION">
|
||||
<title>OpenWrt Remote Hub v110</title>
|
||||
<title>OpenWrt Remote Hub v111</title>
|
||||
<style>
|
||||
:root{color-scheme:dark;--bg:#07040f;--panel:rgba(19,14,32,.88);--text:#f7f2ff;--muted:#b9adc9;--line:rgba(169,126,255,.24);--blue:#7c3aed;--green:#22c55e;--red:#fb7185;--amber:#f59e0b;--teal:#a855f7;--grid:rgba(168,85,247,.16)}
|
||||
*{box-sizing:border-box}body{position:relative;min-height:100vh;margin:0;overflow-x:hidden;background-color:var(--bg);background-image:radial-gradient(circle at 12% 8%,rgba(168,85,247,.46),transparent 31%),radial-gradient(circle at 82% 12%,rgba(79,70,229,.38),transparent 30%),radial-gradient(circle at 50% 105%,rgba(236,72,153,.26),transparent 35%),linear-gradient(145deg,#07040f,#120a24 48%,#05030a),repeating-linear-gradient(0deg,transparent 0 30px,var(--grid) 31px),repeating-linear-gradient(90deg,transparent 0 30px,var(--grid) 31px);background-size:130% 130%,140% 140%,135% 135%,100% 100%,31px 31px,31px 31px;background-attachment:fixed;color:var(--text);font:14px/1.45 system-ui,-apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif;animation:bgFlow 22s ease-in-out infinite alternate}
|
||||
@@ -344,7 +352,7 @@ form{margin:0}.formgrid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr
|
||||
<div class="brand">
|
||||
<div class="brandPanel">
|
||||
<div class="titleRow">
|
||||
<h1 class="appBanner"><span>OpenWrt Remote Hub <span class="appBannerVersion">v110</span></span></h1>
|
||||
<h1 class="appBanner"><span>OpenWrt Remote Hub <span class="appBannerVersion">v111</span></span></h1>
|
||||
</div>
|
||||
<div class="links">
|
||||
<a class="uiPill" href="https://t.me/kzolotarev95" target="_blank" rel="noopener noreferrer">Telegram</a>
|
||||
@@ -441,6 +449,14 @@ EOF
|
||||
field xray_bin "Xray binary" text "Путь к Xray на роутере. Если ставил пакет xray-core, обычно оставь /usr/bin/xray."
|
||||
field xray_config "Xray config" text "Куда агент сохранит клиентский Xray-конфиг. Обычно оставь /etc/xray/owrt-remote-client.json."
|
||||
field vps_host "VPS host" text "IP или домен VPS, куда Xray роутера подключается reverse-туннелем. Бери IP/домен своего VPS."
|
||||
cat <<EOF
|
||||
<label class="check"><input type="checkbox" name="vps_host_auto" value="1" $vps_host_auto_checked> Автоматически обновлять VPS host</label>
|
||||
<span class="hint">Выключено: заданный VPS host сохраняется, heartbeat не меняет его.</span>
|
||||
<label class="check"><input type="checkbox" name="wan_direct" value="1" $wan_direct_checked> Соединение с Hub напрямую через WAN</label>
|
||||
<span class="hint">Heartbeat и Xray обходят Podkop. DNS берётся с WAN, настройки LAN не меняются.</span>
|
||||
EOF
|
||||
field wan_interface "WAN интерфейс" text "Логическое имя WAN из OpenWrt, обычно wan. Пустое поле означает wan."
|
||||
field wan_dns "WAN DNS" text "Необязательно: IP DNS-сервера для Remote. Пустое поле — DNS от провайдера на WAN."
|
||||
field vps_port "VPS Xray port" number "Порт Xray на VPS для reverse-туннеля. Должен совпадать с render-xray на VPS, обычно 8443."
|
||||
field vless_uuid "VLESS UUID" text "Уникальный UUID роутера. Бери из карточки роутера на VPS или из команды print-openwrt-config."
|
||||
field vless_encryption "VLESS encryption" text "Для этой схемы оставь none. Меняй только если сам меняешь Xray-конфиг на VPS."
|
||||
|
||||
@@ -14,7 +14,7 @@ return view.extend({
|
||||
|
||||
if (!key) {
|
||||
return E('div', { 'class': 'cbi-map' }, [
|
||||
E('h2', {}, _('OpenWrt Remote Hub v110')),
|
||||
E('h2', {}, _('OpenWrt Remote Hub v111')),
|
||||
E('div', { 'class': 'alert-message warning' }, [
|
||||
_('Web key not found. Reinstall the module or create /etc/owrt-remote/web.key.')
|
||||
])
|
||||
@@ -34,7 +34,7 @@ return view.extend({
|
||||
}, 100);
|
||||
|
||||
return E('div', { 'class': 'cbi-map' }, [
|
||||
E('h2', {}, _('OpenWrt Remote Hub v110')),
|
||||
E('h2', {}, _('OpenWrt Remote Hub v111')),
|
||||
E('p', {}, _('Opening remote access panel...')),
|
||||
E('p', {}, [
|
||||
E('a', { 'class': 'btn cbi-button cbi-button-apply', 'href': url }, _('Open panel'))
|
||||
|
||||
Reference in new issue
Block a user