Add multi-WAN failover and release v112

This commit is contained in:
kzolotarev95 committed 2026-10-09 08:45:30 +04:00
1 parent 50a18ae33c
commit bcbcb071cc
23 files changed
+906 -72

No files matched your search

+16 -1
View File
@@ -8,7 +8,7 @@ LAST_RESTART_FILE="$STATE_DIR/last-restart"
QUIET_SECONDS=18
RESTART_COOLDOWN=45
[ "$ACTION" = "ifup" ] || [ "$ACTION" = "ifupdate" ] || [ "$ACTION" = "ifrestart" ] || exit 0
[ "$ACTION" = "ifup" ] || [ "$ACTION" = "ifupdate" ] || [ "$ACTION" = "ifrestart" ] || [ "$ACTION" = "ifdown" ] || exit 0
case "$(uci -q get owrtremote.main.enabled 2>/dev/null || echo 0)" in
1|yes|true|on|enabled) ;;
@@ -26,10 +26,18 @@ if [ -n "$INTERFACE" ] && command -v ubus >/dev/null 2>&1; then
)"
fi
direct_wan="$(uci -q get owrtremote.main.wan_direct 2>/dev/null || echo 0)"
if [ "$direct_wan" = 1 ]; then
selected_wans="$(uci -q get owrtremote.main.wan_interface 2>/dev/null || echo wan)"
[ -n "$selected_wans" ] || selected_wans=wan
case " $selected_wans " in *" $INTERFACE "*) ;; *) exit 0 ;; esac
else
[ "$ACTION" != ifdown ] || exit 0
case "$INTERFACE:$DEVICE:$proto" in
wan:*:*|wan6:*:*|*:pppoe*:*|*:ppp*:*|*:*:pppoe|*:*:ppp) ;;
*) exit 0 ;;
esac
fi
network_ready() {
if command -v ip >/dev/null 2>&1 && ip route get 1.1.1.1 >/dev/null 2>&1; then
@@ -96,6 +104,13 @@ printf '%s\n' "$stamp" >"$STAMP_FILE"
sleep 2
[ "$(cat "$STAMP_FILE" 2>/dev/null)" = "$stamp" ] || exit 0
if [ "$direct_wan" = 1 ]; then
# Heartbeat prepares the selected uplink and reconnects Xray only if its
# binding changed. A restored primary must not interrupt a healthy backup.
/usr/sbin/owrt-remote heartbeat wan-reconnect >/dev/null 2>&1 || true
exit 0
fi
now="$(safe_num "$(date +%s 2>/dev/null || echo 0)" 0)"
last_restart="$(safe_num "$(cat "$LAST_RESTART_FILE" 2>/dev/null)" 0)"
if [ "$now" -gt 0 ] && [ $((now - last_restart)) -lt "$RESTART_COOLDOWN" ]; then
+64 -9
View File
@@ -40,20 +40,62 @@ wan_url_port() {
printf '%s' "$port"
}
wan_device() {
wan_interfaces() {
printf '%s\n' "${OWRT_REMOTE_WAN_INTERFACE:-$(uci_get wan_interface wan)}" | awk '
{ for (i=1; i<=NF; i++) {
if ($i !~ /^[a-zA-Z0-9_.:-]+$/) exit 1
if (!seen[$i]++) { printf "%s%s", sep, $i; sep=" " }
} }
'
}
wan_interface_device() {
local iface device
iface="${OWRT_REMOTE_WAN_INTERFACE:-$(uci_get wan_interface wan)}"
iface="$1"
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
case "$device" in tun*|sing*|podkop*|lo) return 1 ;; esac
printf '%s' "$device"
}
wan_interface_ready() {
local device
device="$(wan_interface_device "$1")" || return 1
ip -4 route show table main default dev "$device" | grep -q '^default'
}
wan_select_interface() {
local interfaces current iface
interfaces="$(wan_interfaces)" || return 1
current="$(cat "$WAN_STATE/active-interface" 2>/dev/null)"
# Keep a working uplink rather than interrupting it when a primary returns.
if [ -n "$current" ]; then
case " $interfaces " in *" $current "*)
if wan_interface_ready "$current"; then printf '%s' "$current"; return; fi
;;
esac
fi
for iface in $interfaces; do
if wan_interface_ready "$iface"; then printf '%s' "$iface"; return; fi
done
return 1
}
wan_device() {
local iface
iface="${OWRT_REMOTE_ACTIVE_WAN_INTERFACE:-}"
[ -n "$iface" ] || iface="$(wan_select_interface)" || return 1
wan_interface_device "$iface"
}
wan_dns_server() {
local dns
local dns iface
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)"
iface="${OWRT_REMOTE_ACTIVE_WAN_INTERFACE:-}"
[ -n "$iface" ] || iface="$(wan_select_interface)" || return 1
dns="$(ubus call "network.interface.$iface" 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
@@ -232,7 +274,7 @@ wan_preflight() {
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; }
device="$(wan_device)" || { log "No selected WAN interface is 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
@@ -243,7 +285,8 @@ wan_preflight() {
}
wan_prepare_locked() {
local device dns gateway family host ip url port
local device dns gateway family host ip url port previous OWRT_REMOTE_ACTIVE_WAN_INTERFACE
OWRT_REMOTE_ACTIVE_WAN_INTERFACE="$(wan_select_interface)" || { log 'No selected WAN has a physical IPv4 default route'; return 1; }
wan_preflight || return 1
device="$(wan_device)" || return 1
dns="$(wan_dns_server)" || return 1
@@ -288,6 +331,12 @@ wan_prepare_locked() {
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"
previous="$(cat "$WAN_STATE/active-interface" 2>/dev/null)"
printf '%s\n' "$OWRT_REMOTE_ACTIVE_WAN_INTERFACE" >"$WAN_STATE/active-interface.new.$$"
mv "$WAN_STATE/active-interface.new.$$" "$WAN_STATE/active-interface"
if [ -n "$previous" ] && [ "$previous" != "$OWRT_REMOTE_ACTIVE_WAN_INTERFACE" ]; then
log "WAN failover: $previous -> $OWRT_REMOTE_ACTIVE_WAN_INTERFACE"
fi
}
wan_prepare() (
@@ -307,14 +356,19 @@ wan_prepare() (
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 'rm -f "$WAN_STATE/lock/pid" "$WAN_STATE/endpoints.new.$$" "$WAN_STATE/endpoints.dedup.$$" "$WAN_STATE/targets.new.$$" "$WAN_STATE/target-keys.$$" "$WAN_STATE/active-interface.new.$$"; 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
local url token file host port ip device selected OWRT_REMOTE_ACTIVE_WAN_INTERFACE
url="$1"; token="$2"; file="$3"
selected="$(wan_select_interface)" || return 1
if [ "$selected" != "$(cat "$WAN_STATE/active-interface" 2>/dev/null)" ]; then
wan_prepare || return 1
fi
OWRT_REMOTE_ACTIVE_WAN_INTERFACE="$(cat "$WAN_STATE/active-interface")" || return 1
host="$(wan_url_host "$url")"
port="$(wan_url_port "$url")" || return 1
ip="$(wan_endpoint_ip "$url")" || return 1
@@ -347,13 +401,14 @@ wan_cleanup() {
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"/resolve-* "$WAN_STATE/endpoints" "$WAN_STATE/targets" "$WAN_STATE/active-interface"
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_selected=%s WAN_active=%s\n' "$(wan_interfaces)" "$(cat "$WAN_STATE/active-interface" 2>/dev/null)"
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
+39 -2
View File
@@ -523,13 +523,14 @@ render_client_config() {
router_id="$(safe_id "$(uci_get router_id main)")"
vps_host="$(uci_get vps_host '')"
local wan_sockopt
local wan_sockopt wan_xray_device
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)")\"}"
wan_xray_device="$(wan_device)" || die "выбранный WAN интерфейс отключился"
wan_sockopt=", \"sockopt\": {\"mark\": $((PODKOP_BYPASS_MARK)), \"interface\": \"$(json_escape "$wan_xray_device")\"}"
fi
vps_port="$(safe_num "$(uci_get vps_port 8443)" 8443)"
uuid="$(uci_get vless_uuid '')"
@@ -839,6 +840,7 @@ send_heartbeat() {
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
wan_reconcile_xray
fi
endpoint="${hub_url%/}/api/heartbeat"
@@ -864,6 +866,39 @@ send_heartbeat() {
return 1
}
wan_reconcile_xray() {
local config bound device
config="$(uci_get xray_config /etc/xray/owrt-remote-client.json)"
[ -r "$config" ] || return 0
bound="$(jsonfilter -i "$config" -e '@.outbounds[@.tag="vps-interconn"].streamSettings.sockopt.interface' 2>/dev/null)"
device="$(wan_device)" || return 1
[ "$bound" != "$device" ] || return 0
xray_running || return 0
wan_reconnect_xray "$bound" "$device"
}
wan_reconnect_xray() {
local restart_lock owner
restart_lock="${TMPDIR:-/tmp}/owrt-remote-wan-restart"
# A concurrent heartbeat must not enqueue another restart of the same tunnel.
if ! mkdir "$restart_lock" 2>/dev/null; then
owner="$(cat "$restart_lock/pid" 2>/dev/null)"
case "$owner" in ''|*[!0-9]*) return 0 ;; esac
kill -0 "$owner" 2>/dev/null && return 0
rm -f "$restart_lock/pid"
rmdir "$restart_lock" 2>/dev/null || return 0
mkdir "$restart_lock" 2>/dev/null || return 0
fi
log "Reconnecting reverse tunnel after WAN change: $1 -> $2"
(
trap 'rm -f "$restart_lock/pid"; rmdir "$restart_lock" 2>/dev/null || true' EXIT
trap 'exit 1' INT TERM
sleep 1
/etc/init.d/owrt-remote restart >/dev/null 2>&1 || log 'WAN failover tunnel restart failed'
) </dev/null >/dev/null 2>&1 &
printf '%s' "$!" >"$restart_lock/pid"
}
heartbeat_mark_ok() {
rm -f "${TMPDIR:-/tmp}/owrt-remote-heartbeat.fail"
}
@@ -923,6 +958,8 @@ status() {
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 'wan_interfaces: %s\n' "$(uci_get wan_interface wan)"
printf 'wan_active_interface: %s\n' "$(cat "$WAN_STATE/active-interface" 2>/dev/null)"
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)"
+72 -8
View File
@@ -50,6 +50,14 @@ param() {
url_decode "$raw"
}
param_values() {
local raw
awk -F '\t' -v k="$1" '$1 == k { print $2 }' "$PARAMS_FILE" | while IFS= read -r raw; do
url_decode "$raw"
printf '\n'
done
}
has_param() {
awk -F ' ' -v k="$1" '$1 == k { found = 1 } END { exit(found ? 0 : 1) }' "$PARAMS_FILE"
}
@@ -125,7 +133,18 @@ set_result() {
}
save_config() {
local enabled field
local enabled field wan_interfaces
wan_interfaces="$(param_values wan_interface | awk 'NF { if (NF != 1 || $0 !~ /^[a-zA-Z0-9_.:-]+$/) exit 1; if (!seen[$0]++) { printf "%s%s", sep, $0; sep=" " } }')" || {
set_result "Настройки не сохранены" "Некорректное имя WAN интерфейса." "bad"
return 1
}
if [ -z "$wan_interfaces" ]; then
if has_param wan_interface_picker && has_param wan_direct; then
set_result "Настройки не сохранены" "Для прямого соединения с Hub отметь хотя бы один WAN интерфейс." "warn"
return 1
fi
wan_interfaces=wan
fi
if has_param enabled; then
enabled="1"
else
@@ -138,7 +157,7 @@ save_config() {
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_interface "$wan_interfaces"
uci_set wan_dns "$(param wan_dns)"
uci commit owrtremote
set_result "Настройки сохранены" "Если менял Xray или VPS-поля, перезапусти сервис." "ok"
@@ -271,6 +290,38 @@ field() {
printf '</label>'
}
wan_interface_field() {
local current interfaces iface selected count
current="$(uci_get wan_interface wan)"
# netifd uses logical interface names, not physical devices such as eth0.
# Include configured interfaces even while their modem/link is down.
interfaces="$(
{
uci -q show network 2>/dev/null | sed -n 's/^network\.\([^.=]*\)=interface$/\1/p'
ubus call network.interface dump 2>/dev/null | jsonfilter -e '@.interface[*].interface' 2>/dev/null
} | LC_ALL=C sort -u | while IFS= read -r iface; do
case "$iface" in ''|*[!a-zA-Z0-9_.:-]*) continue ;; esac
printf '%s\n' "$iface"
done
)"
count="$(printf '%s\n' "$current" | awk '{ print NF }')"
printf '<div class="field wanField"><span>WAN интерфейс</span>'
printf '<small>Отметь один или несколько интерфейсов с выходом в Интернет. Remote использует один доступный из выбранных; остальные служат резервом. После выбора нажми «Сохранить и запустить».</small>'
printf '<input type="hidden" name="wan_interface_picker" value="1">'
printf '<details class="wanPicker" data-wan-picker><summary>Выбрать интерфейсы (<b data-wan-count>%s</b>)</summary><div class="wanPickerList">' "$count"
# Keep saved choices even while netifd/UCI cannot list those interfaces.
{
printf '%s\n' "$current" | tr ' ' '\n'
printf '%s\n' "$interfaces"
} | awk 'NF && !seen[$0]++' | while IFS= read -r iface; do
[ -n "$iface" ] || continue
selected=''
case " $current " in *" $iface "*) selected=' checked' ;; esac
printf '<label class="wanChoice"><input type="checkbox" name="wan_interface" value="%s"%s>%s</label>' "$(h "$iface")" "$selected" "$(h "$iface")"
done
printf '</div></details><div class="wanPicked" data-wan-picked>%s</div></div>' "$(h "$current")"
}
metric() {
local label value tone
label="$1"
@@ -336,7 +387,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 v111</title>
<title>OpenWrt Remote Hub v112</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}
@@ -350,12 +401,13 @@ h1{margin:0;font-size:28px;line-height:1.2;letter-spacing:0}.appBanner{position:
.pill{min-width:118px;background:var(--panel);color:var(--muted)}.dot{width:9px;height:9px;border-radius:50%;background:var(--amber)}.dot.good{background:var(--green)}.dot.bad{background:var(--red)}
.grid{display:grid;grid-template-columns:1fr;gap:16px;margin-top:18px}.panel{min-width:0;background:var(--panel);border:1px solid var(--line);border-radius:8px;padding:16px;box-shadow:0 18px 46px rgba(0,0,0,.28);backdrop-filter:blur(10px)}
.panel h2{font-size:18px;margin:0 0 12px}.panelHead{display:flex;align-items:center;justify-content:space-between;gap:12px;margin-bottom:12px}.panelHead h2{margin:0}.headActionForm{margin:0}.clearBtn{border-color:rgba(251,113,133,.34);background:linear-gradient(135deg,rgba(251,113,133,.18),rgba(124,58,237,.22));color:#fecdd3;box-shadow:0 12px 28px rgba(251,113,133,.10)}.metrics{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:10px}.metric{min-width:0;border:1px solid var(--line);border-radius:8px;padding:12px;background:rgba(255,255,255,.06);text-align:center;display:flex;flex-direction:column;align-items:center;justify-content:center}.metric span{display:block;color:var(--muted);font-size:12px}.metric strong{display:block;margin-top:4px;font-size:18px;overflow-wrap:anywhere;word-break:break-word}.metric.good strong{color:var(--green)}.metric.bad strong{color:var(--red)}.metric.warn strong{color:var(--amber)}.linkMetric{grid-column:span 2}.metricLine{display:inline-flex;align-items:center;justify-content:center;flex-wrap:wrap;gap:8px;max-width:100%}.metricLine strong{min-width:0}.miniGo{border:1px solid rgba(34,211,238,.34);border-radius:999px;padding:7px 10px;background:rgba(34,211,238,.13);color:#a5f3fc;text-decoration:none;font-weight:850;white-space:nowrap}
form{margin:0}.formgrid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:12px}.field{position:relative;display:block}.field span{display:flex;align-items:center;gap:7px;font-weight:650;margin-bottom:7px}.field span::after{content:"?";width:18px;height:18px;border-radius:50%;display:inline-grid;place-items:center;background:rgba(116,94,148,.24);border:1px solid rgba(169,126,255,.24);color:#c4b5fd;font-size:12px;font-weight:900}.field input{width:100%;border:1px solid var(--line);border-radius:8px;background:rgba(8,5,18,.72);padding:10px 11px;color:var(--text)}.field small{position:absolute;left:0;right:0;bottom:calc(100% + 8px);z-index:20;display:block;visibility:hidden;opacity:0;transform:translateY(6px);padding:10px 12px;border:1px solid rgba(169,126,255,.22);border-radius:8px;background:rgba(10,6,18,.97);box-shadow:0 18px 42px rgba(0,0,0,.42);color:#ddd6fe;transition:opacity .16s ease,transform .16s ease,visibility .16s ease;pointer-events:none}.field:hover small,.field:focus-within small{visibility:visible;opacity:1;transform:translateY(0)}
form{margin:0}.formgrid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:12px}.field{position:relative;display:block}.field span{display:flex;align-items:center;gap:7px;font-weight:650;margin-bottom:7px}.field span::after{content:"?";width:18px;height:18px;border-radius:50%;display:inline-grid;place-items:center;background:rgba(116,94,148,.24);border:1px solid rgba(169,126,255,.24);color:#c4b5fd;font-size:12px;font-weight:900}.field input,.field select{width:100%;min-width:0;border:1px solid var(--line);border-radius:8px;background:rgba(8,5,18,.72);padding:10px 11px;color:var(--text)}.field select{font:inherit;cursor:pointer}.field small{position:absolute;left:0;right:0;bottom:calc(100% + 8px);z-index:20;display:block;visibility:hidden;opacity:0;transform:translateY(6px);padding:10px 12px;border:1px solid rgba(169,126,255,.22);border-radius:8px;background:rgba(10,6,18,.97);box-shadow:0 18px 42px rgba(0,0,0,.42);color:#ddd6fe;transition:opacity .16s ease,transform .16s ease,visibility .16s ease;pointer-events:none}.field:hover small,.field:focus-within small{visibility:visible;opacity:1;transform:translateY(0)}
.check{display:flex;gap:10px;align-items:center;margin-bottom:12px;font-weight:700}.check input{width:18px;height:18px}.actions{display:flex;flex-wrap:wrap;gap:10px;margin-top:14px;justify-content:center}.saveActions{justify-content:flex-end}.btn{border:1px solid rgba(255,255,255,.08);border-radius:8px;padding:10px 13px;font-weight:750;cursor:pointer;text-decoration:none;display:inline-flex;align-items:center;justify-content:center;background:rgba(255,255,255,.10);color:#f7f2ff}.btn.primary{background:var(--blue);color:#fff}.btn.good{background:var(--green);color:#07120a}.btn.bad{background:rgba(251,113,133,.18);color:#fecdd3}.btn.warn{background:rgba(245,158,11,.16);color:#fde68a;border:1px solid rgba(245,158,11,.34)}
.notice{max-height:280px;overflow:auto;margin-top:16px;border-radius:8px;padding:12px;border:1px solid var(--line);background:rgba(255,255,255,.08);white-space:pre-wrap;overflow-wrap:anywhere;word-break:break-word;font:12px/1.45 ui-monospace,SFMono-Regular,Consolas,monospace}.notice strong{display:block;margin-bottom:4px;font:700 14px/1.4 system-ui,-apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif}.notice.ok{border-color:rgba(34,197,94,.46);background:rgba(34,197,94,.12)}.notice.bad{border-color:rgba(251,113,133,.46);background:rgba(251,113,133,.12)}.notice.warn{border-color:rgba(245,158,11,.46);background:rgba(245,158,11,.12)}
.code{background:rgba(255,255,255,.06);border:1px solid var(--line);color:var(--text);border-radius:8px;padding:12px;overflow:auto;overflow-wrap:anywhere;min-height:120px;white-space:pre-wrap;font:12px/1.5 ui-monospace,SFMono-Regular,Consolas,monospace;box-shadow:inset 0 1px 0 rgba(255,255,255,.04)}
.helperText{margin:0 0 12px;color:var(--muted)}.xrayApply{margin-top:14px;padding:16px;border:1px solid rgba(34,211,238,.42);border-radius:8px;background:linear-gradient(135deg,rgba(34,211,238,.16),rgba(124,58,237,.20),rgba(236,72,153,.11));box-shadow:0 18px 42px rgba(34,211,238,.10)}.xrayApply h3{margin:0 0 8px;font-size:16px;color:#a5f3fc}.scriptBox{width:100%;min-height:260px;resize:vertical;border:1px solid rgba(34,211,238,.28);border-radius:8px;background:rgba(255,255,255,.07);padding:12px;color:var(--text);font:12px/1.45 ui-monospace,SFMono-Regular,Consolas,monospace;white-space:pre;overflow:auto}
.brandPanel{display:grid;grid-template-columns:repeat(2,minmax(0,132px));gap:8px}.brandPanel .titleRow,.brandPanel .links{grid-column:1/-1}.brandPanel .appBanner{width:100%;min-width:0}.brandPanel .links{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:8px;margin-top:0}.brandPanel .links a{width:100%;min-width:0}
.wanPicker{border:1px solid var(--line);border-radius:8px;background:rgba(8,5,18,.72)}.wanPicker summary{display:flex;align-items:center;justify-content:center;gap:5px;min-height:40px;padding:10px 11px;cursor:pointer;list-style:none;font-weight:700}.wanPicker summary::-webkit-details-marker{display:none}.wanPicker summary::after{content:"▾";margin-left:auto;color:var(--muted)}.wanPicker[open] summary::after{content:"▴"}.wanPickerList{display:flex;flex-direction:column;gap:4px;max-height:240px;overflow:auto;padding:6px;border-top:1px solid var(--line)}.wanChoice{display:flex;align-items:center;gap:10px;min-height:40px;padding:8px;border-radius:6px;cursor:pointer;overflow-wrap:anywhere}.wanChoice:hover{background:rgba(255,255,255,.08)}.wanChoice input{width:18px;height:18px;min-width:18px;padding:0;margin:0;accent-color:var(--blue)}.wanPicked{margin-top:6px;font-size:12px;color:var(--muted);overflow-wrap:anywhere}
@media(max-width:820px){.grid,.formgrid,.metrics{grid-template-columns:1fr}.linkMetric{grid-column:span 1}.metricLine{align-items:center;justify-content:center}.miniGo{width:auto;justify-content:center;display:inline-flex}.hero{align-items:flex-start;flex-direction:column}.topActions{justify-content:flex-start;padding-top:0}.wrap{padding:14px}h1{font-size:24px}.appBanner{width:auto;max-width:100%;justify-content:center;min-height:36px;padding:8px 12px}.panelHead{align-items:stretch;flex-direction:column}.headActionForm .btn{width:100%}.actions .btn,.actions button{width:100%}}
@media(max-width:820px){.brandPanel{grid-template-columns:repeat(2,minmax(0,1fr));width:100%}.brandPanel .appBanner{width:100%}}
</style>
@@ -366,7 +418,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">v111</span></span></h1>
<h1 class="appBanner"><span>OpenWrt Remote Hub <span class="appBannerVersion">v112</span></span></h1>
</div>
<div class="links">
<a class="uiPill" href="https://t.me/kzolotarev95" target="_blank" rel="noopener noreferrer">Telegram</a>
@@ -469,7 +521,7 @@ EOF
<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."
wan_interface_field
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."
@@ -491,6 +543,19 @@ EOF
</form>
</section>
</main>
<script>
document.querySelectorAll('[data-wan-picker]').forEach(function(picker) {
var field = picker.closest('.wanField');
var inputs = Array.from(picker.querySelectorAll('input[name="wan_interface"]'));
function updateSelection() {
var selected = inputs.filter(function(input) { return input.checked; }).map(function(input) { return input.value; });
field.querySelector('[data-wan-count]').textContent = selected.length;
field.querySelector('[data-wan-picked]').textContent = selected.length ? selected.join(', ') : 'Интерфейсы не выбраны';
}
picker.addEventListener('change', updateSelection);
updateSelection();
});
</script>
</body>
</html>
EOF
@@ -517,8 +582,7 @@ if [ "${REQUEST_METHOD:-GET}" = "POST" ]; then
save_config
;;
save_start)
save_config
run_action start
if save_config; then run_action start; fi
;;
show_xray_settings)
SHOW_XRAY_SETTINGS="1"
@@ -14,7 +14,7 @@ return view.extend({
if (!key) {
return E('div', { 'class': 'cbi-map' }, [
E('h2', {}, _('OpenWrt Remote Hub v111')),
E('h2', {}, _('OpenWrt Remote Hub v112')),
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 v111')),
E('h2', {}, _('OpenWrt Remote Hub v112')),
E('p', {}, _('Opening remote access panel...')),
E('p', {}, [
E('a', { 'class': 'btn cbi-button cbi-button-apply', 'href': url }, _('Open panel'))
+14 -11
View File
@@ -1,4 +1,4 @@
# Фиксация VPS host и независимое соединение Remote через WAN (v111)
# Фиксация VPS host и независимое соединение Remote через WAN (v112)
`vps_host_mode=manual` сохраняет заданный на роутере адрес. Это значение
используется и когда опция отсутствует у старой установки. Только явно
@@ -24,7 +24,10 @@ OpenWrt config / автоматическое переприменение ко
опция выключена в поставляемой конфигурации и старых установках. Скрипт
локальной установки ниже включает её для тестирования на вашем роутере.
* `wan_interface=wan` — логическое имя интерфейса OpenWrt. Реальный
* `wan_interface=wan` — логическое имя интерфейса OpenWrt. Для резервирования
допустим список через пробел, например `wan wwan modem4g`; в панели эти
интерфейсы выбираются галочками. Remote выбирает один рабочий и при
его отключении переводит соединение на другой выбранный. Реальный
`l3_device` (включая PPPoE) берётся через ubus. Он должен иметь физический
default route в main; TUN-устройства не принимаются как WAN.
* Таблица маршрутов `210` и приоритет `104` принадлежат Remote.
@@ -93,21 +96,21 @@ powershell.exe -NoProfile -ExecutionPolicy Bypass -File "vps\deploy-host-policy.
Установка загружает локальные файлы, без Git. До остановки службы проверяются
доступность WAN и поддержка таблицы реальной командой ip на роутере.
На роутер загружается и файл LuCI: версия v111 появляется и в основной
На роутер загружается и файл LuCI: версия v112 появляется и в основной
CGI-панели, и в странице входа в неё через LuCI.
Сначала сохраняются файлы
и конфигурация; после замены проверяется heartbeat/health. При ошибке
автоматически восстанавливается состояние перед текущей попыткой.
Сохранённая резервная копия для ручного отката не перезаписывается.
* Роутер: `/root/owrt-remote-backup-before-host-policy-v111` — агент,
* Роутер: `/root/owrt-remote-backup-before-host-policy-v112` — агент,
helper, init, CGI, UCI-конфигурация и Xray-конфиг (в закрытом каталоге).
* VPS: `/opt/owrt-remote/owrt-remote-hub.py.bak-before-host-policy-v111`.
* VPS: `/opt/owrt-remote/owrt-remote-hub.py.bak-before-host-policy-v112`.
База роутеров и настройки авторизации не заменяются.
Успешная установка заканчивается `HOST_POLICY_ROUTER_V111_OK` на роутере
и `HOST_POLICY_VPS_V111_Install_OK` на VPS. Старые резервные копии предыдущей
версии сохраняются; новые команды отката используют отдельные копии для v111.
Успешная установка заканчивается `HOST_POLICY_ROUTER_V112_OK` на роутере
и `HOST_POLICY_VPS_V112_Install_OK` на VPS. Старые резервные копии предыдущей
версии сохраняются; новые команды отката используют отдельные копии для v112.
### Переход с nftables-маркировки на адресную маршрутизацию
@@ -116,11 +119,11 @@ CGI-панели, и в странице входа в неё через LuCI.
Обновление VPS для этого изменения не требуется.
```powershell
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "vps\deploy-host-policy.ps1" -Target Router -Machine "root@192.168.2.1" -PreserveConnectionSettings -BackupName "podkop-compat-v111" -Action Install
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "vps\deploy-host-policy.ps1" -Target Router -Machine "root@192.168.2.1" -BackupName "podkop-compat-v111" -Action Rollback
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "vps\deploy-host-policy.ps1" -Target Router -Machine "root@192.168.2.1" -PreserveConnectionSettings -BackupName "podkop-compat-v112" -Action Install
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "vps\deploy-host-policy.ps1" -Target Router -Machine "root@192.168.2.1" -BackupName "podkop-compat-v112" -Action Rollback
```
Копия: `/root/owrt-remote-backup-before-podkop-compat-v111`.
Копия: `/root/owrt-remote-backup-before-podkop-compat-v112`.
После установки повторите диагностику Podkop. Предупреждение от прежних правил
Remote должно исчезнуть. Настоящие дополнительные правила других приложений
по-прежнему обнаруживаются штатной диагностикой.
+3 -3
View File
@@ -1,4 +1,4 @@
# reCAPTCHA v3 в OpenWrt Remote Hub v111
# reCAPTCHA v3 в OpenWrt Remote Hub v112
В меню владельца, в блоке «Капча на экране входа», доступны цифры,
Google reCAPTCHA v2 Checkbox и Google reCAPTCHA v3. Установка обновления
@@ -74,8 +74,8 @@ powershell.exe -NoProfile -ExecutionPolicy Bypass -File "vps\deploy-recaptcha-v3
непосредственно перед попыткой. Резервные копии при повторном запуске
не перезаписываются:
* `/opt/owrt-remote/owrt-remote-hub.py.bak-before-recaptcha-v3-v111`
* `/opt/owrt-remote/captcha-before-recaptcha-v3-v111.json` (режим 0600).
* `/opt/owrt-remote/owrt-remote-hub.py.bak-before-recaptcha-v3-v112`
* `/opt/owrt-remote/captcha-before-recaptcha-v3-v112.json` (режим 0600).
Скрипт рассчитан на стандартные пути установленного Hub:
`/opt/owrt-remote/owrt-remote-hub.py`, `/var/lib/owrt-remote/hub-auth.json`
+3 -3
View File
@@ -1,6 +1,6 @@
# Аудит ресурсов OpenWrt Remote Hub v111
# Аудит ресурсов OpenWrt Remote Hub v112
Исправления внесены поверх `7f809fd`. Версия панели остаётся v111.
Исправления внесены поверх `7f809fd`. Версия панели остаётся v112.
## SQLite
@@ -115,7 +115,7 @@ powershell.exe -NoProfile -ExecutionPolicy Bypass -File "vps\deploy-resource-fix
Установщик загружает локальный файл без Git, запускает изолированные тесты,
сохраняет исходный серверный файл:
`/opt/owrt-remote/owrt-remote-hub.py.bak-before-resource-fix-v111`,
`/opt/owrt-remote/owrt-remote-hub.py.bak-before-resource-fix-v112`,
атомарно заменяет Python файл, перезапускает `owrt-remote` и проверяет health.
Существующая резервная копия не перезаписывается. При ошибке установки
восстанавливается файл, работавший непосредственно перед текущей попыткой.
+4 -4
View File
@@ -1,4 +1,4 @@
# Виджеты ресурсов VPS (v111)
# Виджеты ресурсов VPS (v112)
Три карточки ЦП, ОЗУ и ДИСК находятся над кнопками «Рестарт Xray VPS»,
профилем и выходом. На ПК ширина и высота совпадают с кнопками под ними.
@@ -23,7 +23,7 @@ vCPU и объёмы занятой/общей памяти и диска.
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\Documents\openwrt overlay\vps\deploy-vps-widgets.ps1" -Vps "root@193.233.82.38" -Action Install
```
После `VPS_WIDGETS_V111_Install_OK` обновите страницу через Ctrl+F5.
После `VPS_WIDGETS_V112_Install_OK` обновите страницу через Ctrl+F5.
Скрипт загружает локальный файл, проверяет его до замены, перезапускает
службу и проверяет health. При ошибке после замены восстанавливает файл
перед текущей попыткой. База данных и настройки не заменяются.
@@ -33,8 +33,8 @@ powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\
```
Откат использует неизменяемую копию первого состояния до установки:
`/opt/owrt-remote/owrt-remote-hub.py.bak-before-vps-widgets-v111`.
Успешное завершение: `VPS_WIDGETS_V111_Rollback_OK`.
`/opt/owrt-remote/owrt-remote-hub.py.bak-before-vps-widgets-v112`.
Успешное завершение: `VPS_WIDGETS_V112_Rollback_OK`.
## Локальные проверки
+81
View File
@@ -0,0 +1,81 @@
# Несколько WAN интерфейсов и резервирование (v112)
Кнопка **Выбрать интерфейсы** раскрывает список с галочками. Можно отметить
один, два, три и больше интерфейсов. Список содержит имена
логических интерфейсов OpenWrt. Он собирается при открытии страницы из
конфигурации `network` (UCI) и списка netifd (`ubus network.interface dump`).
Поэтому доступны и настроенные, но ещё отключённые 4G/Wi-Fi интерфейсы.
Повторяющиеся имена объединяются. Текущее значение остаётся выбранным,
даже если интерфейс временно пропал из списка; пустое старое значение
означает `wan`.
**Сохранить и запустить** сохраняет весь выбранный список в существующей
настройке `owrtremote.main.wan_interface`, например `wan wwan modem4g`.
Уже сохранённые интерфейсы идут первыми в списке, поэтому добавление
резервных сохраняет прежний основной выбор первым. При запуске берётся
первый доступный интерфейс из сохранённого списка.
Пустой список при включённом прямом WAN отклоняется до изменения настроек.
Старое одиночное значение продолжает работать.
Remote использует один доступный интерфейс из выбранных. Доступность
определяется по `l3_device` netifd и IPv4 default route этого устройства.
Если текущий интерфейс отключился, при следующем heartbeat или событии
hotplug выбирается резервный. DNS и отдельная таблица маршрутов Remote
переводятся на него. Изменение привязки работающего Xray вызывает один
перезапуск обратных туннелей: одного изменения маршрутов недостаточно,
поскольку [Xray sockopt.interface](https://xtls.github.io/en/config/transports/sockopt.html)
привязывает соединение к конкретному устройству.
Рабочий резерв сохраняется, когда другой выбранный интерфейс возвращается.
Это предотвращает повторные разрывы при нестабильном основном канале.
При ручном перезапуске проверяется доступность выбранных интерфейсов заново.
Если все выбранные интерфейсы отключены, прямое подключение завершается
ошибкой; невыбранные интерфейсы и TUN-прокси в качестве резерва не используются.
Это резервирование по состоянию интерфейса и маршрута, без проверки доступа
в Интернет на стороне провайдера при остающемся поднятым интерфейсе.
Сетевые интерфейсы эта форма не создаёт и не перенастраивает. Список содержит
все логические интерфейсы; наличие `lan` в списке не означает, что он подходит
для WAN. LAN, dnsmasq и конфигурация Podkop не изменяются.
Установка из PowerShell Windows 11 (при необходимости заменить IP):
```powershell
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\Documents\openwrt overlay\vps\deploy-wan-multi.ps1" -Router "root@192.168.2.1" -Action Install
```
Скрипт устанавливает CGI, LuCI, агент, WAN helper и hotplug вместе. До замены
сохраняются прежние файлы, UCI-настройки и Xray config в
`/root/owrt-remote-backup-before-wan-multi-v112`.
Успех подтверждает `WAN_MULTI_ROUTER_Install_OK`. После установки обновить
панель роутера через Ctrl+F5, отметить интерфейсы и сохранить выбор.
VPS обновлять не требуется. Старый `deploy-wan-interface-picker.ps1`
теперь вызывает эту же установку, чтобы новый интерфейс формы не
устанавливался отдельно от механизма резервирования.
Откат файлов и сохранённых перед установкой настроек:
```powershell
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\Documents\openwrt overlay\vps\deploy-wan-multi.ps1" -Router "root@192.168.2.1" -Action Rollback
```
Успех отката подтверждает `WAN_MULTI_ROUTER_Rollback_OK`. Восстанавливаются
и настройки до установки, поэтому откат совместим с предыдущим агентом,
который поддерживал только одно имя WAN.
Локальные проверки:
```powershell
python tests/test_wan_interface_picker.py -v
python tests/test_wan_failover.py -v
python tests/test_xray_apply.py -v
```
Тесты выполняют настоящие CGI-запросы с подменёнными UCI/netifd и проверяют
список интерфейсов, сохранение нескольких выборов, недоступный uplink,
экранирование HTML и авторизацию. Тесты резервирования моделируют потерю
основного и двух первых каналов, выбор DNS резервного, маршруты, привязку
Xray и сохранение здорового резерва. PowerShell проверяется парсером и через `-PrepareOnly`;
это не выполняет SSH и не устанавливает файлы на устройство.
Источник API: [OpenWrt network.sh](https://git.openwrt.org/openwrt/openwrt/tree/?path=package%2Fbase-files%2Ffiles%2Flib%2Ffunctions%2Fnetwork.sh).
+2 -2
View File
@@ -1,4 +1,4 @@
# Применение OpenWrt config через панель роутера (v111)
# Применение OpenWrt config через панель роутера (v112)
При отправке textarea браузер кодирует переносы строк как CRLF. CGI
декодировал их без нормализации и записывал CR в исполняемый shell-скрипт.
@@ -22,7 +22,7 @@ CRLF и LF, heredoc, пустые строки, кодированные сим
Скрипт обновляет только CGI на роутере. VPS обновлять для этого фикса
не требуется. До замены сохраняется первая резервная копия CGI:
`/root/owrt-remote-backup-before-xray-apply-v111/owrt-remote`.
`/root/owrt-remote-backup-before-xray-apply-v112/owrt-remote`.
Из PowerShell Windows 11; замените IP, если адрес роутера отличается:
+1 -1
View File
@@ -131,7 +131,7 @@ class HubFixture:
assert "groups" in json.loads(self.request("/api/router-groups"))
assert "notifications" in json.loads(self.request("/api/notifications"))
assert self.request("/access/test-router/") == b"router proxy fixture"
assert b"v111" in self.request("/")
assert b"v112" in self.request("/")
self.app.snapshot_router_states()
def __exit__(self, *args):
+181
View File
@@ -0,0 +1,181 @@
"""Selected-uplink failover with mocked OpenWrt netifd and kernel routes."""
import json
import os
from pathlib import Path
import unittest
import test_host_policy as host_policy
SH = host_policy.SH
UPLINK_MOCKS = r'''
ubus() {
local iface up device dns
iface="${2#network.interface.}"
up=1; device=''; dns=''
case "$iface" in
wan) [ ! -e "$TEST_ROOT/wan-down" ] || up=0; device=eth0; dns=1.1.1.1 ;;
wwan) [ ! -e "$TEST_ROOT/wwan-down" ] || up=0; device=wlan1; dns=9.9.9.9 ;;
modem4g) [ ! -e "$TEST_ROOT/modem-down" ] || up=0; device=wwan0; dns=8.8.8.8 ;;
proxy) device=tun0; dns=127.0.0.1 ;;
*) return 1 ;;
esac
[ "$up" = 1 ] || device=''
printf '{"up":%s,"l3_device":"%s","dns-server":["%s"]}' "$up" "$device" "$dns"
}
jsonfilter() {
if [ "$1" = -i ]; then
"$TEST_PYTHON" "$TEST_ROOT/jsonfilter.py" "$2" "$4"
return
fi
"$TEST_PYTHON" "$TEST_ROOT/jsonfilter.py" - "$2"
}
ip() {
printf '%s\n' "$*" >>"$TEST_ROOT/ip"
case "$*" in
'-4 route show table main default dev eth0') [ -e "$TEST_ROOT/wan-down" ] || echo 'default via 192.0.2.1 dev eth0' ;;
'-4 route show table main default dev wlan1') [ -e "$TEST_ROOT/wwan-down" ] || echo 'default via 192.0.2.2 dev wlan1' ;;
'-4 route show table main default dev wwan0') [ -e "$TEST_ROOT/modem-down" ] || echo 'default dev wwan0' ;;
'-4 route show table main default dev tun0') echo 'default dev tun0' ;;
'-6 route show table main default dev '*) return 0 ;;
'-6 rule show') return 0 ;;
'-4 rule show') return 0 ;;
esac
return 0
}
'''
JSONFILTER = '''import json, re, sys
data = json.load(sys.stdin if sys.argv[1] == "-" else open(sys.argv[1]))
query = sys.argv[2]
if query == "@.l3_device":
value = data.get("l3_device", "")
elif query == '@["dns-server"][0]':
value = next(iter(data.get("dns-server", [])), "")
else:
tag = re.search(r'tag="([^"]+)"', query).group(1)
row = next((row for row in data.get("outbounds", []) if row.get("tag") == tag), {})
if query.endswith(".interface"):
value = row.get("streamSettings", {}).get("sockopt", {}).get("interface", "")
else:
value = row.get("settings", {}).get("address", "")
sys.stdout.buffer.write(str(value).encode())
'''
@unittest.skipUnless(SH, "A POSIX shell is required")
class WanFailoverTests(unittest.TestCase):
setUp = host_policy.RouterShellTests.setUp
config = host_policy.RouterShellTests.config
run_shell = host_policy.RouterShellTests.run_shell
def prepare(self, interfaces="wan wwan modem4g"):
self.config(wan_interface=interfaces, wan_direct="1", vps_host="192.0.2.10", vps_host_mode="manual",
hub_url="https://hub.example", hub_token="test-token", vless_uuid="test-uuid")
self.directory.joinpath("jsonfilter.py").write_text(JSONFILTER, encoding="utf-8")
def shell(self, commands):
return self.run_shell(UPLINK_MOCKS + "\n" + commands)
def test_down_primary_selects_wifi_and_uses_its_dns_and_routes(self):
self.prepare()
self.directory.joinpath("wan-down").touch()
result = self.shell('wan_prepare && printf "active=%s device=%s dns=%s" "$(cat "$WAN_STATE/active-interface")" "$(wan_device)" "$(wan_dns_server)"')
self.assertEqual(result.returncode, 0, result.stderr)
self.assertEqual(result.stdout, "active=wwan device=wlan1 dns=9.9.9.9")
self.assertIn("via 192.0.2.2 dev wlan1 onlink table 210", self.directory.joinpath("ip").read_text())
def test_third_uplink_is_used_when_first_two_are_down(self):
self.prepare()
self.directory.joinpath("wan-down").touch()
self.directory.joinpath("wwan-down").touch()
result = self.shell('wan_prepare && printf "%s %s" "$(wan_device)" "$(wan_dns_server)"')
self.assertEqual(result.returncode, 0, result.stderr)
self.assertEqual(result.stdout, "wwan0 8.8.8.8")
def test_healthy_backup_is_retained_when_primary_returns(self):
self.prepare()
result = self.shell('touch "$TEST_ROOT/wan-down"; wan_prepare || exit; rm "$TEST_ROOT/wan-down"; wan_prepare || exit; cat "$WAN_STATE/active-interface"')
self.assertEqual(result.returncode, 0, result.stderr)
self.assertEqual(result.stdout.strip(), "wwan")
def test_failover_rebinds_rendered_reverse_connections_and_heartbeat(self):
self.prepare()
result = self.shell('wan_prepare || exit; touch "$TEST_ROOT/wan-down"; render_client_config --stdout')
self.assertEqual(result.returncode, 0, result.stderr)
config = json.loads(result.stdout)
for outbound in config["outbounds"]:
if outbound["tag"].startswith("vps-"):
self.assertEqual(outbound["streamSettings"]["sockopt"]["interface"], "wlan1")
else:
self.assertNotIn("streamSettings", outbound)
result = self.shell('wan_post_json https://hub.example/api/heartbeat test-token "$TEST_ROOT/payload"')
self.assertEqual(result.returncode, 0, result.stderr)
self.assertIn("<wlan1>", self.directory.joinpath("curl").read_text())
self.assertIn("WAN failover: wan -> wwan", self.directory.joinpath("log").read_text())
def test_only_selected_real_uplinks_are_used_and_all_down_fails(self):
self.prepare("proxy wan")
result = self.shell('printf "%s" "$(wan_select_interface)"')
self.assertEqual(result.stdout, "wan")
self.directory.joinpath("wan-down").touch()
result = self.shell("wan_prepare")
self.assertNotEqual(result.returncode, 0)
self.assertFalse(self.directory.joinpath("owrt-remote-wan/lock").exists())
self.assertFalse(self.directory.joinpath("owrt-remote-wan/active-interface").exists())
def test_xray_reconnect_is_requested_only_for_a_changed_binding(self):
self.prepare()
config = self.directory / "xray.json"
config.write_text(json.dumps({"outbounds": [{"tag": "vps-interconn", "streamSettings": {"sockopt": {"interface": "eth0"}}}]}))
self.config(wan_interface="wan wwan", wan_direct="1", vps_host="192.0.2.10", xray_config=config.as_posix())
result = self.shell('''
xray_running() { return 0; }
wan_reconnect_xray() { printf '%s -> %s\n' "$1" "$2" >>"$TEST_ROOT/reconnect"; }
wan_prepare || exit
wan_reconcile_xray || exit
touch "$TEST_ROOT/wan-down"
wan_prepare || exit
wan_reconcile_xray
''')
self.assertEqual(result.returncode, 0, result.stderr)
self.assertEqual(self.directory.joinpath("reconnect").read_text(), "eth0 -> wlan1\n")
def test_concurrent_reconnect_requests_restart_once_and_release_lock(self):
self.prepare()
restart = self.directory / "restart"
restart.write_text('#!/bin/sh\nprintf "%s\\n" "$*" >>"$TEST_ROOT/restarts"\n', encoding="utf-8", newline="\n")
restart.chmod(0o755)
original = "/etc/init.d/owrt-remote restart >/dev/null 2>&1 || log 'WAN failover tunnel restart failed'"
self.assertIn(original, self.agent)
self.agent = self.agent.replace(original, '"$TEST_ROOT/restart" restart >/dev/null 2>&1')
result = self.shell('wan_reconnect_xray eth0 wlan1; wan_reconnect_xray eth0 wlan1; sleep 2')
self.assertEqual(result.returncode, 0, result.stderr)
self.assertEqual(self.directory.joinpath("restarts").read_text(), "restart\n")
self.assertFalse(self.directory.joinpath("owrt-remote-wan-restart").exists())
def test_hotplug_handles_selected_wifi_and_modem_events_and_ignores_others(self):
self.prepare()
self.config(enabled="1", wan_direct="1", wan_interface="wan wwan modem4g")
hotplug = (host_policy.ROOT / "files/etc/hotplug.d/iface/99-owrt-remote").read_text(encoding="utf-8")
hotplug = hotplug.replace('/usr/sbin/owrt-remote', 'test_hotplug_agent').replace('/etc/init.d/owrt-remote', 'test_hotplug_restart')
callbacks = r'''
sleep() { :; }
test_hotplug_agent() { printf '%s\n' "$*" >>"$TEST_ROOT/hotplug-calls"; }
test_hotplug_restart() { printf restart >>"$TEST_ROOT/hotplug-calls"; }
'''
for iface, action, expected in (("wwan", "ifup", True), ("modem4g", "ifdown", True), ("lan", "ifup", False)):
with self.subTest(iface=iface, action=action):
calls = self.directory / "hotplug-calls"
calls.unlink(missing_ok=True)
result = self.run_shell(callbacks + '\n' + hotplug, INTERFACE=iface, ACTION=action, DEVICE="wlan1")
self.assertEqual(result.returncode, 0, result.stderr)
if expected:
self.assertEqual(calls.read_text(), "heartbeat wan-reconnect\n")
else:
self.assertFalse(calls.exists())
if __name__ == "__main__":
unittest.main()
+199
View File
@@ -0,0 +1,199 @@
"""Router uplink picker regressions using real CGI requests and mocked netifd/UCI."""
from html.parser import HTMLParser
import json
import os
from pathlib import Path
import shutil
import subprocess
import sys
import tempfile
import unittest
from urllib.parse import urlencode
ROOT = Path(__file__).resolve().parents[1]
SH = shutil.which("sh")
GIT_BIN = Path(os.environ.get("ProgramFiles", "C:/Program Files")) / "Git/usr/bin"
if os.name == "nt" and (GIT_BIN / "sh.exe").exists():
SH = str(GIT_BIN / "sh.exe")
class FormParser(HTMLParser):
def __init__(self):
super().__init__()
self.fields = {}
self.options = []
def handle_starttag(self, tag, attrs):
attrs = dict(attrs)
if tag == "input" and attrs.get("name"):
if attrs["name"] == "wan_interface" and attrs.get("type") == "checkbox":
selected = "checked" in attrs
self.options.append((attrs.get("value", ""), selected))
if selected:
self.fields.setdefault("wan_interface", []).append(attrs.get("value", ""))
return
if attrs.get("type") != "checkbox" or "checked" in attrs:
self.fields[attrs["name"]] = attrs.get("value", "")
MOCKS = r'''
uci() {
[ "$1" != -q ] || shift
case "$1" in
show) cat "$TEST_ROOT/network" ;;
get)
[ "$2" != owrtremote.main ] || { printf remote; return; }
awk -F= -v key="$2" '$1==key { sub(/^[^=]*=/, ""); print; found=1; exit } END { if (!found) exit 1 }' "$TEST_ROOT/config"
;;
set)
key="${2%%=*}"; value="${2#*=}"
awk -F= -v key="$key" '$1!=key' "$TEST_ROOT/config" >"$TEST_ROOT/config.new"
printf '%s=%s\n' "$key" "$value" >>"$TEST_ROOT/config.new"
mv "$TEST_ROOT/config.new" "$TEST_ROOT/config"
;;
commit) printf '%s\n' "$*" >>"$TEST_ROOT/commits" ;;
esac
}
ubus() {
[ "$*" = 'call network.interface dump' ] || return 1
cat "$TEST_ROOT/runtime"
}
jsonfilter() {
[ "$*" = '-e @.interface[*].interface' ] || return 1
"$TEST_PYTHON" -c 'import json, sys; sys.stdout.buffer.write("\n".join(i["interface"] for i in json.load(sys.stdin).get("interface", [])).encode())'
}
service_enabled() { return 0; }
xray_running() { return 0; }
render_page() {
if [ "${TEST_FULL_PAGE:-0}" = 1 ]; then render_full_page; return; fi
printf '<form><input name="key" value="test-web-key"><input type="checkbox" name="wan_direct" value="1" checked>'
field router_name 'Название'
field vps_host 'VPS host'
wan_interface_field
printf '</form><p>%s</p>' "$RESULT_TITLE"
}
'''
@unittest.skipUnless(SH, "A POSIX shell is required")
class WanInterfacePickerTests(unittest.TestCase):
def setUp(self):
self.temp = tempfile.TemporaryDirectory(prefix="owrt-wan-picker-")
self.addCleanup(self.temp.cleanup)
self.directory = Path(self.temp.name)
self.directory.joinpath("key").write_text("test-web-key", encoding="utf-8")
self.directory.joinpath("config").write_text(
"owrtremote.main.wan_interface=wan\nowrtremote.main.wan_direct=1\n"
"owrtremote.main.vps_host=192.0.2.25\nowrtremote.main.vps_host_mode=manual\n"
"owrtremote.main.router_name=Test router\n", encoding="utf-8")
self.network(["lan", "wan", "wwan", "modem4g"], ["lan", "wan", "wwan"])
source = (ROOT / "files/www/cgi-bin/owrt-remote").read_text(encoding="utf-8")
self.cgi = self.directory / "cgi"
source = source.replace('render_page() {', 'render_full_page() {', 1)
self.cgi.write_text(source.replace("\nread_request\n", MOCKS + "\nread_request\n", 1), encoding="utf-8", newline="\n")
self.env = {**os.environ, "TMPDIR": self.directory.as_posix(), "TEST_ROOT": self.directory.as_posix(),
"TEST_PYTHON": Path(sys.executable).as_posix(), "KEY_FILE": (self.directory / "key").as_posix(),
"AGENT": "true"}
if os.name == "nt":
self.env["PATH"] = str(GIT_BIN) + os.pathsep + self.env["PATH"]
def network(self, configured, runtime):
self.directory.joinpath("network").write_text(
"network.globals=globals\n" + "".join(f"network.{name}=interface\nnetwork.{name}.proto='dhcp'\n" for name in configured), encoding="utf-8")
self.directory.joinpath("runtime").write_text(json.dumps({"interface": [{"interface": name} for name in runtime]}), encoding="utf-8")
def select(self, value):
path = self.directory / "config"
rows = [row for row in path.read_text().splitlines() if not row.startswith("owrtremote.main.wan_interface=")]
path.write_text("\n".join(rows) + f"\nowrtremote.main.wan_interface={value}\n", encoding="utf-8")
def request(self, data=None, key="test-web-key"):
body = urlencode(data or {}, doseq=True).encode("ascii")
result = subprocess.run([SH, self.cgi.as_posix()], input=body, capture_output=True,
env={**self.env, "QUERY_STRING": urlencode({"key": key}),
"REQUEST_METHOD": "POST" if data else "GET", "CONTENT_LENGTH": str(len(body)),
"CONTENT_TYPE": "application/x-www-form-urlencoded"}, timeout=30)
self.assertEqual(result.returncode, 0, result.stderr.decode("utf-8", errors="replace"))
page = result.stdout.decode("utf-8")
parser = FormParser()
parser.feed(page)
return page, parser
def test_all_configured_and_runtime_interfaces_appear_once_in_real_page(self):
self.env["TEST_FULL_PAGE"] = "1"
self.network(["lan", "wan", "wwan", "modem4g"], ["wan", "wwan", "lte"])
page, form = self.request()
self.assertEqual(form.options, [("wan", True), ("lan", False), ("lte", False), ("modem4g", False), ("wwan", False)])
self.assertIn('<details class="wanPicker" data-wan-picker>', page)
self.assertNotIn('<select name="wan_interface"', page)
def test_custom_saved_uplink_is_selected_without_reset(self):
for name in ("wwan", "modem4g"):
with self.subTest(name=name):
self.select(name)
_, form = self.request()
self.assertEqual(form.fields["wan_interface"], [name])
self.assertEqual(sum(selected for _, selected in form.options), 1)
def test_unavailable_saved_interface_survives_list_failure(self):
self.select("internet2")
self.network([], [])
page, form = self.request()
self.assertEqual(form.options, [("internet2", True)])
self.assertIn('data-wan-picked>internet2</div>', page)
self.assertIn("owrtremote.main.wan_interface=internet2", self.directory.joinpath("config").read_text())
def test_empty_legacy_value_uses_wan_and_keeps_offline_choices(self):
self.select("")
self.network(["modem4g", "wwan"], [])
_, form = self.request()
self.assertEqual(form.options, [("wan", True), ("modem4g", False), ("wwan", False)])
def test_invalid_runtime_names_are_filtered_and_saved_value_is_escaped(self):
self.select('old"<&interface')
self.network(["wan"], ["wan", 'evil"><script>', "two names"])
page, form = self.request()
self.assertEqual(form.options, [('old"<&interface', True), ("wan", False)])
self.assertNotIn("<script>", page)
self.assertIn('value="old&quot;&lt;&amp;interface"', page)
def test_form_saves_selected_modem_and_preserves_other_fields(self):
_, form = self.request()
form.fields.update({"action": "save", "wan_interface": "modem4g"})
page, saved = self.request(form.fields)
self.assertEqual(saved.fields["wan_interface"], ["modem4g"])
self.assertIn("Настройки сохранены", page)
config = self.directory.joinpath("config").read_text()
for row in ("wan_interface=modem4g", "wan_direct=1", "vps_host=192.0.2.25", "vps_host_mode=manual", "router_name=Test router"):
self.assertIn("owrtremote.main." + row + "\n", config)
self.assertEqual(self.directory.joinpath("commits").read_text(), "commit owrtremote\n")
self.assertEqual(self.directory.joinpath("network").read_text().count("=interface\n"), 4)
def test_two_or_three_selections_save_and_reopen_without_losing_choices(self):
_, form = self.request()
form.fields.update({"action": "save", "wan_interface": ["wan", "wwan", "modem4g", "wan"]})
_, saved = self.request(form.fields)
self.assertEqual(set(saved.fields["wan_interface"]), {"wan", "wwan", "modem4g"})
self.assertIn("owrtremote.main.wan_interface=wan wwan modem4g\n", self.directory.joinpath("config").read_text())
_, reopened = self.request()
self.assertEqual(set(reopened.fields["wan_interface"]), {"wan", "wwan", "modem4g"})
self.assertEqual(reopened.fields["wan_interface"][0], "wan")
def test_empty_or_invalid_selection_is_rejected_before_configuration_changes(self):
before = self.directory.joinpath("config").read_bytes()
for choice in ([], ["wan", "invalid interface"], ["wan", "bad;name"]):
with self.subTest(choice=choice):
page, _ = self.request({"action": "save_start", "wan_interface_picker": "1", "wan_direct": "1", "wan_interface": choice})
self.assertIn("Настройки не сохранены", page)
self.assertEqual(self.directory.joinpath("config").read_bytes(), before)
self.assertFalse(self.directory.joinpath("commits").exists())
def test_unauthorized_request_cannot_list_or_save_interfaces(self):
page, form = self.request({"action": "save", "wan_interface": "modem4g"}, key="wrong-key")
self.assertIn("Доступ запрещен", page)
self.assertFalse(form.options)
self.assertIn("owrtremote.main.wan_interface=wan\n", self.directory.joinpath("config").read_text())
if __name__ == "__main__":
unittest.main()
+37
View File
@@ -0,0 +1,37 @@
// Exercise the actual router picker script: checkbox changes must not close it.
const assert = require('node:assert/strict');
const fs = require('node:fs');
const vm = require('node:vm');
const source = fs.readFileSync('files/www/cgi-bin/owrt-remote', 'utf8');
const begin = source.indexOf("document.querySelectorAll('[data-wan-picker]')");
const end = source.indexOf('</script>', begin);
assert(begin >= 0 && end > begin);
for (const mobile of [false, true]) {
const inputs = ['wan', 'wwan', 'modem4g'].map(value => ({value, checked: value === 'wan'}));
const count = {}, picked = {}, handlers = {};
const picker = {
open: false,
closest() { return {querySelector: selector => selector === '[data-wan-count]' ? count : picked}; },
querySelectorAll() { return inputs; },
addEventListener(name, handler) { handlers[name] = handler; },
};
vm.runInNewContext(source.slice(begin, end), {
document: {querySelectorAll: () => [picker]},
window: {matchMedia: () => ({matches: mobile})},
});
assert.equal(count.textContent, 1);
assert.equal(picked.textContent, 'wan');
picker.open = true;
inputs[1].checked = true;
inputs[2].checked = true;
handlers.change();
assert.equal(count.textContent, 3);
assert.equal(picked.textContent, 'wan, wwan, modem4g');
assert.equal(picker.open, true);
for (const input of inputs) input.checked = false;
handlers.change();
assert.equal(count.textContent, 0);
assert.equal(picked.textContent, 'Интерфейсы не выбраны');
assert.equal(picker.open, true);
}
console.log('WAN_PICKER_UI_OK: multiple checks, count, empty selection and open-list persistence');
+9 -9
View File
@@ -5,7 +5,7 @@ param(
[string]$PinnedVpsHost = '193.233.82.38',
[ValidatePattern('^[a-zA-Z0-9_-]+$')][string]$WanInterface = 'wan',
[switch]$PreserveConnectionSettings,
[ValidatePattern('^[a-zA-Z0-9_-]+$')][string]$BackupName = 'host-policy-v111',
[ValidatePattern('^[a-zA-Z0-9_-]+$')][string]$BackupName = 'host-policy-v112',
[switch]$PrepareOnly
)
@@ -90,7 +90,7 @@ test -s "$config"
if [ '__ACTION__' = Install ]; then
for item in agent wan.sh cgi init; do test -s "$stage/$item"; sh -n "$stage/$item"; done
test -s "$stage/luci"
for item in cgi luci; do grep -F -q 'v111' "$stage/$item"; done
for item in cgi luci; do grep -F -q 'v112' "$stage/$item"; done
# curl is needed to preserve HTTPS SNI and bypass the local DNS/proxy.
if ! command -v curl >/dev/null 2>&1; then
if command -v opkg >/dev/null 2>&1; then opkg update && opkg install curl ca-bundle
@@ -156,16 +156,16 @@ if [ '__ACTION__' = Install ]; then
exit 1
fi
/usr/sbin/owrt-remote status
grep -F -q 'v111' /www/cgi-bin/owrt-remote
grep -F -q 'v111' /www/luci-static/resources/view/owrt_remote.js
echo HOST_POLICY_ROUTER_V111_OK
grep -F -q 'v112' /www/cgi-bin/owrt-remote
grep -F -q 'v112' /www/luci-static/resources/view/owrt_remote.js
echo HOST_POLICY_ROUTER_V112_OK
else
test -f "$backup/complete"
save_files "$stage/previous"
changed=1
restore_files "$backup"
/usr/sbin/owrt-remote status
echo HOST_POLICY_ROUTER_V111_ROLLBACK_OK
echo HOST_POLICY_ROUTER_V112_ROLLBACK_OK
fi
'@
} else {
@@ -180,7 +180,7 @@ fi
set -eu
stage=/tmp/__UPLOAD_NAME__
target=/opt/owrt-remote/owrt-remote-hub.py
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-host-policy-v111
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-host-policy-v112
changed=0
cleanup() {
code=$?
@@ -200,7 +200,7 @@ test -s "$target"
python_bin=/opt/owrt-remote/venv/bin/python
[ -x "$python_bin" ] || python_bin=python3
if [ '__ACTION__' = Install ]; then
grep -F -q 'v111' "$stage/hub.py"
grep -F -q 'v112' "$stage/hub.py"
"$python_bin" -m py_compile "$stage/hub.py"
OWRT_HOST_POLICY_HUB_SOURCE="$stage/hub.py" "$python_bin" "$stage/test_host_policy.py" HostPolicyTests -v
OWRT_RESOURCE_HUB_SOURCE="$stage/hub.py" "$python_bin" "$stage/resources.py" -v
@@ -226,7 +226,7 @@ for attempt in 1 2 3 4 5 6 7 8 9 10; do
done
test "$healthy" = 1
cmp "$candidate" "$target"
printf '\nHOST_POLICY_VPS_V111_%s_OK\n' '__ACTION__'
printf '\nHOST_POLICY_VPS_V112_%s_OK\n' '__ACTION__'
'@
}
+6 -6
View File
@@ -17,8 +17,8 @@ if ($Action -eq 'Install') {
set -Eeuo pipefail
stage=/tmp/__UPLOAD_NAME__
target=/opt/owrt-remote/owrt-remote-hub.py
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-recaptcha-v3-v111
captcha_backup=/opt/owrt-remote/captcha-before-recaptcha-v3-v111.json
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-recaptcha-v3-v112
captcha_backup=/opt/owrt-remote/captcha-before-recaptcha-v3-v112.json
candidate=$target.new-__UPLOAD_NAME__
changed=0
cleanup() {
@@ -45,7 +45,7 @@ if [ ! -x "$python_bin" ]; then python_bin=python3; fi
import ast, pathlib, sys
source = pathlib.Path(sys.argv[1]).read_text(encoding='utf-8')
tree = ast.parse(source)
assert 'v111' in source
assert 'v112' in source
assert 'v108' not in source
assert 'CAPTCHA_MODE_RECAPTCHA_V3' in source
assert 'prepareLoginRecaptcha' in source
@@ -88,7 +88,7 @@ pid=$(systemctl show owrt-remote -p MainPID --value)
test "$pid" -gt 0
printf 'PID=%s FD=%s\n' "$pid" "$(find /proc/$pid/fd -maxdepth 1 -type l | wc -l)"
systemctl --no-pager --full status owrt-remote | sed -n '1,16p'
echo RECAPTCHA_V3_V111_OK
echo RECAPTCHA_V3_V112_OK
'@
} elseif ($Action -eq 'Rollback') {
$RemoteScript = @'
@@ -96,8 +96,8 @@ echo RECAPTCHA_V3_V111_OK
set -Eeuo pipefail
stage=/tmp/__UPLOAD_NAME__
target=/opt/owrt-remote/owrt-remote-hub.py
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-recaptcha-v3-v111
captcha_backup=/opt/owrt-remote/captcha-before-recaptcha-v3-v111.json
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-recaptcha-v3-v112
captcha_backup=/opt/owrt-remote/captcha-before-recaptcha-v3-v112.json
candidate=$target.rollback-__UPLOAD_NAME__
changed=0
restore_captcha() {
+4 -4
View File
@@ -18,7 +18,7 @@ if ($Action -eq 'Install') {
set -Eeuo pipefail
stage=/tmp/__UPLOAD_NAME__
target=/opt/owrt-remote/owrt-remote-hub.py
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-resource-fix-v111
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-resource-fix-v112
candidate=$target.new-__UPLOAD_NAME__
changed=0
cleanup() {
@@ -45,7 +45,7 @@ if [ ! -x "$python_bin" ]; then python_bin=python3; fi
import ast, pathlib, sys
source = pathlib.Path(sys.argv[1]).read_text(encoding='utf-8')
tree = ast.parse(source)
assert 'v111' in source
assert 'v112' in source
assert 'v108' not in source
factory = next(node for node in tree.body if isinstance(node, ast.FunctionDef) and node.name == 'connect')
assert any(isinstance(item, ast.Name) and item.id == 'contextmanager' for item in factory.decorator_list)
@@ -78,7 +78,7 @@ pid=$(systemctl show owrt-remote -p MainPID --value)
test "$pid" -gt 0
printf 'PID=%s FD=%s\n' "$pid" "$(find /proc/$pid/fd -maxdepth 1 -type l | wc -l)"
systemctl --no-pager --full status owrt-remote | sed -n '1,16p'
echo RESOURCE_FIX_V111_OK
echo RESOURCE_FIX_V112_OK
'@
} elseif ($Action -eq 'Rollback') {
$RemoteScript = @'
@@ -86,7 +86,7 @@ echo RESOURCE_FIX_V111_OK
set -Eeuo pipefail
stage=/tmp/__UPLOAD_NAME__
target=/opt/owrt-remote/owrt-remote-hub.py
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-resource-fix-v111
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-resource-fix-v112
candidate=$target.rollback-__UPLOAD_NAME__
changed=0
cleanup() {
+3 -2
View File
@@ -14,7 +14,7 @@ $RemoteScript = @'
set -eu
stage=/tmp/__UPLOAD_NAME__
target=/opt/owrt-remote/owrt-remote-hub.py
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-vps-widgets-v111
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-vps-widgets-v112
candidate=$target.new-__UPLOAD_NAME__
changed=0
cleanup() {
@@ -37,6 +37,7 @@ python_bin=/opt/owrt-remote/venv/bin/python
[ -x "$python_bin" ] || python_bin=python3
if [ '__ACTION__' = Install ]; then
test -s "$stage/hub.py"
grep -F -q 'v112' "$stage/hub.py"
"$python_bin" -m py_compile "$stage/hub.py"
OWRT_VPS_WIDGETS_HUB_SOURCE="$stage/hub.py" "$python_bin" "$stage/tests.py" -v
if [ ! -e "$backup" ]; then cp -p "$target" "$backup"; fi
@@ -66,7 +67,7 @@ if [ '__ACTION__' = Install ]; then
code=$(curl -sS --max-time 5 -o "$stage/response.json" -w '%{http_code}' http://127.0.0.1:8088/api/vps/resources)
test "$code" = 401
fi
printf '\nVPS_WIDGETS_V111_%s_OK\n' '__ACTION__'
printf '\nVPS_WIDGETS_V112_%s_OK\n' '__ACTION__'
'@
$RemoteScript = $RemoteScript.Replace('__UPLOAD_NAME__', $UploadName).Replace('__ACTION__', $Action)
try {
+8
View File
@@ -0,0 +1,8 @@
param(
[Parameter(Mandatory = $true)][ValidateNotNullOrEmpty()][string]$Router,
[ValidateSet('Install', 'Rollback')][string]$Action = 'Install',
[switch]$PrepareOnly
)
# The picker and failover backend must always be installed together.
& (Join-Path $PSScriptRoot 'deploy-wan-multi.ps1') @PSBoundParameters
+153
View File
@@ -0,0 +1,153 @@
param(
[Parameter(Mandatory = $true)][ValidateNotNullOrEmpty()][string]$Router,
[ValidateSet('Install', 'Rollback')][string]$Action = 'Install',
[switch]$PrepareOnly
)
$ErrorActionPreference = 'Stop'
$RepoRoot = Split-Path -Parent $PSScriptRoot
$UploadName = 'owrt-wan-multi-' + [guid]::NewGuid().ToString('N')
$StageRoot = Join-Path ([System.IO.Path]::GetTempPath()) $UploadName
$Utf8 = [System.Text.UTF8Encoding]::new($false)
$Payloads = @{
'agent' = 'files\usr\sbin\owrt-remote'
'wan.sh' = 'files\usr\lib\owrt-remote\wan.sh'
'cgi' = 'files\www\cgi-bin\owrt-remote'
'luci' = 'files\www\luci-static\resources\view\owrt_remote.js'
'hotplug' = 'files\etc\hotplug.d\iface\99-owrt-remote'
}
$RemoteScript = @'
#!/bin/sh
set -eu
stage=/tmp/__UPLOAD_NAME__
backup=/root/owrt-remote-backup-before-wan-multi-v112
config=/etc/config/owrtremote
changed=0
item_path() {
case "$1" in
agent) printf /usr/sbin/owrt-remote ;;
wan.sh) printf /usr/lib/owrt-remote/wan.sh ;;
cgi) printf /www/cgi-bin/owrt-remote ;;
luci) printf /www/luci-static/resources/view/owrt_remote.js ;;
hotplug) printf /etc/hotplug.d/iface/99-owrt-remote ;;
esac
}
save_files() {
dir=$1
mkdir -p "$dir"
chmod 700 "$dir"
cp -p "$config" "$dir/config"
for item in agent wan.sh cgi luci hotplug; do
path=$(item_path "$item")
if [ -f "$path" ]; then cp -p "$path" "$dir/$item"; else touch "$dir/$item.absent"; fi
done
xray_config=$(uci -q get owrtremote.main.xray_config || echo /etc/xray/owrt-remote-client.json)
[ -n "$xray_config" ] || xray_config=/etc/xray/owrt-remote-client.json
printf '%s' "$xray_config" >"$dir/xray-path"
if [ -f "$xray_config" ]; then cp -p "$xray_config" "$dir/xray"; else touch "$dir/xray.absent"; fi
chmod 600 "$dir/config" "$dir/xray-path"
[ ! -f "$dir/xray" ] || chmod 600 "$dir/xray"
touch "$dir/complete"
}
restore_files() {
dir=$1
test -f "$dir/complete"
/etc/init.d/owrt-remote stop >/dev/null 2>&1 || true
cp -p "$dir/config" "$config"
for item in agent wan.sh cgi luci hotplug; do
path=$(item_path "$item")
if [ -f "$dir/$item.absent" ]; then rm -f "$path"; else cp -p "$dir/$item" "$path"; fi
done
xray_config=$(cat "$dir/xray-path")
if [ -f "$dir/xray.absent" ]; then rm -f "$xray_config"; else cp -p "$dir/xray" "$xray_config"; fi
/etc/init.d/owrt-remote restart
}
cleanup() {
code=$?
trap - EXIT
if [ "$code" -ne 0 ] && [ "$changed" = 1 ]; then
echo 'Operation failed; restoring the previous files and settings.' >&2
restore_files "$stage/previous" || true
fi
for item in agent wan.sh cgi luci hotplug; do
path=$(item_path "$item")
rm -f "$path.new-__UPLOAD_NAME__"
done
rm -rf "$stage"
exit "$code"
}
trap cleanup EXIT
test -s "$config"
if [ '__ACTION__' = Install ]; then
for item in agent wan.sh cgi hotplug; do test -s "$stage/$item"; sh -n "$stage/$item"; done
test -s "$stage/luci"
for item in cgi luci; do grep -F -q 'v112' "$stage/$item"; done
grep -F -q 'wan_interface_picker' "$stage/cgi"
grep -F -q 'wan_select_interface()' "$stage/wan.sh"
grep -F -q 'wan_reconcile_xray()' "$stage/agent"
if [ "$(uci -q get owrtremote.main.wan_direct || echo 0)" = 1 ]; then
OWRT_REMOTE_WAN_HELPER="$stage/wan.sh" sh "$stage/agent" wan-preflight
fi
if [ ! -e "$backup" ]; then
save_files "$stage/retained-backup"
mv "$stage/retained-backup" "$backup"
fi
test -f "$backup/complete"
save_files "$stage/previous"
changed=1
/etc/init.d/owrt-remote stop
mkdir -p /usr/lib/owrt-remote /etc/hotplug.d/iface /www/luci-static/resources/view
for item in agent wan.sh cgi luci hotplug; do
path=$(item_path "$item")
cp "$stage/$item" "$path.new-__UPLOAD_NAME__"
case "$item" in
wan.sh|luci) chmod 644 "$path.new-__UPLOAD_NAME__" ;;
*) chmod 755 "$path.new-__UPLOAD_NAME__" ;;
esac
mv -f "$path.new-__UPLOAD_NAME__" "$path"
done
/etc/init.d/owrt-remote restart
if [ "$(uci -q get owrtremote.main.enabled || echo 0)" = 1 ]; then
ready=0
for attempt in 1 2 3 4 5 6 7 8 9 10; do
if /usr/sbin/owrt-remote status | grep -q '^xray_state: running'; then ready=1; break; fi
sleep 2
done
test "$ready" = 1
fi
for item in agent wan.sh cgi luci hotplug; do
path=$(item_path "$item")
cmp "$stage/$item" "$path"
done
else
test -f "$backup/complete"
save_files "$stage/previous"
changed=1
restore_files "$backup"
fi
printf '\nBackup: %s\nWAN_MULTI_ROUTER_%s_OK\n' "$backup" '__ACTION__'
'@
$RemoteScript = $RemoteScript.Replace('__UPLOAD_NAME__', $UploadName).Replace('__ACTION__', $Action)
try {
[System.IO.Directory]::CreateDirectory($StageRoot) | Out-Null
[System.IO.File]::WriteAllText((Join-Path $StageRoot 'run.sh'), $RemoteScript.Replace("`r`n", "`n") + "`n", $Utf8)
if ($Action -eq 'Install') {
foreach ($Item in $Payloads.GetEnumerator()) {
$Content = [System.IO.File]::ReadAllText((Join-Path $RepoRoot $Item.Value)).Replace("`r`n", "`n")
[System.IO.File]::WriteAllText((Join-Path $StageRoot $Item.Key), $Content, $Utf8)
}
}
if ($PrepareOnly) { Write-Host "Prepared only: $StageRoot"; return }
& scp -O -r -- $StageRoot "${Router}:/tmp/"
if ($LASTEXITCODE -ne 0) { throw 'Upload failed. Installation has not started.' }
& ssh -T -o ConnectTimeout=10 $Router "sh /tmp/$UploadName/run.sh"
if ($LASTEXITCODE -ne 0) { throw "$Action failed. See the output above; success was not confirmed." }
Write-Host "WAN multi-interface $Action finished successfully."
} finally {
if (-not $PrepareOnly) {
$Resolved = [System.IO.Path]::GetFullPath($StageRoot)
$Expected = [System.IO.Path]::GetFullPath((Join-Path ([System.IO.Path]::GetTempPath()) $UploadName))
if ($Resolved -ne $Expected -or (Split-Path -Leaf $Resolved) -ne $UploadName) { throw 'Unsafe staging cleanup path.' }
if (Test-Path -LiteralPath $Resolved) { Remove-Item -LiteralPath $Resolved -Recurse -Force }
}
}
+1 -1
View File
@@ -14,7 +14,7 @@ $RemoteScript = @'
set -eu
stage=/tmp/__UPLOAD_NAME__
target=/www/cgi-bin/owrt-remote
backup_dir=/root/owrt-remote-backup-before-xray-apply-v111
backup_dir=/root/owrt-remote-backup-before-xray-apply-v112
backup=$backup_dir/owrt-remote
candidate=$target.new-__UPLOAD_NAME__
changed=0
+4 -4
View File
@@ -4765,7 +4765,7 @@ input,select{{min-width:0;border:1px solid var(--line);border-radius:8px;padding
<div class="brand">
<div class="desktopHeader">
<div class="desktopHeaderTop">
<h1 class="appBanner"><span>OpenWrt Remote Hub <span class="appBannerVersion">v111</span></span></h1>
<h1 class="appBanner"><span>OpenWrt Remote Hub <span class="appBannerVersion">v112</span></span></h1>
<div class="routerSearchDock" id="routerSearchDock">
<button class="routerSearchToggle" id="routerSearchToggle" type="button" aria-expanded="false" aria-controls="routerSearchPanel" data-active="false">
<span>Поиск роутеров</span>
@@ -5118,7 +5118,7 @@ systemctl restart owrt-remote-xray</pre>
</div>
</div>
<div class="mobileSearchDock" id="mobileRouterSearchDock">
<span class="mobileSearchVersion">v111</span>
<span class="mobileSearchVersion">v112</span>
<button class="routerSearchToggle mobilePanelToggle primary" id="mobileRouterSearchToggle" type="button" aria-expanded="false" aria-controls="mobileRouterSearchPanel" data-active="false">
<span>Поиск роутеров</span>
</button>
@@ -12646,7 +12646,7 @@ button:hover{{filter:brightness(1.06)}}
<form class="login" method="post" action="/login">
{error_html}
<span class="brand">
<h1 class="appBanner"><span>OpenWrt Remote Hub <span class="appBannerVersion">v111</span></span></h1>
<h1 class="appBanner"><span>OpenWrt Remote Hub <span class="appBannerVersion">v112</span></span></h1>
</span>
<label for="hubUsername">Логин</label>
<input id="hubUsername" name="username" autocomplete="off" autofocus required>
@@ -13118,7 +13118,7 @@ body::after{{content:"";position:fixed;inset:0;pointer-events:none;background:li
<circle cx="65" cy="59" r="3" fill="#E5F2FF"/>
</svg>
</div>
<h2 class="brandTitle">OpenWrt Remote Hub <span class="brandVersion">v111</span></h2>
<h2 class="brandTitle">OpenWrt Remote Hub <span class="brandVersion">v112</span></h2>
</div>
</div>
<div class="brandBottom">