Fix OpenWrt Xray release discovery and installer diagnostics

This commit is contained in:
kzolotarev95 committed 2026-11-06 21:40:47 +04:00
1 parent 6cf3ae7c0f
commit edbc86697a
13 files changed
+1026 -274

No files matched your search

+248 -241
View File
@@ -5,14 +5,13 @@ export PATH="/bin:/sbin:/usr/bin:/usr/sbin:${PATH:-}"
CONFIG="owrtremote"
SECTION="main"
# OpenWrt packages are published by yichya for the architectures reported by
# opkg/apk. Keep the version explicit so a release cannot change underneath a
# running router. 26.6.27 is the last release compatible with the existing
# unencrypted VLESS reverse transport; 26.7.11+ rejects public destinations.
# Changing the package source alone does not change that protocol requirement.
# opkg/apk. The default is release discovery: the router asks GitHub for the
# published assets and validates each candidate before replacing Xray. An
# explicit XRAY_RELEASE_VERSION is retained as an administrator/test filter,
# never as the default package version.
XRAY_RELEASE_REPO="${XRAY_RELEASE_REPO:-https://github.com/yichya/openwrt-xray}"
XRAY_RELEASE_VERSION="${XRAY_RELEASE_VERSION:-26.6.27}"
XRAY_RELEASE_REVISION="${XRAY_RELEASE_REVISION:-1}"
XRAY_RELEASE_BASE_URL="${XRAY_RELEASE_BASE_URL:-$XRAY_RELEASE_REPO/releases/download/v$XRAY_RELEASE_VERSION}"
XRAY_RELEASE_VERSION="${XRAY_RELEASE_VERSION:-}"
XRAY_RELEASE_API_URL="${XRAY_RELEASE_API_URL:-https://api.github.com/repos/yichya/openwrt-xray/releases}"
log() {
# procd already captures stderr. Use only logger for managed processes.
@@ -32,6 +31,7 @@ usage() {
owrt-remote doctor
owrt-remote install-xray-tmp
owrt-remote prepare-xray
owrt-remote xray-package-diagnostics
owrt-remote stop-xray
owrt-remote render-client [--stdout]
owrt-remote run
@@ -396,160 +396,165 @@ xray_bin_path() {
printf '%s' "$configured"
}
fetch_file() {
local url dst
url="$1"
dst="$2"
if command -v wget >/dev/null 2>&1; then
wget -q -O "$dst" "$url"
return
fi
if command -v curl >/dev/null 2>&1; then
curl -fsSL "$url" -o "$dst"
return
fi
die "для скачивания нужен wget или curl"
}
xray_openwrt_info() (
. "${OWRT_REMOTE_RELEASE_FILE:-/etc/openwrt_release}" 2>/dev/null || return 1
case "$1" in arch) printf '%s' "${DISTRIB_ARCH:-}" ;; release) printf '%s' "${DISTRIB_RELEASE:-}" ;; esac
)
xray_arch() {
local arch machine_arch
# OpenWrt's package architecture is more precise than uname -m. In
# particular AX3000T reports aarch64 but requires aarch64_cortex-a53.
if command -v opkg >/dev/null 2>&1; then
arch="$(
opkg print-architecture 2>/dev/null | awk '
$1 == "arch" && $2 != "all" && $2 != "noarch" {
priority = $3 + 0
if (priority >= best_priority) {
best = $2
best_priority = priority
}
}
END {
if (best != "") {
print best
}
}
'
)"
[ -n "$arch" ] && {
printf '%s\n' "$arch"
return
}
fi
local arch precise
if command -v apk >/dev/null 2>&1; then
arch="$(apk --print-arch 2>/dev/null || true)"
case "$arch" in
aarch64) arch=aarch64_generic ;;
armv7|armv7l) arch=arm_cortex-a7_neon-vfpv4 ;;
x86_64) arch=x86_64 ;;
arch="$(apk --print-arch 2>/dev/null)" || return 1
precise="$(xray_openwrt_info arch)"
# Old APK reports a generic ABI (mipsel); the OpenWrt target gives
# the instruction set. Never guess 24kc/74kc from mipsel alone.
case "$arch:$precise" in
mipsel:mipsel_*|mips:mips_*|aarch64:aarch64_*|arm*:arm_*|x86:x86_*) arch="$precise" ;;
esac
[ -n "$arch" ] && {
printf '%s\n' "$arch"
return
}
elif command -v opkg >/dev/null 2>&1; then
arch="$(opkg print-architecture 2>/dev/null | awk '$1=="arch" && $2!="all" && $2!="noarch" && $3>=p {a=$2;p=$3} END {print a}')"
else
arch="$(xray_openwrt_info arch)"
fi
machine_arch="$(uname -m 2>/dev/null || true)"
case "$machine_arch" in
aarch64) arch=aarch64_generic ;;
armv7l|armv7*) arch=arm_cortex-a7_neon-vfpv4 ;;
armv6l|armv6*) arch=arm_arm1176jzf-s_vfp ;;
armv5l|armv5*) arch=arm_mpcore ;;
x86_64|amd64) arch=x86_64 ;;
i386|i686) arch=i386_pentium4 ;;
mips64el|mips64le) arch=mipsel_mips32 ;;
mipsel|mipsle) arch=mipsel_24kc ;;
mips64) arch=mips_mips32 ;;
mips) arch=mips_24kc ;;
*) arch="$machine_arch" ;;
esac
case "$arch" in ''|*[!A-Za-z0-9_.-]*) log 'Xray: cannot determine precise OpenWrt architecture'; return 1 ;; esac
printf '%s\n' "$arch"
}
xray_package_format() {
if command -v opkg >/dev/null 2>&1; then
printf '%s\n' ipk
return
fi
if command -v apk >/dev/null 2>&1; then
printf '%s\n' apk
return
fi
# OpenWrt uses opkg; retaining ipk as the default keeps the bootstrap
# deterministic on stripped images where the package manager is unavailable.
printf '%s\n' ipk
if command -v apk >/dev/null 2>&1; then printf 'apk\n'
elif command -v opkg >/dev/null 2>&1; then printf 'ipk\n'
else return 1; fi
}
xray_version_allowed() {
# A capability boundary, not a pinned download version. Every selected
# binary is also tested; newer releases reject our public VLESS transport.
LC_ALL=C awk -v v="${1#v}" 'BEGIN {n=split(v,a,"."); exit !(n==3 && v~/^[0-9]+\.[0-9]+\.[0-9]+$/ && a[1]*10000+a[2]*100+a[3]<260711)}'
}
xray_json() { jsonfilter -i "$1" -e "$2"; }
xray_release_asset() {
local version arch package_arch
version="${XRAY_RELEASE_VERSION#v}"
local arch
# Naming the cache must never perform a network request.
arch="$(xray_arch)" || return 1
[ -n "$arch" ] || return 1
case "$(xray_package_format)" in
apk) printf 'openwrt-xray-%s-r%s-%s.apk\n' "$version" "$XRAY_RELEASE_REVISION" "$arch" ;;
*)
# These yichya releases include both package and target architecture
# in the IPK filename. APK filenames do not use this extra suffix.
case "$version" in
26.6.1|26.6.22|26.6.27)
package_arch="$arch"
case "$arch" in
i386_pentium) package_arch=i386_pentium-mmx ;;
arm_cortex-a5-vfpv4) package_arch=arm_cortex-a5_vfpv4 ;;
arm_cortex-a5_vfpv4) arch=arm_cortex-a5-vfpv4 ;;
esac
printf 'openwrt-xray_%s-%s_%s-%s.ipk\n' "$version" "$XRAY_RELEASE_REVISION" "$package_arch" "$arch"
;;
*) printf 'openwrt-xray_%s-%s_%s.ipk\n' "$version" "$XRAY_RELEASE_REVISION" "$arch" ;;
esac
;;
esac
printf 'xray-%s' "$arch"
}
install_package() {
local pkg
pkg="$1"
if command -v opkg >/dev/null 2>&1; then
opkg update || die "не смог обновить opkg для установки $pkg"
opkg install "$pkg" || die "не смог поставить $pkg через opkg"
return
fi
if command -v apk >/dev/null 2>&1; then
apk -U add "$pkg" ca-certificates || die "не смог поставить $pkg через apk"
return
fi
die "не найден пакетный менеджер opkg или apk для установки $pkg"
}
ensure_xray_available() {
local configured candidate found
configured="$(uci_get xray_bin /usr/bin/xray)"
[ -x "$configured" ] && return 0
for candidate in /usr/bin/xray /usr/bin/xray-core /usr/local/bin/xray /opt/bin/xray /tmp/owrt-xray/xray /tmp/xray; do
if [ -x "$candidate" ]; then
found="$candidate"
break
fi
done
if [ -z "$found" ]; then
found="$(command -v xray 2>/dev/null || command -v xray-core 2>/dev/null || true)"
fi
if [ -n "$found" ] && [ -x "$found" ]; then
[ "$found" = "$configured" ] || {
uci set "$CONFIG.$SECTION.xray_bin=$found"
uci commit "$CONFIG"
log "Xray найден: $found"
xray_discover_releases() (
dest="$1"; work="$2"; arch="$(xray_arch)" || return 1
fmt="$(xray_package_format)" || return 1
command -v jsonfilter >/dev/null 2>&1 || install_package jsonfilter || return 1
log "Xray: detected architecture: $arch; packages=$fmt; OpenWrt=$(xray_openwrt_info release)"
log 'Xray: searching compatible releases...'
: >"$dest"
rm -f "$work/next-release-page"
# Bound API memory and calls: 20 releases/page, at most 200 releases.
# Older pages are fetched on demand after candidates fail validation.
page="${3:-1}"
while [ "$page" -le 10 ]; do
fetch_file "$XRAY_RELEASE_API_URL?per_page=20&page=$page" "$work/releases.json" || {
log 'ERROR: GitHub API unavailable; existing Xray preserved'; return 1;
}
[ "$(wc -c <"$work/releases.json")" -le 2097152 ] || return 1
# Validate JSON, including an empty array. API error objects fail closed.
xray_json "$work/releases.json" '@' >"$work/parsed" || { log 'Xray: invalid Releases API JSON'; return 1; }
case "$(head -c 1 "$work/parsed")" in '[') ;; *) log 'Xray: Releases API returned an error object'; return 1 ;; esac
r=0; count=0
while [ "$r" -lt 20 ]; do
tag="$(xray_json "$work/releases.json" "@[$r].tag_name" 2>/dev/null)"
[ -n "$tag" ] || break
count=$((count+1))
rpath="@[$r]"; r=$((r+1))
[ "$(xray_json "$work/releases.json" "$rpath.draft")" = false ] || continue
[ "$(xray_json "$work/releases.json" "$rpath.prerelease")" = false ] || continue
xray_version_allowed "$tag" || continue
[ -z "$XRAY_RELEASE_VERSION" ] || [ "${tag#v}" = "${XRAY_RELEASE_VERSION#v}" ] || continue
# Field paths come only from numeric indexes and validated names.
xray_json "$work/releases.json" "$rpath.assets[*].name" >"$work/names" || continue
a=0
while IFS= read -r name; do
apath="$rpath.assets[$a]"; a=$((a+1))
case "$name" in *[!A-Za-z0-9_.+-]*|'') continue ;; esac
case "$fmt:$name" in
apk:openwrt-xray-*-"$arch".apk|ipk:openwrt-xray_*_"$arch".ipk|ipk:openwrt-xray_*-"$arch".ipk) ;;
*) continue ;;
esac
url="$(xray_json "$work/releases.json" "$apath.browser_download_url")"
digest="$(xray_json "$work/releases.json" "$apath.digest")"; digest="${digest#sha256:}"
size="$(xray_json "$work/releases.json" "$apath.size")"
[ "$(xray_json "$work/releases.json" "$apath.state")" = uploaded ] || continue
case "$url" in "$XRAY_RELEASE_REPO/releases/download/$tag/$name") ;; *) continue ;; esac
case "$digest" in *[!0-9a-f]*|'') continue ;; esac
[ "${#digest}" = 64 ] || continue
case "$size" in *[!0-9]*|'') continue ;; esac
[ "$size" -gt 0 ] && [ "$size" -le 33554432 ] || continue
printf '%s|%s|%s|%s|%s\n' "$tag" "$name" "$url" "$digest" "$size" >>"$dest"
done <"$work/names"
done
# Try matching assets newest-first; bookmark older pages for the caller
# if every candidate fails metadata/binary/transport validation.
if [ -s "$dest" ]; then
awk -F '|' '{v=$1; sub(/^v/,"",v); split(v,a,"."); print a[1]*10000+a[2]*100+a[3] "|" $0}' "$dest" |
sort -t '|' -k1,1nr | cut -d '|' -f2- >"$dest.sorted" || return 1
mv -f "$dest.sorted" "$dest" || return 1
if [ "$count" = 20 ] && [ "$page" -lt 10 ]; then
printf '%s\n' "$((page+1))" >"$work/next-release-page" || return 1
fi
return 0
fi
[ "$count" = 20 ] || break
page=$((page+1))
done
log "ERROR: No compatible Xray package found for this device ($arch/$fmt)"
return 1
)
xray_check_package_metadata() (
package="$1"; work="$2"; arch="$(xray_arch)" || return 1
case "$3" in
*.apk)
apk adbdump --format json "$package" >"$work/meta.json" 2>"$work/meta.err" || {
log 'Xray: APK metadata/format unsupported by installed apk'; head -c 4096 "$work/meta.err" >&2; return 1;
}
name="$(xray_json "$work/meta.json" '@.info.name')"
pkg_arch="$(xray_json "$work/meta.json" '@.info.arch')"
[ "$name" = openwrt-xray ] || { log 'Xray: unexpected APK package name'; return 1; }
# Metadata must match apk ABI as well as the precise asset target.
native="$(apk --print-arch)" || return 1
[ "$pkg_arch" = "$native" ] || [ "$pkg_arch" = "$arch" ] || { log "Xray: incompatible APK ABI: $pkg_arch (expected $native/$arch)"; return 1; }
# Resolve dependencies against THIS firmware/installed DB without
# installing the downloaded package or touching a running /usr/bin/xray.
apk add --simulate --no-network --allow-untrusted "$package" >"$work/deps.out" 2>&1 || {
log 'Xray: APK dependencies incompatible with this OpenWrt; candidate rejected'
head -c 4096 "$work/deps.out" >&2; return 1;
}
;;
*.ipk)
if command -v ar >/dev/null 2>&1 && ar t "$package" 2>/dev/null | grep -q control.tar.gz; then
ar p "$package" control.tar.gz >"$work/control.tar.gz" || return 1
else
(cd "$work" && tar -xzf "$package" ./control.tar.gz) || return 1
fi
(cd "$work" && tar -xzf control.tar.gz ./control) || return 1
name="$(sed -n 's/^Package: *//p' "$work/control" | tr -d '\r')"
[ "$name" = openwrt-xray ] || { log 'Xray: unexpected IPK package name'; return 1; }
pkg_arch="$(sed -n 's/^Architecture: *//p' "$work/control" | tr -d '\r')"
[ "$pkg_arch" = "$arch" ] || { log "Xray: incompatible IPK ABI: $pkg_arch (expected $arch)"; return 1; }
deps="$(sed -n 's/^Depends: *//p' "$work/control")"
# yichya Go packages normally depend only on libc. Unknown/versioned
# dependencies fail closed instead of ignoring another firmware ABI.
for dep in $(printf '%s' "$deps" | tr ',' ' '); do
case "$dep" in *[!A-Za-z0-9_+.-]*) log "Xray: unsupported IPK dependency constraint: $deps"; return 1 ;; esac
opkg status "$dep" | grep -q '^Status: .* installed$' || { log "Xray: missing dependency: $dep"; return 1; }
done
;;
*) return 1 ;;
esac
)
log "Xray не найден ($configured), ставлю временный Xray в /tmp..."
install_xray_tmp
xray_package_diagnostics() {
local bin store
printf 'OpenWrt: %s\nArchitecture: %s\nPackage format: %s\n' "$(xray_openwrt_info release)" "$(xray_arch)" "$(xray_package_format)"
bin="$(xray_bin_path)"
printf 'Xray binary: %s\n' "$bin"
if [ -x "$bin" ]; then "$bin" version | head -n 1; else printf 'Xray binary missing\n'; fi
store="$(xray_cache_dir)" || { printf 'Persistent cache unavailable\n'; return 1; }
printf 'Persistent cache: %s\n' "$store"
ls -ln "$store"/*.gz 2>/dev/null || return 1
}
service_enabled() {
@@ -634,7 +639,7 @@ EOF
else
rc=$?
head -c 8192 "$probe/result" >&2
log "ОШИБКА: пакет Xray несовместим с текущим VLESS reverse без TLS (rc=$rc). Нужна совместимая сборка $XRAY_RELEASE_VERSION; рабочий бинарник и кэш сохранены"
log "ОШИБКА: пакет Xray несовместим с текущим VLESS reverse без TLS (rc=$rc). Нужна сборка с поддержкой текущего транспорта; рабочий бинарник и кэш сохранены"
return "$rc"
fi
)
@@ -802,23 +807,6 @@ EOF
printf '%s\n' "$xray_config"
)
run_xray() {
local enabled xray_bin xray_config
enabled="$(uci_get enabled 0)"
truthy "$enabled" || die "сервис выключен: включи option enabled '1'"
ensure_xray_available
xray_bin="$(xray_bin_path)"
xray_config="$(render_client_config)" || die "не удалось создать конфигурацию Xray"
[ -n "$xray_config" ] && [ -s "$xray_config" ] || die "конфигурация Xray отсутствует или пуста"
[ -x "$xray_bin" ] || die "xray не найден или не исполняемый: $xray_bin"
if "$xray_bin" help 2>/dev/null | grep -q 'run'; then
exec "$xray_bin" run -config "$xray_config"
fi
exec "$xray_bin" -config "$xray_config"
}
heartbeat_json() {
local router_id router_name role public_url hub_url xray_state service_state ssh_state event heartbeat_interval
event="${1:-}"
@@ -1657,7 +1645,7 @@ xray_cache_save() (
digest="$(xray_digest "$bin")" || return 1
target="$store/$asset.$digest.gz"
# An existing valid copy requires no Flash writes, including after reboot.
if [ -s "$target" ] && gzip -t "$target" 2>/dev/null; then return 0; fi
if [ -s "$target" ] && gzip -t "$target" 2>/dev/null && [ "$(gzip -dc "$target" | sha256sum | cut -d' ' -f1)" = "$digest" ]; then return 0; fi
umask 077
mkdir -p "$store" || return 1
chmod 700 "$store" || return 1
@@ -1676,6 +1664,7 @@ xray_cache_save() (
trap 'rm -f "$temp"' EXIT
trap 'exit 1' INT TERM
gzip -c "$bin" >"$temp" && gzip -t "$temp" || return 1
[ "$(gzip -dc "$temp" | sha256sum | cut -d' ' -f1)" = "$digest" ] || return 1
[ "$(wc -c <"$temp")" -le 16777216 ] || return 1
mv -f "$temp" "$target" || return 1
# Once per binary update: commit the replacement before deleting the last
@@ -1687,15 +1676,14 @@ xray_cache_save() (
)
xray_cache_restore() (
store="$(xray_cache_dir)" || return 1
asset="$(xray_release_asset)" || return 1
dir="$(xray_runtime_dir)"; mkdir -p "$dir" || return 1
temp="$(mktemp "$dir/.restore.XXXXXX")" || return 1
trap 'rm -f "$temp"' EXIT
trap 'exit 1' INT TERM
for cache in "$store/$asset."*.gz; do
for cache in "$store"/*.gz; do
[ -s "$cache" ] || continue
[ "$(wc -c <"$cache")" -le 16777216 ] || continue
digest="${cache#"$store/$asset."}"; digest="${digest%.gz}"
digest="${cache%.gz}"; digest="${digest##*.}"
case "$digest" in ''|*[!0-9a-f]*) continue ;; esac
[ "${#digest}" = 64 ] || continue
# Bound even an invalid compressed file; verify bytes before execution.
@@ -1741,7 +1729,7 @@ xray_native_fetch() (
# Bound one complete download, including redirects. In WAN mode use the
# selected resolver on every HTTPS hop, retaining hostname verification/SNI.
fetch_file() (
url="$1"; dst="$2"; rm -f "$dst"
url="$1"; dst="$2"; method="${3:-GET}"; rm -f "$dst"
stats=''
trap 'result=$?; rm -f "$stats"; [ "$result" = 0 ] || rm -f "$dst"' EXIT
trap 'exit 1' INT TERM
@@ -1753,6 +1741,7 @@ fetch_file() (
origin="$(remote_url_origin "$url")" || return 3
case "$origin" in https://*) ;; *) log 'Xray: отклонена загрузка без HTTPS'; return 3 ;; esac
set -- -q -fsS --connect-timeout 10 --noproxy '*' --proto '=https' --max-filesize 33554432
[ "$method" != HEAD ] || set -- "$@" -I
if truthy "$(uci_get wan_direct 0)"; then
host="${origin#https://}"; port="${host##*:}"; host="${host%:*}"
device="$(wan_device)" || return 1
@@ -1788,18 +1777,20 @@ fetch_file() (
)
install_package() {
local pkg
pkg="$1"
if command -v opkg >/dev/null 2>&1; then
opkg update >/dev/null 2>&1 || return 1
opkg install "$pkg" >/dev/null 2>&1 || return 1
return 0
fi
local rc
rc=0
if command -v apk >/dev/null 2>&1; then
apk -U add "$pkg" >/dev/null 2>&1 || return 1
return 0
fi
log "Xray dependency: apk -U add $1"
apk -U add "$1" >&2 || rc=$?
elif command -v opkg >/dev/null 2>&1; then
log "Xray dependency: opkg update && opkg install $1"
opkg update >&2 && opkg install "$1" >&2 || rc=$?
else
log 'Xray: no supported package manager (apk/opkg)'
return 1
fi
[ "$rc" = 0 ] || log "Xray dependency: $1 failed (rc=$rc)"
return "$rc"
}
has_ca_certificates() {
@@ -1812,10 +1803,10 @@ has_ca_certificates() {
ensure_ca_certificates() {
has_ca_certificates && return 0
if command -v apk >/dev/null 2>&1; then
install_package ca-certificates >/dev/null 2>&1 || true
install_package ca-certificates || true
fi
if command -v opkg >/dev/null 2>&1; then
install_package ca-bundle >/dev/null 2>&1 || install_package ca-certificates >/dev/null 2>&1 || true
if ! command -v apk >/dev/null 2>&1 && command -v opkg >/dev/null 2>&1; then
install_package ca-bundle || install_package ca-certificates || true
fi
has_ca_certificates
}
@@ -1825,10 +1816,10 @@ ensure_fetch_tool() {
command -v uclient-fetch >/dev/null 2>&1 && return 0
command -v wget >/dev/null 2>&1 && return 0
if command -v apk >/dev/null 2>&1; then
install_package curl >/dev/null 2>&1 || install_package wget >/dev/null 2>&1 || true
install_package curl || install_package wget || true
fi
if command -v opkg >/dev/null 2>&1; then
install_package curl >/dev/null 2>&1 || install_package wget-ssl >/dev/null 2>&1 || install_package wget >/dev/null 2>&1 || true
if ! command -v apk >/dev/null 2>&1 && command -v opkg >/dev/null 2>&1; then
install_package curl || install_package wget-ssl || install_package wget || true
fi
command -v curl >/dev/null 2>&1 && return 0
command -v uclient-fetch >/dev/null 2>&1 && return 0
@@ -1850,8 +1841,8 @@ xray_package_extract_binary() (
trap cleanup_package_extract EXIT
trap 'exit 1' INT TERM
mkdir -p "$work/data" || return 1
# The bounded downloader stages every format as xray.pkg. Select the
# extractor from the release asset, not the temporary file's extension.
# Select the extractor from the published release asset. Callers may also
# supply a neutral temporary filename when reusing this helper.
case "${3:-$archive}" in
*.ipk|*.pkg)
# yichya's .ipk release is a gzip-compressed tar containing
@@ -1892,72 +1883,85 @@ xray_package_extract_binary() (
return 1
)
xray_binary_usable() {
[ -x "$1" ] && "$1" version >/dev/null 2>&1 && ! xray_requires_legacy_replacement "$1"
}
xray_probe_url() {
# Use the same TLS/WAN/redirect policy as the actual GET.
if command -v curl >/dev/null 2>&1; then
fetch_file "$1" "$2" HEAD
else
# uclient-fetch has no HEAD mode. A bounded HTTPS GET is the probe
# and payload together, with its size/digest checked before extraction.
return 0
fi
}
install_xray_tmp_locked() (
dir="$(xray_runtime_dir)"
package="$dir/xray.pkg"
asset="$(xray_release_asset)" || {
log "Xray: неизвестный пакет для архитектуры $(uname -m 2>/dev/null)"
return 1
}
url="$XRAY_RELEASE_BASE_URL/$asset"
mkdir -p "$dir" || return 1
# An interrupted package download is disposable; the working binary and
# compressed boot copy are never removed before a candidate is validated.
rm -f "$package.new" "$dir/xray.new"
trap 'rm -f "$package.new" "$package" "$dir/xray.new"' EXIT
work="$(mktemp -d "$dir/.download.XXXXXX")" || return 1
trap 'rm -rf "$work"' EXIT
trap 'exit 1' INT TERM
ensure_ca_certificates || log "CA certificates not found, trying download anyway"
ensure_fetch_tool || {
log "need curl, uclient-fetch or wget to download Xray"
return 1
}
ensure_ca_certificates || { log 'Xray: trusted CA certificates unavailable; existing Xray preserved'; return 1; }
ensure_fetch_tool || { log 'Xray: need curl, uclient-fetch or wget'; return 1; }
rc=1
page=1
while [ "$page" -le 10 ]; do
xray_discover_releases "$work/candidates" "$work" "$page" || return 1
while IFS='|' read -r tag asset url digest bytes; do
# Keep the published name for native package-manager diagnostics.
rm -f "$work/xray.new" "${package:-$work/unused}"
package="$work/$asset"
log "Xray: candidate: $asset; checking download URL..."
xray_probe_url "$url" "$work/headers" || { rc=$?; log "Xray: URL unavailable (rc=$rc); candidate skipped"; continue; }
log "Xray: загрузка пакета yichya/openwrt-xray/$asset; общий тайм-аут=120s"
fetch_file "$url" "$package.new" || {
log "Xray: не удалось загрузить $asset; рабочий бинарник и кэш сохранены"
return 1
}
[ -s "$package.new" ] || {
log "Xray: скачанный пакет пустой; рабочий бинарник сохранён"
return 1
}
mv -f "$package.new" "$package" || return 1
xray_package_extract_binary "$package" "$dir/xray.new" "$asset" || {
log "Xray: не удалось извлечь /usr/bin/xray из пакета $asset; рабочий бинарник сохранён"
return 1
}
[ -s "$dir/xray.new" ] || return 1
[ "$(wc -c <"$dir/xray.new")" -le 67108864 ] || {
log 'Xray: извлечённый бинарник больше 64 МиБ; рабочий бинарник сохранён'
return 1
}
chmod 755 "$dir/xray.new"
version="$("$dir/xray.new" version 2>&1)" || {
log 'Xray: извлечённый бинарник не запускается; рабочий бинарник сохранён'
return 1
}
version="$(printf '%s\n' "$version" | sed -n '1p')"
xray_validate_transport_binary "$dir/xray.new" || return $?
mv -f "$dir/xray.new" "$dir/xray" || return 1
fetch_file "$url" "$package" || { rc=$?; log "ERROR: GitHub download unavailable (rc=$rc); existing Xray preserved"; continue; }
[ "$(wc -c <"$package")" = "$bytes" ] || { log 'Xray: package length mismatch'; rc=1; continue; }
log 'Xray: verifying package checksum...'
[ "$(xray_digest "$package")" = "$digest" ] || { log 'Xray: package SHA256 mismatch; existing Xray preserved'; rc=1; continue; }
xray_check_package_metadata "$package" "$work" "$asset" || { rc=$?; continue; }
xray_package_extract_binary "$package" "$work/xray.new" "$asset" || { rc=$?; log "Xray: extraction failed for $asset (rc=$rc)"; continue; }
[ -s "$work/xray.new" ] && [ "$(wc -c <"$work/xray.new")" -le 67108864 ] || { rc=1; continue; }
chmod 755 "$work/xray.new" || return 1
"$work/xray.new" version >"$work/version" 2>&1 || { rc=$?; log "Xray: binary cannot run on this firmware (rc=$rc)"; head -c 4096 "$work/version" >&2; continue; }
version="$(sed -n '1s/^Xray \([0-9][0-9.]*\) .*/\1/p' "$work/version")"
[ "$version" = "${tag#v}" ] || { log 'Xray: binary version does not match release'; rc=1; continue; }
xray_validate_transport_binary "$work/xray.new" || { rc=$?; continue; }
log "Xray: compatible package found: $asset"
# Publish and verify a bootable copy before replacing any executable.
# Failure leaves both the old binary and UCI completely untouched.
xray_cache_save "$work/xray.new" || { log 'Xray: persistent cache could not be created; existing Xray preserved'; return 1; }
log 'Xray: persistent cache created; installing Xray...'
mv -f "$work/xray.new" "$dir/xray" || return 1
if [ "$(uci_get xray_bin '')" != "$dir/xray" ]; then
uci set "$CONFIG.$SECTION.xray_bin=$dir/xray" && uci commit "$CONFIG" || return 1
xray_cache_save "$dir/xray" || true
rm -f "$package"
printf 'OK: Xray installed in %s\n' "$dir/xray"
printf 'OK: %s\n' "$version"
printf 'OK: xray_bin saved in /etc/config/owrtremote\n'
fi
printf 'OK: Xray installed in %s\nOK: Xray %s\n' "$dir/xray" "$version"
return 0
done <"$work/candidates"
[ -s "$work/next-release-page" ] || break
read -r page <"$work/next-release-page" || return 1
case "$page" in ''|*[!0-9]*) return 1 ;; esac
log 'Xray: candidates rejected; searching older published releases...'
done
log 'ERROR: No compatible Xray package passed validation; existing Xray and cache preserved'
return "$rc"
)
ensure_xray_available() {
local configured candidate found
configured="$(uci_get xray_bin /usr/bin/xray)"
if [ -x "$configured" ]; then
if ! xray_requires_legacy_replacement "$configured"; then return 0; fi
log "Xray: установленная версия запрещает текущий VLESS без TLS; подготовка совместимой $XRAY_RELEASE_VERSION из yichya/openwrt-xray"
if xray_binary_usable "$configured"; then return 0; fi
if xray_requires_legacy_replacement "$configured"; then
log 'Xray: установленная версия запрещает текущий VLESS без TLS; поиск совместимой сборки из yichya/openwrt-xray'
else
log 'Xray: установленный бинарник не выполняет version; поиск проверенной рабочей сборки'
fi
fi
for candidate in /usr/bin/xray /usr/bin/xray-core /usr/local/bin/xray /opt/bin/xray /tmp/owrt-xray/xray /tmp/owrt-xray/xray_softfloat /tmp/xray /tmp/xray_softfloat; do
if [ -x "$candidate" ] && ! xray_requires_legacy_replacement "$candidate"; then
if xray_binary_usable "$candidate"; then
found="$candidate"
break
fi
@@ -1967,7 +1971,7 @@ ensure_xray_available() {
found="$(command -v xray 2>/dev/null || command -v xray-core 2>/dev/null || true)"
fi
if [ -n "$found" ] && [ -x "$found" ] && ! xray_requires_legacy_replacement "$found"; then
if [ -n "$found" ] && xray_binary_usable "$found"; then
[ "$found" = "$configured" ] || {
uci set "$CONFIG.$SECTION.xray_bin=$found"
uci commit "$CONFIG"
@@ -1984,7 +1988,7 @@ prepare_xray_tmp() (
trap 'exit 1' INT TERM
# Recheck after acquiring the lock: a concurrent installer may have finished.
configured="$(uci_get xray_bin /usr/bin/xray)"
if [ -x "$configured" ] && ! xray_requires_legacy_replacement "$configured"; then return 0; fi
if xray_binary_usable "$configured"; then return 0; fi
xray_cache_restore && return 0
log 'Xray: загрузочной копии нет; требуется загрузка из сети'
install_xray_tmp_locked
@@ -1997,7 +2001,7 @@ prepare_xray() (
xray_bootstrap_lock || return 1
trap 'xray_bootstrap_unlock' EXIT
trap 'exit 1' INT TERM
xray_cache_save "$bin" || log 'Xray: запускается из RAM; автономное восстановление после перезагрузки пока недоступно'
xray_cache_save "$bin" || { log 'Xray: запускается из RAM; автономное восстановление после перезагрузки пока недоступно'; return 1; }
;;
esac
)
@@ -2096,6 +2100,9 @@ case "$cmd" in
prepare-xray)
prepare_xray
;;
xray-package-diagnostics)
xray_package_diagnostics
;;
stop-xray)
stop_xray
;;
+110 -13
View File
@@ -7,6 +7,41 @@ export PATH="/bin:/sbin:/usr/bin:/usr/sbin:${PATH:-}"
RAW_URL="${RAW_URL:-https://raw.githubusercontent.com/kzolotarev95/luci-app-owrt-remote/main}"
ROOT="${ROOT:-/}"
SCRIPT_DIR="$(CDPATH= cd "$(dirname "$0")" 2>/dev/null && pwd)"
INSTALL_DIAGNOSTIC="${OWRT_REMOTE_INSTALL_DIAGNOSTIC:-0}"
INSTALL_STAGE=init
INSTALL_CANDIDATE=''
umask 077
INSTALL_TMP="$(mktemp -d "${TMPDIR:-/tmp}/owrt-install.XXXXXX")"
cleanup_install() {
code=$?
trap - EXIT
[ "$code" = 0 ] || printf 'ERROR: installation stage=%s rc=%s\n' "$INSTALL_STAGE" "$code" >&2
[ -z "$INSTALL_CANDIDATE" ] || rm -f "$INSTALL_CANDIDATE"
rm -rf "$INSTALL_TMP"
exit "$code"
}
trap cleanup_install EXIT
trap 'exit 1' INT TERM
# No shell xtrace: it could expose UCI keys or the generated panel access key.
# Each external step has an explicit label, return code and separate streams.
run_step() {
local rc label
label="$1"; shift
INSTALL_STAGE="$label"
printf 'Install [%s]: %s\n' "$label" "$*" >&2
rc=0
"$@" >"$INSTALL_TMP/stdout" 2>"$INSTALL_TMP/stderr" || rc=$?
if [ "$rc" != 0 ] || [ "$INSTALL_DIAGNOSTIC" = 1 ]; then
printf 'Install [%s]: rc=%s; stdout:\n' "$label" "$rc" >&2
head -c 32768 "$INSTALL_TMP/stdout" >&2
printf '\nInstall [%s]: stderr:\n' "$label" >&2
head -c 32768 "$INSTALL_TMP/stderr" >&2
printf '\n' >&2
fi
: >"$INSTALL_TMP/stdout"; : >"$INSTALL_TMP/stderr"
return "$rc"
}
info() {
printf '%s\n' "$*"
@@ -45,13 +80,16 @@ install_file() {
src="$SCRIPT_DIR/files/$rel"
dst="$(target_path "$rel")"
mkdir -p "$(dirname "$dst")"
INSTALL_CANDIDATE="$(mktemp "$dst.new.XXXXXX")"
if [ -f "$src" ]; then
cp "$src" "$dst"
run_step "file:$rel" cp "$src" "$INSTALL_CANDIDATE"
else
bust="$(date +%s 2>/dev/null || echo $$)"
fetch "$RAW_URL/files/$rel?v=$bust" "$dst"
run_step "file:$rel" fetch "$RAW_URL/files/$rel?v=$bust" "$INSTALL_CANDIDATE"
fi
chmod "$mode" "$dst"
chmod "$mode" "$INSTALL_CANDIDATE"
mv -f "$INSTALL_CANDIDATE" "$dst"
INSTALL_CANDIDATE=''
}
install_config() {
@@ -160,12 +198,12 @@ install_packages() {
manager="$(package_manager)"
case "$manager" in
opkg)
opkg update >/dev/null 2>&1 || warn "не удалось обновить список opkg, пробую ставить пакеты как есть"
opkg install "$@"
run_step packages-index opkg update || return $?
run_step packages-install opkg install "$@"
;;
apk)
apk update >/dev/null 2>&1 || warn "не удалось обновить список apk, пробую ставить пакеты как есть"
apk add "$@"
run_step packages-index apk update || return $?
run_step packages-install apk add "$@"
;;
*)
return 1
@@ -211,15 +249,46 @@ install_xray_runtime() {
remote_bin="$(target_path usr/sbin/owrt-remote)"
[ -x "$remote_bin" ] || die "missing $remote_bin after install"
info "Preparing Xray and its persistent boot cache..."
"$remote_bin" prepare-xray || die "failed to prepare Xray"
run_step prepare-xray "$remote_bin" prepare-xray || die "failed to prepare Xray; see stage/command/rc above"
}
verify_heartbeat() {
# The response may contain a command or fresh Hub configuration; show only
# the existing redacted diagnostic fields, never the raw HTTP body.
local rc
rc=0
/usr/sbin/owrt-remote heartbeat >/dev/null || rc=$?
/usr/sbin/owrt-remote heartbeat-diagnostics
return "$rc"
}
verify_xray_start() {
local attempt
if [ -e /etc/owrt-remote/control/stopped ]; then
info 'Xray remains intentionally stopped by Remote; Heartbeat is independent.'
return 0
fi
attempt=0
while [ "$attempt" -lt 30 ]; do
if /usr/sbin/owrt-remote status | grep -Fq 'xray_state: running'; then
info 'Xray process verified.'
return 0
fi
attempt=$((attempt+1)); sleep 1
done
warn 'Xray did not start within 30 seconds; configuration retained. Check Global logs on the router.'
return 1
}
# Stop the old log writer before replacing its storage code. Its bounded legacy
# archive is migrated by the new log service, without moving any other /tmp data.
if [ "${ROOT%/}" = "" ] && [ -x /etc/init.d/owrt-remote-logs ]; then
/etc/init.d/owrt-remote-logs stop || true
if /etc/init.d/owrt-remote-logs running >/dev/null 2>&1; then
run_step logs-stop /etc/init.d/owrt-remote-logs stop
fi
fi
INSTALL_STAGE=files
install_file "usr/sbin/owrt-remote" 0755
install_file "usr/lib/owrt-remote/wan.sh" 0644
install_file "usr/lib/owrt-remote/control.sh" 0644
@@ -237,23 +306,51 @@ install_file "www/luci-static/resources/view/owrt_remote.js" 0644
ensure_wol_support
if [ "${ROOT%/}" = "" ]; then
/etc/init.d/owrt-remote-logs enable
/etc/init.d/owrt-remote-logs restart
run_step logs-enable /etc/init.d/owrt-remote-logs enable
# restart calls procd service delete, which returns "Not found" on the
# first installation. start is an idempotent procd service set operation.
run_step logs-start /etc/init.d/owrt-remote-logs start
fi
rm -f "$(target_path usr/lib/lua/luci/controller/owrt_remote.lua)" 2>/dev/null || true
rm -rf "$(target_path tmp/luci-indexcache)" "$(target_path tmp/luci-modulecache)" "$(target_path tmp/luci-indexcache.)"* "$(target_path tmp/luci-modulecache.)"* 2>/dev/null || true
if [ -x "$(target_path etc/init.d/rpcd)" ]; then
"$(target_path etc/init.d/rpcd)" restart >/dev/null 2>&1 || true
if "$(target_path etc/init.d/rpcd)" running >/dev/null 2>&1; then
run_step rpcd-reload "$(target_path etc/init.d/rpcd)" reload || die "rpcd reload failed"
else
run_step rpcd-start "$(target_path etc/init.d/rpcd)" start || die "rpcd start failed"
fi
fi
if [ -x "$(target_path etc/init.d/uhttpd)" ]; then
"$(target_path etc/init.d/uhttpd)" reload >/dev/null 2>&1 || "$(target_path etc/init.d/uhttpd)" restart >/dev/null 2>&1 || true
if "$(target_path etc/init.d/uhttpd)" running >/dev/null 2>&1; then
run_step uhttpd-reload "$(target_path etc/init.d/uhttpd)" reload || die "uhttpd reload failed"
else
run_step uhttpd-start "$(target_path etc/init.d/uhttpd)" start || die "uhttpd start failed"
fi
fi
install_xray_runtime
if [ "${ROOT%/}" = "" ]; then
# Respect disabled clients and an intentional Remote stop. First-time
# installs need OpenWrt config from Hub before a tunnel can be started.
if [ "$(uci -q get owrtremote.main.enabled 2>/dev/null || true)" = 1 ]; then
run_step config-test /usr/sbin/owrt-remote render-client || die "Xray configuration validation failed"
run_step service-enable /etc/init.d/owrt-remote enable
if /etc/init.d/owrt-remote running >/dev/null 2>&1; then
run_step service-reload /etc/init.d/owrt-remote reload || die "Remote service reload failed"
else
run_step service-start /etc/init.d/owrt-remote start || die "Remote service start failed"
fi
run_step xray-running verify_xray_start || die "Xray start verification failed"
run_step heartbeat verify_heartbeat || die "Heartbeat verification failed (files and working Xray retained)"
else
info 'Remote is disabled; apply OpenWrt config from Hub to start the tunnel and Heartbeat.'
fi
fi
key="$(make_key)"
ip="$(router_ip)"
ui_version="$(installed_ui_version)"
+6 -4
View File
@@ -7,8 +7,9 @@
не защищает отдельное VLESS-соединение на 8443.
Локальное исправление сохраняет существующий протокол и VPS-конфигурацию.
По умолчанию используется последняя сборка до запрета — **26.6.27** из
`yichya/openwrt-xray`. TLS/REALITY этим исправлением не добавляются; для
Сборка выбирается из опубликованных GitHub Releases до запрета транспорта;
версия не закреплена. Источник — `yichya/openwrt-xray`.
TLS/REALITY этим исправлением не добавляются; для
использования 26.7.11+ нужен отдельный согласованный переход обоих концов.
Источники проверки:
@@ -23,7 +24,8 @@
включая ARM64, MIPSel и особые имена `i386_pentium`/`arm_cortex-a5-vfpv4`.
- Найденный работающий старый core сохраняется. Известный core 26.7.11+
для `encryption=none` заменяется совместимым: сначала проверенный boot-кэш,
затем загрузка закреплённого пакета. Ошибка сети не удаляет старый бинарник.
затем поиск существующего совместимого пакета через GitHub Releases API.
Ошибка сети не удаляет старый бинарник.
- До замены runtime/кэша/UCI кандидат выполняет `-test` на несекретной пробной
конфигурации публичного VLESS reverse. `xray version` больше недостаточно.
- Возвращаемый на Flash core также проверяется перед установкой в RAM.
@@ -156,7 +158,7 @@ powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\
Откат возвращает агент, сохраняя подготовленный бинарник и boot-кэш.
Рабочий JSON не пересобирается, туннель не перезапускается.
Тесты проверяют полный bootstrap с форматом APK и временным именем `.pkg`,
Тесты проверяют полный bootstrap с форматом APK и выбором распаковщика по asset,
неудачное извлечение, отсутствие бинарника, несовместимого кандидата и IPK.
В тестах shell работает настоящий BusyBox ash, вызов `apk` заменён тестовым
обработчиком. Настоящий APK скачан и его формат проверен; запуск нативного
+115
View File
@@ -0,0 +1,115 @@
# Поиск совместимого Xray: локальное исправление v121
## Подтверждённая причина
Прежний загрузчик строил имя APK из закреплённой версии и вывода
`apk --print-arch`. В некоторых OpenWrt 25 этот вывод — общий ABI `mipsel`,
а опубликованный asset называется `...-mipsel_24kc.apk`. Получался URL
несуществующего `...-mipsel.apk`, и GitHub возвращал 404.
В ответе [GitHub Releases API](https://api.github.com/repos/yichya/openwrt-xray/releases)
найден настоящий `openwrt-xray-26.6.27-r1-mipsel_24kc.apk`; скачанный файл
имеет SHA256
`275e6f1141796e057befb0d3b8daa33a3731e22da9d749d6edc0290950dc6c80`,
совпадающий с `digest` asset. Это проверка источника, а не закрепление версии.
`Command failed: Not found` до подготовки Xray соответствует безусловному
`owrt-remote-logs restart` при первой установке: стандартный `restart`
сначала вызывает удаление ещё не зарегистрированной службы через ubus.
Теперь установщик останавливает службу только после успешного `running`,
а затем выполняет `start`. Вывод Netis после исправления нужен, чтобы
исключить дополнительную ошибку на конкретном устройстве.
У rpcd, uhttpd и Remote также проверяется наличие работающего экземпляра:
для первой активации используется `start`, для работающей службы — `reload`.
## Новый механизм
- Приоритет у APK; команды opkg на APK-системе не выполняются.
- Точная архитектура берётся из менеджера пакетов. Общий ABI уточняется
через `DISTRIB_ARCH` из `/etc/openwrt_release`, без угадывания по `uname`.
- Загружаются реальные Releases и Assets. Порядок JSON и номер ревизии пакета
не зашиты в код. Обрабатываются до десяти страниц по 20 релизов; временные
ответы и число запросов ограничены. Если кандидаты не проходят проверку,
поиск продолжается на следующей странице с более старыми релизами.
При успешном кандидате лишние страницы не загружаются.
- Draft, prerelease, чужие URL, другой CPU, отсутствие SHA256 и слишком
большой пакет отклоняются. URL проверяется HEAD перед GET при наличии curl;
для минимальных клиентов проверкой доступности служит ограниченный GET.
- Для существующего VLESS reverse без TLS исключаются версии с известным
запретом транспорта (26.7.11+). Это граница совместимости, а не версия
скачивания. Дополнительно каждый кандидат выполняет настоящий `-test`.
- Проверяются размер и SHA256 пакета, метаданные, ABI и зависимости.
APK проверяет нативный solver: `apk add --simulate --no-network`.
Он не устанавливает скачанный пакет. APK извлекается через `apk extract`;
IPK — в отдельный каталог. Системный `/usr/bin/xray` не перезаписывается.
- Версия исполняемого бинарника должна совпасть с релизом. Его запуск
проверяет совместимость с ABI/прошивкой, а не только совпадение имени CPU.
- Проверенный сжатый boot-кэш публикуется атомарно на постоянном разделе
до замены runtime. Кэш проверяется распаковкой и SHA256. Без места или
доступного постоянного раздела подготовка завершается явной ошибкой.
- Рабочий core используется без повторной загрузки; после перезагрузки
проверенный кэш восстанавливается без сети/API. Старые имена кэша читаются.
- Ошибки загрузки, распаковки и проверки сохраняют прежний бинарник,
рабочий JSON и `/etc/config/owrtremote`. Откат локального исправления
возвращает код агента, сохраняя подготовленный core и boot-кэш.
## Диагностика установщика
`OWRT_REMOTE_INSTALL_DIAGNOSTIC=1 sh install.sh` показывает этап, команду,
rc и отдельные stdout/stderr. При ошибке эти сведения выводятся и без
диагностического режима; последующие критические этапы не выполняются.
Вывод каждого потока ограничен 32 КиБ. Shell xtrace не включается.
Файлы проекта сначала загружаются/копируются во временный файл в каталоге
назначения и заменяются атомарно. Ошибка загрузки не обрезает прежний агент.
После подготовки Xray установщик для уже включённого клиента проверяет JSON,
запуск процесса и Heartbeat. Исходный UCI сохраняется. Первая установка с
`enabled=0` сообщает, что для соединения необходим OpenWrt config из Hub.
Намеренную остановку Xray через Remote установщик уважает.
Диагностика без ключей: `owrt-remote xray-package-diagnostics`.
## Установка локального исправления и откат
Подставить доступный SSH-адрес удалённого роутера вместо `АДРЕС_РОУТЕРА`:
```powershell
$Fix = "C:\Users\k.zolotarev95\Documents\openwrt overlay\vps\deploy-xray-release-fix.ps1"
powershell.exe -NoProfile -ExecutionPolicy Bypass -File $Fix -Router "root@АДРЕС_РОУТЕРА" -Action Install
```
Резервная копия: `/root/owrt-remote-backup-before-xray-release-v121`.
Устанавливается агент и выполняется подготовка core/кэша. Рабочий JSON
не пересобирается, туннель этим скриптом не перезапускается. При прерванной
первой установке создаётся отсутствующий web.key; имеющийся ключ сохраняется.
```powershell
powershell.exe -NoProfile -ExecutionPolicy Bypass -File $Fix -Router "root@АДРЕС_РОУТЕРА" -Action Rollback
```
## Проверки и ограничения
- `test_xray_release_selection.py`: реальное уточнение CPU/ABI, выбор asset,
ревизии, пагинация, несовместимый CPU, metadata, dependency solver,
ошибки API и некорректный JSON.
- `test_xray_bootstrap.py`: SHA256, повреждённый пакет/кэш, HTTP-ошибка,
переход к следующему asset, отсутствие сети, сохранение старого core,
офлайн-восстановление после удаления RAM-копии, конкурирующие установки.
- `test_install_diagnostics.py`: повторная установка в изолированный ROOT,
сохранение UCI, этап/команда/rc/stdout/stderr, остановка после ошибки.
- `test_xray_release_deploy.py`: установка, откат и автоматическое
восстановление кода при ошибке подготовки.
- Синтаксис и тесты shell проверяются MSYS sh и BusyBox ash на Windows.
Результат локального прогона выбора релизов, bootstrap, проверки конфигурации
и установки/отката: 76 тестов, 70 успешно, 6 пропущены (четыре требуют
внешних настоящих бинарников Xray, два требуют Linux /proc для проверки
дочерних процессов и конкуренции). Эти два сценария отдельно проходили
в MSYS sh. После добавления атомарной установки и выбора start/reload
повторно прошли все 5 тестов установщика. Shell syntax и PowerShell parser
ошибок не обнаружили.
Физического Netis N6 в этой среде нет. Нативные `apk adbdump/extract`,
бинарник Linux/MIPSel, реальная перезагрузка и успешный туннель на
OpenWrt 25.12.2 должны быть подтверждены после установки на устройстве.
Эмуляция перезагрузки в тестах не заменяет эту проверку.
+101
View File
@@ -0,0 +1,101 @@
"""Installer stages/streams and existing configuration preservation."""
import os
from pathlib import Path
import subprocess
import tempfile
import unittest
import test_host_policy as base
class InstallDiagnosticsTests(unittest.TestCase):
def setUp(self):
self.temp=tempfile.TemporaryDirectory(prefix='owrt-install-tests-')
self.addCleanup(self.temp.cleanup)
self.root=Path(self.temp.name)
self.env={**os.environ,'TMPDIR':self.root.as_posix()}
self.installer=base.ROOT/'install.sh'
shell=os.environ.get('OWRT_TEST_BUSYBOX',base.SH)
self.args=[shell,'ash'] if 'busybox' in shell.lower() else [shell]
def test_full_local_copy_preserves_existing_uci_on_repeat_install(self):
config=self.root/'etc/config/owrtremote'
config.parent.mkdir(parents=True)
original=b"config remote 'main'\n option router_name 'keep custom name'\n option hub_token 'test-secret'\n"
config.write_bytes(original)
env={**self.env,'ROOT':self.root.as_posix()}
for _ in range(2):
result=subprocess.run(self.args+[self.installer.as_posix()],env=env,cwd=base.ROOT,
capture_output=True,encoding='utf-8',timeout=30)
self.assertEqual(result.returncode,0,result.stderr)
self.assertEqual(config.read_bytes(),original)
self.assertNotIn('test-secret',result.stdout+result.stderr)
self.assertTrue((self.root/'usr/sbin/owrt-remote').exists())
self.assertEqual((self.root/'usr/sbin/owrt-remote').read_bytes(),
(base.ROOT/'files/usr/sbin/owrt-remote').read_bytes())
def test_critical_failure_names_stage_command_rc_and_both_streams(self):
source=self.installer.read_text(encoding='utf-8').split('# Stop the old log writer')[0]
source+='''\nfail_command() { echo sample-stdout; echo sample-stderr >&2; return 19; }
run_step example-phase fail_command
echo UNREACHABLE
'''
script=self.root/'driver.sh'; script.write_text(source,encoding='utf-8',newline='\n')
result=subprocess.run(self.args+[script.as_posix()],capture_output=True,encoding='utf-8',timeout=20,env=self.env)
self.assertEqual(result.returncode,19,result.stderr)
for text in ['example-phase','fail_command','rc=19','sample-stdout','sample-stderr']:
self.assertIn(text,result.stderr)
self.assertNotIn('UNREACHABLE',result.stdout)
def test_successful_stderr_is_available_in_diagnostic_mode(self):
source=self.installer.read_text(encoding='utf-8').split('# Stop the old log writer')[0]
source+='\nprobe() { echo sample-warning >&2; }; run_step probe-stage probe\n'
script=self.root/'driver.sh'; script.write_text(source,encoding='utf-8',newline='\n')
result=subprocess.run(self.args+[script.as_posix()],capture_output=True,encoding='utf-8',timeout=20,
env={**self.env,'OWRT_REMOTE_INSTALL_DIAGNOSTIC':'1'})
self.assertEqual(result.returncode,0,result.stderr)
self.assertIn('sample-warning',result.stderr)
self.assertIn('rc=0',result.stderr)
def test_failed_file_download_preserves_installed_agent_and_cleans_staging(self):
target=self.root/'usr/sbin/sample-agent'
target.parent.mkdir(parents=True)
target.write_bytes(b'working agent\n')
source=self.installer.read_text(encoding='utf-8').split('# Stop the old log writer')[0]
source+='''\nfetch() { echo partial-candidate >"$2"; echo 'HTTP 404' >&2; return 22; }
install_file usr/sbin/sample-agent 0755
echo UNREACHABLE
'''
script=self.root/'driver.sh'; script.write_text(source,encoding='utf-8',newline='\n')
result=subprocess.run(self.args+[script.as_posix()],capture_output=True,encoding='utf-8',timeout=20,
env={**self.env,'ROOT':self.root.as_posix()})
self.assertEqual(result.returncode,22,result.stderr)
self.assertIn('HTTP 404',result.stderr)
self.assertEqual(target.read_bytes(),b'working agent\n')
self.assertFalse(list(target.parent.glob('sample-agent.new.*')))
self.assertNotIn('UNREACHABLE',result.stdout)
def test_web_services_start_on_first_install_and_reload_when_running(self):
for name in ['rpcd','uhttpd']:
helper=self.root/'etc/init.d'/name
helper.parent.mkdir(parents=True,exist_ok=True)
helper.write_text('''#!/bin/sh
printf '%s %s\\n' "${0##*/}" "$1" >>"$INSTALL_CALL_LOG"
case "$1" in
running) [ "$SERVICE_RUNNING" = 1 ] ;;
start|reload) exit 0 ;;
*) echo 'unexpected service command' >&2; exit 99 ;;
esac
''',encoding='utf-8',newline='\n')
helper.chmod(0o755)
calls=self.root/'service-calls'
for running,operation in [('0','start'),('1','reload')]:
calls.write_text('')
result=subprocess.run(self.args+[self.installer.as_posix()],capture_output=True,encoding='utf-8',timeout=30,
env={**self.env,'ROOT':self.root.as_posix(),
'INSTALL_CALL_LOG':calls.as_posix(),'SERVICE_RUNNING':running})
self.assertEqual(result.returncode,0,result.stderr)
self.assertEqual(calls.read_text().splitlines(),['rpcd running','rpcd '+operation,
'uhttpd running','uhttpd '+operation])
if __name__=='__main__': unittest.main()
+78 -12
View File
@@ -31,6 +31,11 @@ class XrayBootstrapTests(unittest.TestCase):
xray_cache_dir() { printf '%s' "$TEST_ROOT/flash"; }
xray_release_asset() { printf openwrt-xray_26.6.27-1_aarch64_cortex-a53-aarch64_cortex-a53.ipk; }
xray_arch() { printf aarch64; }
xray_discover_releases() {
printf 'v26.6.27|test.ipk|https://github.com/test|%s|%s\n' "$(xray_digest "$TEST_ROOT/release.pkg")" "$(wc -c <"$TEST_ROOT/release.pkg")" >"$1"
}
xray_probe_url() { return 0; }
xray_check_package_metadata() { return 0; }
xray_package_extract_binary() { cp "$TEST_ROOT/release.pkg" "$2"; }
ensure_ca_certificates() { return 0; }
ensure_fetch_tool() { return 0; }
@@ -72,13 +77,13 @@ xray_process_start() { [ "$1" != "$$" ] || printf 1; }
env={**self.env, **env}, timeout=40)
def make_binary(self, text='Xray test version'):
data = f'#!/bin/sh\ncase "$1" in version) echo "{text}" ;; *) exit 0 ;; esac\n'.encode()
data = f'#!/bin/sh\ncase "$1" in version) echo "Xray 26.6.27 ({text})" ;; *) exit 0 ;; esac\n'.encode()
self.binary.write_bytes(data)
self.binary.chmod(0o755)
return data
def test_yichya_asset_uses_openwrt_opkg_architecture(self):
result = self.raw_shell('xray_release_asset', mocks=r'''
result = self.raw_shell('xray_arch', mocks=r'''
opkg() {
[ "$1" = print-architecture ] || return 1
printf '%s\n' 'arch all 1' 'arch noarch 1' 'arch aarch64_cortex-a53 10'
@@ -86,7 +91,7 @@ opkg() {
''')
self.assertEqual(result.returncode, 0, result.stderr)
self.assertEqual(result.stdout.strip().splitlines()[-1],
'openwrt-xray_26.6.27-1_aarch64_cortex-a53-aarch64_cortex-a53.ipk')
'aarch64_cortex-a53')
def test_yichya_ipk_extracts_only_usr_bin_xray(self):
binary = self.make_binary('package')
@@ -139,6 +144,12 @@ ensure_ca_certificates() { return 0; }
ensure_fetch_tool() { return 0; }
xray_cache_dir() { printf '%s' "$TEST_ROOT/flash"; }
fetch_file() { echo "$1" >>"$TEST_ROOT/downloads"; cp "$TEST_ROOT/release.pkg" "$2"; }
xray_discover_releases() {
printf 'v26.6.27|openwrt-xray-26.6.27-r1-aarch64_generic.apk|https://github.com/test/openwrt-xray-26.6.27-r1-aarch64_generic.apk|%s|%s\n' "$(xray_digest "$TEST_ROOT/release.pkg")" "$(wc -c <"$TEST_ROOT/release.pkg")" >"$1"
}
xray_probe_url() { return 0; }
xray_check_package_metadata() { return 0; }
'''
def apk_fixture(self, binary=None):
@@ -158,7 +169,7 @@ fetch_file() { echo "$1" >>"$TEST_ROOT/downloads"; cp "$TEST_ROOT/release.pkg" "
self.assertIn('/openwrt-xray-26.6.27-r1-aarch64_generic.apk',
(self.directory / 'downloads').read_text())
self.assertTrue((self.directory / 'apk-calls').read_text().startswith('extract '))
self.assertTrue(list(self.store.glob('openwrt-xray-26.6.27-r1-aarch64_generic.apk.*.gz')))
self.assertTrue(list(self.store.glob('xray-aarch64_generic.*.gz')))
self.assert_clean()
def test_apk_extract_failure_reports_real_reason_and_preserves_working_state(self):
@@ -190,8 +201,8 @@ fetch_file() { echo "$1" >>"$TEST_ROOT/downloads"; cp "$TEST_ROOT/release.pkg" "
self.apk_fixture(bad)
original_uci = (self.directory / 'uci').read_bytes()
result = self.raw_shell('install_xray_tmp', mocks=self.APK_EXTRACT_MOCK)
self.assertEqual(result.returncode, 23, result.stderr)
self.assertIn('vless without TLS', result.stderr)
self.assertEqual(result.returncode, 1, result.stderr)
self.assertIn('binary version does not match release', result.stderr)
self.assertEqual(self.binary.read_bytes(), good)
self.assertEqual((self.directory / 'uci').read_bytes(), original_uci)
self.assert_clean()
@@ -210,11 +221,12 @@ fetch_file() { echo "$1" >>"$TEST_ROOT/downloads"; cp "$TEST_ROOT/release.pkg" "
self.assertFalse(list(self.runtime.glob('.compat.*')))
self.assertFalse((self.runtime / 'xray.pkg').exists())
self.assertFalse(list(self.runtime.glob('*.package-extract.*')))
self.assertFalse(list(self.runtime.glob('.download.*')))
def test_compatible_mipsel_ipk_and_apk_asset_names(self):
def test_cache_label_is_independent_of_download_version(self):
for fmt, expected in (
('ipk', 'openwrt-xray_26.6.27-1_mipsel_24kc-mipsel_24kc.ipk'),
('apk', 'openwrt-xray-26.6.27-r1-mipsel_24kc.apk'),
('ipk', 'xray-mipsel_24kc'),
('apk', 'xray-mipsel_24kc'),
):
result = self.raw_shell('xray_release_asset', mocks=
f'xray_arch() {{ printf mipsel_24kc; }}; xray_package_format() {{ printf {fmt}; }}')
@@ -238,8 +250,8 @@ exit 23
(self.directory / 'release.pkg').write_bytes(bad)
original_uci = (self.directory / 'uci').read_bytes()
result = self.shell('install_xray_tmp', mocks='fetch_file() { cp "$TEST_ROOT/release.pkg" "$2"; }')
self.assertEqual(result.returncode, 23, result.stderr)
self.assertIn('vless without TLS', result.stderr)
self.assertEqual(result.returncode, 1, result.stderr)
self.assertIn('binary version does not match release', result.stderr)
self.assertEqual(self.binary.read_bytes(), good)
self.assertEqual((self.directory / 'uci').read_bytes(), original_uci)
self.assertTrue(cached.exists())
@@ -365,12 +377,66 @@ fetch_file() { echo download >>"$TEST_ROOT/downloads"; cp "$TEST_ROOT/release.pk
self.assertEqual(len(list(self.store.glob('*.gz'))), 1)
self.assert_clean()
def test_release_checksum_mismatch_cannot_replace_binary_or_cache(self):
old = self.make_binary('working')
cached = self.cache(old)
(self.directory / 'release.pkg').write_bytes(old)
result = self.shell('install_xray_tmp', mocks=r'''
xray_discover_releases() {
printf 'v26.6.27|test.ipk|https://github.com/test|%064d|%s\n' 0 "$(wc -c <"$TEST_ROOT/release.pkg")" >"$1"
}
fetch_file() { cp "$TEST_ROOT/release.pkg" "$2"; }
''')
self.assertNotEqual(result.returncode, 0)
self.assertIn('SHA256 mismatch', result.stderr)
self.assertEqual(self.binary.read_bytes(), old)
self.assertEqual(gzip.decompress(cached.read_bytes()), old)
self.assert_clean()
def test_unavailable_asset_tries_next_published_candidate(self):
data = self.make_binary('candidate')
self.binary.unlink()
(self.directory / 'release.pkg').write_bytes(data)
result = self.shell('install_xray_tmp', mocks=r'''
xray_discover_releases() {
printf 'v26.6.27|missing.ipk|https://github.com/missing|%s|%s\n' "$(xray_digest "$TEST_ROOT/release.pkg")" "$(wc -c <"$TEST_ROOT/release.pkg")" >"$1"
printf 'v26.6.27|published.ipk|https://github.com/published|%s|%s\n' "$(xray_digest "$TEST_ROOT/release.pkg")" "$(wc -c <"$TEST_ROOT/release.pkg")" >>"$1"
}
xray_probe_url() { case "$1" in */missing) return 22 ;; esac; }
fetch_file() { cp "$TEST_ROOT/release.pkg" "$2"; }
''')
self.assertEqual(result.returncode, 0, result.stderr)
self.assertIn('URL unavailable (rc=22)', result.stderr)
self.assertEqual(self.binary.read_bytes(), data)
self.assert_clean()
def test_rejected_candidates_continue_with_older_release_page(self):
data = self.make_binary('older published candidate')
self.binary.unlink()
(self.directory / 'release.pkg').write_bytes(data)
result = self.shell('install_xray_tmp', mocks=r'''
xray_discover_releases() {
case "$3" in
1) asset=rejected.ipk; printf '2\n' >"$2/next-release-page" ;;
2) asset=accepted.ipk; rm -f "$2/next-release-page" ;;
*) return 99 ;;
esac
printf 'v26.6.27|%s|https://github.com/test|%s|%s\n' "$asset" "$(xray_digest "$TEST_ROOT/release.pkg")" "$(wc -c <"$TEST_ROOT/release.pkg")" >"$1"
}
xray_check_package_metadata() { [ "$3" != rejected.ipk ]; }
fetch_file() { cp "$TEST_ROOT/release.pkg" "$2"; }
''')
self.assertEqual(result.returncode, 0, result.stderr)
self.assertIn('searching older published releases', result.stderr)
self.assertEqual(self.binary.read_bytes(), data)
self.assert_clean()
def test_full_or_unmounted_flash_never_breaks_existing_xray(self):
self.make_binary()
for mock in ('xray_cache_dir() { return 1; }',
'df() { printf "Filesystem blocks used available capacity mount\\nflash 100 99 1 99%% /overlay\\n"; }'):
result = self.shell('prepare_xray', mocks=mock)
self.assertEqual(result.returncode, 0, result.stderr)
self.assertNotEqual(result.returncode, 0, result.stderr)
self.assertTrue(self.binary.exists())
self.assertFalse(list(self.store.glob('*.gz')))
self.assert_clean()
+20
View File
@@ -0,0 +1,20 @@
"""Local release-selector payload install/rollback without router access."""
import unittest
from test_xray_apk_deploy import XrayApkDeploymentTests
class XrayReleaseDeploymentTests(XrayApkDeploymentTests):
deploy_name = 'deploy-xray-release-fix.ps1'
backup_name = 'owrt-remote-backup-before-xray-release-v121'
success_marker = 'XRAY_RELEASE_ROUTER_Install_OK'
def test_failed_xray_preparation_restores_agent_and_retains_backup(self):
self.env['PREPARE_RC'] = '13'
result = self.deploy('Install')
self.assertEqual(result.returncode, 13, result.stderr)
self.assertIn('prepare-xray-release', result.stderr)
self.assertEqual(self.targets['agent'].read_bytes(), self.original['agent'])
self.assertEqual(self.backup.joinpath('agent').read_bytes(), self.original['agent'])
if __name__ == '__main__': unittest.main()
+193
View File
@@ -0,0 +1,193 @@
"""Release discovery/ABI/checksum regression tests using BusyBox-compatible shell.
No network or router credentials. Transport/cache tests are in bootstrap suite.
"""
import hashlib
import json
import os
from pathlib import Path
import shlex
import subprocess
import unittest
import test_xray_bootstrap as bootstrap
import test_host_policy as base
class XrayReleaseSelectionTests(unittest.TestCase):
setUp = bootstrap.XrayBootstrapTests.setUp
config = base.RouterShellTests.config
shell = bootstrap.XrayBootstrapTests.raw_shell
def setUp(self):
bootstrap.XrayBootstrapTests.setUp(self)
release = self.directory / 'openwrt_release'
release.write_text("DISTRIB_RELEASE='25.12.2'\nDISTRIB_ARCH='mipsel_24kc'\n")
self.env['OWRT_REMOTE_RELEASE_FILE'] = release.as_posix()
# JSON filter double supports the exact documented jsonfilter paths.
self.query = self.directory / 'query.py'
self.query.write_text('''import json,re,sys
sys.stdout.reconfigure(newline='\\n')
data=json.load(open(sys.argv[1],encoding='utf-8-sig'))
parts=re.findall(r'\\[(\\d+|\\*)\\]|\\.([A-Za-z_]+)',sys.argv[2])
values=[data]
for idx,key in parts:
out=[]
for v in values:
try:
if key: out.append(v[key])
elif idx=='*': out.extend(v)
else: out.append(v[int(idx)])
except (KeyError,IndexError,TypeError): pass
values=out
for v in values:
print(json.dumps(v,separators=(',',':')) if not isinstance(v,str) else v)
sys.exit(0 if values else 1)
''')
self.fixture = self.directory / 'api.json'
self.fixture.write_text('[]')
self.common = r'''
apk() {
case "$1" in
--print-arch) echo "${TEST_ARCH:-mipsel}" ;;
adbdump) cat "$TEST_ROOT/metadata.json" ;;
add) printf '%s\n' "$*" >>"$TEST_ROOT/dependency-checks"; return "${TEST_DEP_RC:-0}" ;;
*) return 1 ;;
esac
}
opkg() { echo forbidden-opkg >&2; return 99; }
jsonfilter() { "$TEST_PYTHON" "$TEST_ROOT/query.py" "$2" "$4"; }
fetch_file() {
echo "$1" >>"$TEST_ROOT/fetched"
[ "${TEST_FETCH_RC:-0}" = 0 ] || return "$TEST_FETCH_RC"
cp "$TEST_ROOT/api.json" "$2"
}
'''
self.directory.joinpath('metadata.json').write_text(json.dumps({'info': {'name':'openwrt-xray','arch':'mipsel'}}))
def run_case(self, command, mocks='', **env):
return self.shell(command, mocks=self.common + mocks, **env)
def asset(self, tag='v26.6.22', arch='mipsel_24kc', digest=None):
name=f'openwrt-xray-{tag[1:]}-r1-{arch}.apk'
return {'name':name,'state':'uploaded','size':123,
'digest':'sha256:'+(digest or 'a'*64),
'browser_download_url':'https://github.com/yichya/openwrt-xray/releases/download/'+tag+'/'+name}
def release(self, tag='v26.6.22', assets=None, **kw):
return dict(tag_name=tag,draft=False,prerelease=False,assets=assets or [self.asset(tag)],**kw)
def manifest(self, releases):
self.fixture.write_text(json.dumps(releases),encoding='utf-8')
def discover(self, **env):
return self.run_case('xray_discover_releases "$TEST_ROOT/candidates" "$TEST_ROOT"; rc=$?; cat "$TEST_ROOT/candidates"; exit "$rc"',**env)
def test_apk_generic_abi_refined_from_openwrt_and_never_calls_opkg(self):
result=self.run_case('xray_arch; xray_package_format')
self.assertEqual(result.returncode,0,result.stderr)
self.assertEqual(result.stdout.splitlines(),['mipsel_24kc','apk'])
self.assertNotIn('forbidden',result.stderr)
def test_precise_apk_architecture_remains_authoritative(self):
result=self.run_case('xray_arch',TEST_ARCH='aarch64_cortex-a53')
self.assertEqual(result.stdout.strip(),'aarch64_cortex-a53')
def test_selects_published_asset_with_checksum_not_constructed_name(self):
item=self.asset(); item['name']=item['name'].replace('-r1-','-r7-')
item['browser_download_url']=item['browser_download_url'].replace('-r1-','-r7-')
self.manifest([self.release(assets=[item])])
result=self.discover()
self.assertEqual(result.returncode,0,result.stderr)
self.assertIn('-r7-mipsel_24kc.apk',result.stdout)
self.assertIn('a'*64,result.stdout)
self.assertNotIn('-mipsel.apk',result.stdout)
def test_future_plain_vless_incompatible_release_is_skipped(self):
self.manifest([self.release('v26.10.31'),self.release('v26.6.22')])
result=self.discover()
self.assertEqual(result.returncode,0,result.stderr)
self.assertIn('v26.6.22',result.stdout)
self.assertNotIn('v26.10.31',result.stdout)
def test_api_uses_json_even_when_minified_or_reordered(self):
release=self.release()
release=dict(reversed(list(release.items())))
self.manifest([release])
result=self.discover()
self.assertEqual(result.returncode,0,result.stderr)
def test_other_cpu_draft_prerelease_and_missing_digest_rejected(self):
for changes in ({'draft':True},{'prerelease':True},
{'assets':[self.asset(arch='mipsel_74kc')]},
{'assets':[dict(self.asset(),digest=None)]}):
with self.subTest(changes=changes):
r=self.release(); r.update(changes); self.manifest([r])
result=self.discover()
self.assertNotEqual(result.returncode,0)
self.assertIn('No compatible Xray package found',result.stderr)
def test_github_api_failure_is_explicit(self):
result=self.discover(TEST_FETCH_RC='22')
self.assertNotEqual(result.returncode,0)
self.assertIn('GitHub API unavailable',result.stderr)
self.assertFalse(self.binary.exists())
def test_invalid_json_and_api_error_object_are_not_accepted(self):
for data in ('{invalid','{"message":"API rate limit exceeded"}'):
self.fixture.write_text(data)
result=self.discover()
self.assertNotEqual(result.returncode,0)
def test_apk_metadata_requires_target_abi_and_dependency_solver(self):
result=self.run_case('xray_check_package_metadata dummy "$TEST_ROOT" file.apk')
self.assertEqual(result.returncode,0,result.stderr)
self.assertIn('--simulate --no-network --allow-untrusted',self.directory.joinpath('dependency-checks').read_text())
self.assertNotIn('forbidden-opkg',result.stderr)
def test_matching_filename_does_not_override_metadata_abi(self):
self.directory.joinpath('metadata.json').write_text(json.dumps({'info':{'name':'openwrt-xray','arch':'aarch64'}}))
result=self.run_case('xray_check_package_metadata dummy "$TEST_ROOT" file.apk')
self.assertNotEqual(result.returncode,0)
self.assertIn('incompatible APK ABI',result.stderr)
def test_dependency_failure_does_not_install_downloaded_package(self):
result=self.run_case('xray_check_package_metadata dummy "$TEST_ROOT" file.apk',TEST_DEP_RC='7')
self.assertNotEqual(result.returncode,0)
self.assertIn('dependencies incompatible',result.stderr)
def test_url_outside_official_release_is_rejected(self):
asset=self.asset(); asset['browser_download_url']='https://evil.example/file.apk'
self.manifest([self.release(assets=[asset])])
result=self.discover()
self.assertNotEqual(result.returncode,0)
def test_second_api_page_is_used_when_first_has_only_incompatible_cores(self):
self.manifest([self.release('v26.10.'+str(day)) for day in range(1,21)])
self.directory.joinpath('page2.json').write_text(json.dumps([self.release()]))
result=self.run_case('xray_discover_releases "$TEST_ROOT/candidates" "$TEST_ROOT"; rc=$?; cat "$TEST_ROOT/candidates"; exit "$rc"', mocks=r'''
fetch_file() {
echo "$1" >>"$TEST_ROOT/fetched"
case "$1" in *page=2) cp "$TEST_ROOT/page2.json" "$2" ;; *) cp "$TEST_ROOT/api.json" "$2" ;; esac
}
''')
self.assertEqual(result.returncode,0,result.stderr)
self.assertIn('mipsel_24kc.apk',result.stdout)
self.assertIn('page=2',self.directory.joinpath('fetched').read_text())
def test_generic_cpu_without_openwrt_target_does_not_guess_24kc(self):
Path(self.env['OWRT_REMOTE_RELEASE_FILE']).write_text("DISTRIB_RELEASE='25.12.2'\n")
self.manifest([self.release()])
result=self.discover()
self.assertNotEqual(result.returncode,0)
self.assertIn('No compatible Xray package found',result.stderr)
def test_older_page_is_bookmarked_without_fetching_it_before_validation(self):
self.manifest([self.release()]+[self.release('v26.10.'+str(i)) for i in range(1,20)])
result=self.discover()
self.assertEqual(result.returncode,0,result.stderr)
self.assertEqual(self.directory.joinpath('next-release-page').read_text().strip(),'2')
self.assertEqual(len(self.directory.joinpath('fetched').read_text().splitlines()),1)
if __name__=='__main__': unittest.main()
+1
View File
@@ -37,6 +37,7 @@ class XrayValidationTests(unittest.TestCase):
self.target.write_text('{"working":true}\n', encoding="utf-8")
binary = self.directory / "xray"
binary.write_text(r'''#!/bin/sh
if [ "$1" = version ]; then printf 'Xray 26.6.27 (validation fixture)\n'; exit 0; fi
[ "$1" = -test ] && [ "$2" = -config ] || exit 99
printf '%s\n' "$*" >>"$TEST_ROOT/xray-tests"
case "$3" in *.json) ;; *) echo 'Failed to get format' >&2; exit 1 ;; esac
+2 -2
View File
@@ -63,9 +63,9 @@ done
if [ '__ACTION__' = Install ]; then
for item in agent; do test -s "$stage/$item"; sh -n "$stage/$item"; done
grep -F -q 'xray_validate_transport_binary()' "$stage/agent"
grep -F -q '26.6.27' "$stage/agent"
grep -F -q 'xray_discover_releases()' "$stage/agent"
grep -F -q 'apk extract --allow-untrusted --no-chown --destination' "$stage/agent"
grep -F -q 'xray_package_extract_binary "$package" "$dir/xray.new" "$asset"' "$stage/agent"
grep -F -q 'xray_package_extract_binary "$package" "$work/xray.new" "$asset"' "$stage/agent"
if [ ! -e "$backup_dir" ]; then
mkdir -p "$stage/retained-backup"
chmod 700 "$stage/retained-backup"
+1 -1
View File
@@ -62,7 +62,7 @@ done
if [ '__ACTION__' = Install ]; then
for item in cgi agent; do test -s "$stage/$item"; sh -n "$stage/$item"; done
grep -F -q 'xray_validate_transport_binary()' "$stage/agent"
grep -F -q '26.6.27' "$stage/agent"
grep -F -q 'xray_discover_releases()' "$stage/agent"
grep -F -q 'OWRT_REMOTE_APPLY_TRACE' "$stage/cgi"
if [ ! -e "$backup_dir" ]; then
mkdir -p "$stage/retained-backup"
+150
View File
@@ -0,0 +1,150 @@
param(
[ValidateNotNullOrEmpty()][string]$Router = 'root@192.168.2.1',
[ValidateSet('Install', 'Rollback')][string]$Action = 'Install',
[switch]$PrepareOnly
)
$ErrorActionPreference = 'Stop'
$RepoRoot = Split-Path -Parent $PSScriptRoot
$UploadName = 'owrt-xray-release-' + [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'
}
$RemoteScript = @'
#!/bin/sh
set -eu
stage=/tmp/__UPLOAD_NAME__
backup_dir=/root/owrt-remote-backup-before-xray-release-v121
key_file=/etc/owrt-remote/web.key
key_candidate=$key_file.new-__UPLOAD_NAME__
changed=0
phase=preflight
item_path() {
case "$1" in
agent) printf /usr/sbin/owrt-remote ;;
esac
}
complete_backup() {
[ -f "$1/complete" ] && [ -s "$1/agent" ]
}
restore_files() {
local dir item path
dir=$1
complete_backup "$dir" || return 1
for item in agent; do
path=$(item_path "$item")
cp -p "$dir/$item" "$path.new-__UPLOAD_NAME__" || return 1
mv -f "$path.new-__UPLOAD_NAME__" "$path" || return 1
done
}
cleanup() {
code=$?
trap - EXIT
if [ "$code" -ne 0 ]; then
printf 'Failed during %s (rc=%s).\n' "$phase" "$code" >&2
if [ "$changed" = 1 ]; then
echo 'Restoring the previous agent from this attempt.' >&2
restore_files "$stage/previous" || echo 'Restore failed; retained backup is available.' >&2
fi
fi
for item in agent; do path=$(item_path "$item"); rm -f "$path.new-__UPLOAD_NAME__"; done
rm -f "$key_candidate"
rm -rf "$stage"
exit "$code"
}
trap cleanup EXIT
trap 'exit 1' INT TERM
for item in agent; do
path=$(item_path "$item")
test -s "$path"
done
if [ '__ACTION__' = Install ]; then
for item in agent; do test -s "$stage/$item"; sh -n "$stage/$item"; done
grep -F -q 'xray_validate_transport_binary()' "$stage/agent"
grep -F -q 'xray_discover_releases()' "$stage/agent"
grep -F -q 'apk extract --allow-untrusted --no-chown --destination' "$stage/agent"
grep -F -q 'xray_package_extract_binary "$package" "$work/xray.new" "$asset"' "$stage/agent"
if [ ! -e "$backup_dir" ]; then
mkdir -p "$stage/retained-backup"
chmod 700 "$stage/retained-backup"
for item in agent; do path=$(item_path "$item"); cp -p "$path" "$stage/retained-backup/$item"; done
touch "$stage/retained-backup/complete"
mv "$stage/retained-backup" "$backup_dir"
fi
complete_backup "$backup_dir" || { echo "Incomplete backup: $backup_dir. Nothing changed." >&2; exit 1; }
source_dir=$stage
else
complete_backup "$backup_dir" || { echo "No complete backup: $backup_dir. Nothing changed." >&2; exit 1; }
for item in agent; do sh -n "$backup_dir/$item"; done
source_dir=$backup_dir
fi
printf 'Backup: %s\n' "$backup_dir"
mkdir -p "$stage/previous"
for item in agent; do path=$(item_path "$item"); cp -p "$path" "$stage/previous/$item"; done
touch "$stage/previous/complete"
phase=install
changed=1
for item in agent; do
path=$(item_path "$item")
cp "$source_dir/$item" "$path.new-__UPLOAD_NAME__"
chmod 755 "$path.new-__UPLOAD_NAME__"
mv -f "$path.new-__UPLOAD_NAME__" "$path"
done
phase=verify
for item in agent; do
path=$(item_path "$item")
sh -n "$path"
cmp "$source_dir/$item" "$path"
done
if [ '__ACTION__' = Install ]; then
phase=prepare-xray-release
# Replaces a known incompatible core, or restores/downloads a validated
# compatible one. Does not render JSON or restart an existing tunnel.
/usr/sbin/owrt-remote prepare-xray
# install.sh creates the web key after Xray preparation. Recover that last
# step if the first installation was interrupted by the APK defect.
if [ ! -s "$key_file" ]; then
phase=finish-first-install
mkdir -p "$(dirname "$key_file")"
if command -v hexdump >/dev/null 2>&1; then
(umask 077; dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -v -e '16/1 "%02x"' >"$key_candidate")
else
(umask 077; dd if=/dev/urandom bs=16 count=1 2>/dev/null | od -An -v -tx1 | tr -d ' \n' >"$key_candidate")
fi
[ "$(wc -c <"$key_candidate")" -eq 32 ] || { echo 'Web key generation failed.' >&2; exit 1; }
chmod 600 "$key_candidate"
mv -f "$key_candidate" "$key_file"
echo 'Web key created for the interrupted first installation.'
fi
fi
# Rollback restores agent code only; retain the validated compatible core,
# its boot cache, and all router settings. Never remove a working executable.
printf '\nXRAY_RELEASE_ROUTER_%s_OK\n' '__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. The 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 "Xray release fix $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
@@ -83,7 +83,7 @@ done
if [ '__ACTION__' = Install ]; then
for item in cgi agent; do test -s "$stage/$item"; sh -n "$stage/$item"; done
grep -F -q 'xray_validate_transport_binary()' "$stage/agent"
grep -F -q '26.6.27' "$stage/agent"
grep -F -q 'xray_discover_releases()' "$stage/agent"
grep -F -q '"finalRules"' "$stage/agent"
grep -F -q 'OWRT_REMOTE_APPLY_TRACE' "$stage/cgi"
if [ ! -e "$backup_dir" ]; then