Release v116 with VPS router logs and reliable log delivery
Add per-router VPS log archives available offline, live delivery and last reported service state. Keep router logs in RAM with bounded rotation and deduplication. Align log pages and mobile statistics, and bump application and deployment tools to v116.
This commit is contained in:
1 parent
4ceb3d031a
commit
aa7970c98c
43 files changed
+1658
-121
No files matched your search
@@ -171,10 +171,36 @@ wget -O - "https://raw.githubusercontent.com/kzolotarev95/luci-app-owrt-remote/m
|
|||||||
В панели самого роутера рядом с NetHaven VPN есть кнопка **Глобал логи**:
|
В панели самого роутера рядом с NetHaven VPN есть кнопка **Глобал логи**:
|
||||||
при открытии блока сразу загружаются сохранённые записи. Журнал можно скачать,
|
при открытии блока сразу загружаются сохранённые записи. Журнал можно скачать,
|
||||||
включить просмотр с обновлением каждые 3 секунды или очистить.
|
включить просмотр с обновлением каждые 3 секунды или очистить.
|
||||||
Записываются действия панели, Heartbeat, WAN и сообщения Xray.
|
Записываются действия панели, изменения связи Heartbeat/WAN, предупреждения
|
||||||
|
и ошибки Xray. Успешные Heartbeat без изменения состояния и повторяющиеся
|
||||||
|
события не заполняют журнал; подробности каждого соединения Xray отключены.
|
||||||
|
В просмотре успех отмечается зелёным, предупреждение — жёлтым, ошибка — красным.
|
||||||
Журнал хранится в `/tmp/owrt-remote-logs/`, занимает около 2 МБ максимум,
|
Журнал хранится в `/tmp/owrt-remote-logs/`, занимает около 2 МБ максимум,
|
||||||
очищается каждые 24 часа и исчезает после перезагрузки. Сбор работает отдельно
|
очищается каждые 24 часа и исчезает после перезагрузки. Сбор работает отдельно
|
||||||
от туннеля; остановка Xray не останавливает журнал. Ключи и пароли скрываются.
|
от туннеля; остановка Xray не останавливает журнал. Ключи и пароли скрываются.
|
||||||
|
Перед записью проверяется tmpfs: журнал и его служебное состояние не размещаются
|
||||||
|
на Flash. После очистки одинаковые факты могут быть записаны заново.
|
||||||
|
|
||||||
|
В карточке роутера на VPS есть **Глобал логи**, открывающиеся в новой вкладке.
|
||||||
|
Там доступны те же скачивание, просмотр с обновлением каждые 3 секунды и очистка,
|
||||||
|
а также зелёные, жёлтые и красные записи. Роутер доставляет новые записи на VPS
|
||||||
|
отдельно от Heartbeat: повторная отправка после обрыва не создаёт дубликатов.
|
||||||
|
Остановка Remote кнопкой «Остановить» не прекращает доставку журнала: пока
|
||||||
|
работает интернет, записи об остановке и дальнейшие действия поступают на VPS.
|
||||||
|
Над журналом Hub показывает полученное состояние: Remote выключен, Xray
|
||||||
|
остановлен или Heartbeat поступает. Если точная причина обрыва не доставлена,
|
||||||
|
Hub сообщает об этом прямо; последнее предупреждение не выдаётся за доказанную
|
||||||
|
причину отключения.
|
||||||
|
Обновить для этого нужно и VPS, и каждый роутер, журнал которого нужен в Hub.
|
||||||
|
|
||||||
|
Кнопка доступна и при оффлайн: Hub хранит последние доставленные записи в своей
|
||||||
|
базе, до 2 МБ на роутер. Архив сохраняется после перезагрузки роутера и Hub;
|
||||||
|
очистка ОЗУ роутера раз в сутки не удаляет копию на VPS. Hub записывает факт
|
||||||
|
истечения ожидания Heartbeat. Записи, созданные после полной потери связи,
|
||||||
|
появятся только при её восстановлении, если ещё сохранены в ОЗУ роутера.
|
||||||
|
Очистка из Hub сразу удаляет архив VPS, а очистка журнала оффлайн-роутера
|
||||||
|
применится при следующей доставке. Доступ к журналу требует полного доступа
|
||||||
|
к этому роутеру; удаление роутера удаляет его архив.
|
||||||
|
|
||||||
Проверка на роутере:
|
Проверка на роутере:
|
||||||
|
|
||||||
|
|||||||
@@ -66,6 +66,7 @@ start_service() {
|
|||||||
|
|
||||||
procd_open_instance xray
|
procd_open_instance xray
|
||||||
procd_set_param command /usr/sbin/owrt-remote run
|
procd_set_param command /usr/sbin/owrt-remote run
|
||||||
|
procd_set_param env OWRT_REMOTE_SERVICE_LOG=1
|
||||||
procd_set_param respawn 3600 5 5
|
procd_set_param respawn 3600 5 5
|
||||||
procd_set_param stdout 1
|
procd_set_param stdout 1
|
||||||
procd_set_param stderr 1
|
procd_set_param stderr 1
|
||||||
@@ -73,6 +74,7 @@ start_service() {
|
|||||||
|
|
||||||
procd_open_instance heartbeat
|
procd_open_instance heartbeat
|
||||||
procd_set_param command /usr/sbin/owrt-remote heartbeat-loop
|
procd_set_param command /usr/sbin/owrt-remote heartbeat-loop
|
||||||
|
procd_set_param env OWRT_REMOTE_SERVICE_LOG=1
|
||||||
procd_set_param respawn 3600 5 5
|
procd_set_param respawn 3600 5 5
|
||||||
procd_set_param stdout 1
|
procd_set_param stdout 1
|
||||||
procd_set_param stderr 1
|
procd_set_param stderr 1
|
||||||
|
|||||||
@@ -11,4 +11,10 @@ start_service() {
|
|||||||
procd_set_param stdout 1
|
procd_set_param stdout 1
|
||||||
procd_set_param stderr 1
|
procd_set_param stderr 1
|
||||||
procd_close_instance
|
procd_close_instance
|
||||||
|
|
||||||
|
procd_open_instance archive
|
||||||
|
procd_set_param command /bin/sh /usr/lib/owrt-remote/logs.sh sync
|
||||||
|
procd_set_param env OWRT_REMOTE_SERVICE_LOG=1
|
||||||
|
procd_set_param respawn 3600 5 5
|
||||||
|
procd_close_instance
|
||||||
}
|
}
|
||||||
@@ -5,8 +5,26 @@ LOG_LIMIT=1048576
|
|||||||
LOG_KEEP_SECONDS=86400
|
LOG_KEEP_SECONDS=86400
|
||||||
|
|
||||||
log_clock() { cut -d. -f1 /proc/uptime; }
|
log_clock() { cut -d. -f1 /proc/uptime; }
|
||||||
|
log_ram_storage() {
|
||||||
|
local resolved parent
|
||||||
|
if [ -e "$LOG_DIR" ] || [ -L "$LOG_DIR" ]; then
|
||||||
|
resolved="$(readlink -f "$LOG_DIR")" || return 1
|
||||||
|
else
|
||||||
|
# BusyBox realpath may require the last component to exist.
|
||||||
|
# Resolve the existing parent before creating the journal directory.
|
||||||
|
parent="$(readlink -f "$(dirname "$LOG_DIR")")" || return 1
|
||||||
|
resolved="$parent/$(basename "$LOG_DIR")"
|
||||||
|
fi
|
||||||
|
awk -v path="$resolved" '
|
||||||
|
(path == $2 || index(path, $2 "/") == 1 || $2 == "/") && length($2) > best {
|
||||||
|
best = length($2); filesystem = $3
|
||||||
|
}
|
||||||
|
END { exit(filesystem == "tmpfs" ? 0 : 1) }
|
||||||
|
' /proc/mounts
|
||||||
|
}
|
||||||
log_init() {
|
log_init() {
|
||||||
umask 077
|
umask 077
|
||||||
|
log_ram_storage || { printf 'Remote journal requires RAM (tmpfs); refusing persistent storage.\n' >&2; return 1; }
|
||||||
mkdir -p "$LOG_DIR" || return 1
|
mkdir -p "$LOG_DIR" || return 1
|
||||||
chmod 700 "$LOG_DIR"
|
chmod 700 "$LOG_DIR"
|
||||||
}
|
}
|
||||||
@@ -41,8 +59,22 @@ log_unlock() {
|
|||||||
log_reset_locked() {
|
log_reset_locked() {
|
||||||
: >"$LOG_DIR/current.log"
|
: >"$LOG_DIR/current.log"
|
||||||
rm -f "$LOG_DIR/previous.log"
|
rm -f "$LOG_DIR/previous.log"
|
||||||
|
rm -f "$LOG_DIR/facts" "$LOG_DIR/facts.new" "$LOG_DIR/heartbeat-ok"
|
||||||
|
rm -f "$LOG_DIR/journal-id" "$LOG_DIR/total" "$LOG_DIR/sync-ack"
|
||||||
log_clock >"$LOG_DIR/age"
|
log_clock >"$LOG_DIR/age"
|
||||||
}
|
}
|
||||||
|
log_cursor_locked() {
|
||||||
|
local total
|
||||||
|
if [ ! -s "$LOG_DIR/journal-id" ]; then
|
||||||
|
cat /proc/sys/kernel/random/uuid >"$LOG_DIR/journal-id" 2>/dev/null ||
|
||||||
|
printf '%s-%s-%s\n' "$(date +%s)" "$(log_clock)" "$$" >"$LOG_DIR/journal-id"
|
||||||
|
fi
|
||||||
|
if [ ! -s "$LOG_DIR/total" ]; then
|
||||||
|
total="$(wc -c <"$LOG_DIR/current.log")"
|
||||||
|
[ ! -f "$LOG_DIR/previous.log" ] || total=$((total + $(wc -c <"$LOG_DIR/previous.log")))
|
||||||
|
printf '%s\n' "$total" >"$LOG_DIR/total"
|
||||||
|
fi
|
||||||
|
}
|
||||||
log_maintain_locked() {
|
log_maintain_locked() {
|
||||||
local now age
|
local now age
|
||||||
now="$(log_clock)"
|
now="$(log_clock)"
|
||||||
@@ -54,29 +86,83 @@ log_maintain_locked() {
|
|||||||
}
|
}
|
||||||
log_redact() {
|
log_redact() {
|
||||||
# Never retain command blocks containing credentials or authenticated URLs.
|
# Never retain command blocks containing credentials or authenticated URLs.
|
||||||
LC_ALL=C awk '
|
LC_ALL=C awk -v fallback="${1:-OK}" '
|
||||||
{
|
{
|
||||||
line = substr($0, 1, 4096); lower = tolower(line)
|
line = substr($0, 1, 4096); lower = tolower(line)
|
||||||
|
# Old info/access output may still arrive until Xray restarts.
|
||||||
|
if (lower ~ /\[(info|debug)\]/ || lower ~ / from .* accepted / || lower ~ /a unified platform for anti-censorship/) next
|
||||||
|
level = fallback
|
||||||
|
if (line ~ /^\[(OK|WARN|ERROR)\]/) { level = substr(line, 2, index(line, "]") - 2); sub(/^\[[^]]+\][ ]*/, "", line) }
|
||||||
|
else if (lower ~ /core: xray .* started/) level = "OK"
|
||||||
|
else if (lower ~ /\[error\]|ошибка|Ошибка|ОШИБКА|не удалось|Не удалось|результат=bad|failed|cannot |could not |error:|syntax error|permission denied|network is unreachable|connection refused|connection reset|timed out|not permitted|no selected wan|wan has no|wan direct requires|already used by another rule|does not belong to remote|не применилось|dns failed|crash loop/) level = "ERROR"
|
||||||
|
else if (lower ~ /\[warn(ing)?\]|предупреждение|Предупреждение|результат=warn|retry|not ready|missing|не найден|restart postponed|dns unavailable|fallback|reconnecting|restarting|failover/) level = "WARN"
|
||||||
if (lower ~ /(authorization|hub_token|vless_uuid|ssh_vless_uuid|password|passwd|web[._ -]?key|[?&]key=|[?&]token=|"uuid"|"privatekey"|"password")/ ||
|
if (lower ~ /(authorization|hub_token|vless_uuid|ssh_vless_uuid|password|passwd|web[._ -]?key|[?&]key=|[?&]token=|"uuid"|"privatekey"|"password")/ ||
|
||||||
lower ~ /[0-9a-f][0-9a-f][0-9a-f][0-9a-f]-[0-9a-f-]+-[0-9a-f-]+-[0-9a-f-]+/)
|
lower ~ /[0-9a-f][0-9a-f][0-9a-f][0-9a-f]-[0-9a-f-]+-[0-9a-f-]+-[0-9a-f-]+/)
|
||||||
print "[строка с ключом или паролем скрыта]"
|
line = "[строка с ключом или паролем скрыта]"
|
||||||
else print line
|
print "[" level "] " line
|
||||||
}'
|
}'
|
||||||
}
|
}
|
||||||
|
log_new_fact_locked() {
|
||||||
|
local key now heartbeat new_fact
|
||||||
|
# Compare event text without syslog timestamp, facility, PID or Xray time.
|
||||||
|
key="$(printf '%s\n' "$1" | tr '\t' ' ' | sed -e 's/^\[[^]]*\] *//' -e 's/.*owrt-remote\(\[[0-9][0-9]*\]\)\{0,1\}: *//' -e 's/^[0-9][0-9]*\/[0-9/:. ]* *//' -e 's/ *(\([0-9][0-9]*\)\/[0-9][0-9]*)//')"
|
||||||
|
heartbeat=0
|
||||||
|
case "$key" in
|
||||||
|
'Heartbeat: OK;'*)
|
||||||
|
heartbeat=1
|
||||||
|
if [ "$(cat "$LOG_DIR/heartbeat-ok" 2>/dev/null)" = "$key" ]; then return 1; fi
|
||||||
|
printf '%s\n' "$key" >"$LOG_DIR/heartbeat-ok"
|
||||||
|
# A recovery lets a later failure with the same cause appear again.
|
||||||
|
if [ -f "$LOG_DIR/facts" ]; then
|
||||||
|
awk -F '\t' '$2 !~ /Heartbeat:|heartbeat failed/ { print }' "$LOG_DIR/facts" >"$LOG_DIR/facts.new"
|
||||||
|
mv -f "$LOG_DIR/facts.new" "$LOG_DIR/facts"
|
||||||
|
fi ;;
|
||||||
|
esac
|
||||||
|
if [ "$heartbeat" = 1 ]; then return 0; fi
|
||||||
|
key="${1%%]*}] $key"
|
||||||
|
now="$(log_clock)"
|
||||||
|
# A bounded cache suppresses repeated identical facts while they continue.
|
||||||
|
# After a quiet period a new occurrence is recorded, rather than lost forever.
|
||||||
|
awk -F '\t' -v now="$now" -v key="$key" '
|
||||||
|
$2 == key { if (now - $1 < 120 && now >= $1) repeated = 1; next }
|
||||||
|
{ saved[++n] = $0 }
|
||||||
|
END {
|
||||||
|
for (i = (n > 63 ? n - 62 : 1); i <= n; i++) print saved[i]
|
||||||
|
print now "\t" key
|
||||||
|
exit(repeated ? 1 : 0)
|
||||||
|
}' "$LOG_DIR/facts" >"$LOG_DIR/facts.new" 2>/dev/null
|
||||||
|
new_fact=$?
|
||||||
|
mv -f "$LOG_DIR/facts.new" "$LOG_DIR/facts"
|
||||||
|
[ "$new_fact" = 0 ] || return 1
|
||||||
|
case "$key" in
|
||||||
|
*Heartbeat:*|*'heartbeat failed'*)
|
||||||
|
case "$1" in '[ERROR]'*|'[WARN]'*) rm -f "$LOG_DIR/heartbeat-ok" ;; esac ;;
|
||||||
|
*'Сервис: запуск') rm -f "$LOG_DIR/heartbeat-ok" ;;
|
||||||
|
esac
|
||||||
|
return 0
|
||||||
|
}
|
||||||
log_append() {
|
log_append() {
|
||||||
local line size
|
local line size
|
||||||
# Process one bounded line at a time and release the lock between writes.
|
# Process one bounded line at a time and release the lock between writes.
|
||||||
log_redact | while IFS= read -r line; do
|
log_redact "${1:-OK}" | while IFS= read -r line; do
|
||||||
log_lock || exit 1
|
log_lock || exit 1
|
||||||
trap 'log_unlock' EXIT
|
trap 'log_unlock' EXIT
|
||||||
trap 'exit 0' INT TERM
|
trap 'exit 0' INT TERM
|
||||||
log_maintain_locked
|
log_maintain_locked
|
||||||
|
log_cursor_locked
|
||||||
|
[ -f "$LOG_DIR/facts" ] || : >"$LOG_DIR/facts"
|
||||||
|
if ! log_new_fact_locked "$line"; then
|
||||||
|
log_unlock
|
||||||
|
trap - EXIT INT TERM
|
||||||
|
continue
|
||||||
|
fi
|
||||||
size="$(wc -c <"$LOG_DIR/current.log")"
|
size="$(wc -c <"$LOG_DIR/current.log")"
|
||||||
if [ "$size" -ge "$LOG_LIMIT" ]; then
|
if [ "$size" -ge "$LOG_LIMIT" ]; then
|
||||||
mv -f "$LOG_DIR/current.log" "$LOG_DIR/previous.log"
|
mv -f "$LOG_DIR/current.log" "$LOG_DIR/previous.log"
|
||||||
: >"$LOG_DIR/current.log"
|
: >"$LOG_DIR/current.log"
|
||||||
fi
|
fi
|
||||||
printf '%s\n' "$line" >>"$LOG_DIR/current.log"
|
printf '%s\n' "$line" >>"$LOG_DIR/current.log"
|
||||||
|
printf '%s\n' "$(( $(cat "$LOG_DIR/total") + $(printf '%s\n' "$line" | wc -c) ))" >"$LOG_DIR/total"
|
||||||
log_unlock
|
log_unlock
|
||||||
trap - EXIT INT TERM
|
trap - EXIT INT TERM
|
||||||
done
|
done
|
||||||
@@ -110,6 +196,57 @@ log_clear() {
|
|||||||
log_reset_locked
|
log_reset_locked
|
||||||
log_unlock
|
log_unlock
|
||||||
}
|
}
|
||||||
|
log_export() {
|
||||||
|
local journal total previous current ack_id ack start available count clear_ack chunk
|
||||||
|
log_lock || return 1
|
||||||
|
log_maintain_locked
|
||||||
|
log_cursor_locked
|
||||||
|
journal="$(cat "$LOG_DIR/journal-id")"; total="$(cat "$LOG_DIR/total")"
|
||||||
|
ack_id=''; ack=0
|
||||||
|
if [ -s "$LOG_DIR/sync-ack" ]; then read -r ack_id ack <"$LOG_DIR/sync-ack"; fi
|
||||||
|
[ "$ack_id" = "$journal" ] || ack=0
|
||||||
|
case "$ack" in ''|*[!0-9]*) ack=0 ;; esac
|
||||||
|
[ "$ack" -le "$total" ] || ack=0
|
||||||
|
previous=0
|
||||||
|
if [ -f "$LOG_DIR/previous.log" ]; then previous="$(wc -c <"$LOG_DIR/previous.log")"; exec 3<"$LOG_DIR/previous.log"; else exec 3</dev/null; fi
|
||||||
|
current="$(wc -c <"$LOG_DIR/current.log")"; exec 4<"$LOG_DIR/current.log"
|
||||||
|
start=$((total - previous - current)); [ "$ack" -le "$start" ] || start="$ack"
|
||||||
|
available=$((total - start)); count="$available"; [ "$count" -le 65536 ] || count=65536
|
||||||
|
clear_ack="$(cat "$LOG_DIR/sync-clear-ack" 2>/dev/null)"
|
||||||
|
log_unlock
|
||||||
|
chunk="$LOG_DIR/export.$$"
|
||||||
|
trap 'rm -f "$chunk"; exec 3<&- 4<&-' EXIT
|
||||||
|
: >"$chunk"
|
||||||
|
if [ "$count" -gt 0 ]; then
|
||||||
|
{ head -c "$previous" <&3; head -c "$current" <&4; } | tail -c "$available" | head -c "$count" >"$chunk"
|
||||||
|
fi
|
||||||
|
count="$(wc -c <"$chunk")"
|
||||||
|
printf '{"journal_id":"%s","from":%s,"to":%s,"clear_ack":"%s","data":"' "$journal" "$start" "$((start + count))" "$clear_ack"
|
||||||
|
base64 <"$chunk" | tr -d '\r\n'
|
||||||
|
printf '"}\n'
|
||||||
|
rm -f "$chunk"; exec 3<&- 4<&-; trap - EXIT
|
||||||
|
}
|
||||||
|
log_ack() {
|
||||||
|
local journal offset clear_token
|
||||||
|
journal="$1"; offset="$2"; clear_token="${3:-}"
|
||||||
|
case "$journal$clear_token" in *[!a-zA-Z0-9._:-]*) return 1 ;; esac
|
||||||
|
case "$offset" in ''|*[!0-9]*) return 1 ;; esac
|
||||||
|
log_lock || return 1
|
||||||
|
log_maintain_locked
|
||||||
|
if [ -n "$clear_token" ] && [ "$(cat "$LOG_DIR/sync-clear-ack" 2>/dev/null)" != "$clear_token" ]; then
|
||||||
|
log_reset_locked
|
||||||
|
printf '%s\n' "$clear_token" >"$LOG_DIR/sync-clear-ack"
|
||||||
|
elif [ "$(cat "$LOG_DIR/journal-id" 2>/dev/null)" = "$journal" ]; then
|
||||||
|
printf '%s %s\n' "$journal" "$offset" >"$LOG_DIR/sync-ack"
|
||||||
|
fi
|
||||||
|
log_unlock
|
||||||
|
}
|
||||||
|
log_sync_loop() {
|
||||||
|
while :; do
|
||||||
|
/usr/sbin/owrt-remote logs-sync >/dev/null 2>&1
|
||||||
|
sleep 3
|
||||||
|
done
|
||||||
|
}
|
||||||
log_collect() {
|
log_collect() {
|
||||||
# These variables must remain visible to EXIT even after this function returns.
|
# These variables must remain visible to EXIT even after this function returns.
|
||||||
log_init || return 1
|
log_init || return 1
|
||||||
@@ -134,10 +271,16 @@ log_collect() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
case "${1:-}" in
|
case "${1:-}" in
|
||||||
|
check) log_init ;;
|
||||||
collect) log_collect ;;
|
collect) log_collect ;;
|
||||||
read) log_read "${2:-}" ;;
|
read) log_read "${2:-}" ;;
|
||||||
clear) log_clear ;;
|
clear) log_clear ;;
|
||||||
|
export) log_export ;;
|
||||||
|
ack) log_ack "$2" "$3" "${4:-}" ;;
|
||||||
|
sync) log_sync_loop ;;
|
||||||
append) log_append ;;
|
append) log_append ;;
|
||||||
event) { printf '%s owrt-remote: %s\n' "$(date '+%Y-%m-%d %H:%M:%S')" "$2"; cat; } | log_append ;;
|
event)
|
||||||
|
case "${3:-ok}" in bad|error) level=ERROR ;; warn) level=WARN ;; *) level=OK ;; esac
|
||||||
|
{ printf '%s owrt-remote: %s\n' "$(date '+%Y-%m-%d %H:%M:%S')" "$2"; cat; } | log_append "$level" ;;
|
||||||
*) printf 'Usage: logs.sh collect|read [live]|clear|append|event MESSAGE\n' >&2; exit 2 ;;
|
*) printf 'Usage: logs.sh collect|read [live]|clear|append|event MESSAGE\n' >&2; exit 2 ;;
|
||||||
esac
|
esac
|
||||||
@@ -7,7 +7,8 @@ SECTION="main"
|
|||||||
XRAY_RELEASE_BASE_URL="${XRAY_RELEASE_BASE_URL:-https://github.com/XTLS/Xray-core/releases/latest/download}"
|
XRAY_RELEASE_BASE_URL="${XRAY_RELEASE_BASE_URL:-https://github.com/XTLS/Xray-core/releases/latest/download}"
|
||||||
|
|
||||||
log() {
|
log() {
|
||||||
printf '%s\n' "$*" >&2
|
# procd already captures stderr. Use only logger for managed processes.
|
||||||
|
[ "${OWRT_REMOTE_SERVICE_LOG:-0}" = 1 ] || printf '%s\n' "$*" >&2
|
||||||
logger -t owrt-remote "$*" 2>/dev/null || true
|
logger -t owrt-remote "$*" 2>/dev/null || true
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -27,6 +28,7 @@ usage() {
|
|||||||
owrt-remote run
|
owrt-remote run
|
||||||
owrt-remote heartbeat
|
owrt-remote heartbeat
|
||||||
owrt-remote heartbeat-loop
|
owrt-remote heartbeat-loop
|
||||||
|
owrt-remote logs-sync
|
||||||
owrt-remote network-diagnostics
|
owrt-remote network-diagnostics
|
||||||
|
|
||||||
Настройки лежат в /etc/config/owrtremote.
|
Настройки лежат в /etc/config/owrtremote.
|
||||||
@@ -559,7 +561,9 @@ render_client_config() {
|
|||||||
cat >"$out" <<EOF
|
cat >"$out" <<EOF
|
||||||
{
|
{
|
||||||
"log": {
|
"log": {
|
||||||
"loglevel": "info"
|
"access": "none",
|
||||||
|
"error": "",
|
||||||
|
"loglevel": "warning"
|
||||||
},
|
},
|
||||||
"inbounds": [],
|
"inbounds": [],
|
||||||
"outbounds": [
|
"outbounds": [
|
||||||
@@ -758,6 +762,65 @@ post_json() {
|
|||||||
die "для heartbeat нужен uclient-fetch, wget или curl"
|
die "для heartbeat нужен uclient-fetch, wget или curl"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
global_logs_state() {
|
||||||
|
local enabled xray
|
||||||
|
enabled=false; xray=stopped
|
||||||
|
truthy "$(uci_get enabled 0)" && enabled=true
|
||||||
|
xray_running && xray=running
|
||||||
|
printf '{"enabled":%s,"xray":"%s"}' "$enabled" "$xray"
|
||||||
|
}
|
||||||
|
|
||||||
|
sync_global_logs() (
|
||||||
|
local helper router_id batch file response endpoint base token journal offset clear_token rc sync_lock owner attempt
|
||||||
|
helper="${OWRT_REMOTE_LOG_HELPER:-/usr/lib/owrt-remote/logs.sh}"
|
||||||
|
[ -r "$helper" ] || return 0
|
||||||
|
token="$(uci_get hub_token '')"; [ -n "$token" ] || return 0
|
||||||
|
# The journal is independent of Remote's enabled flag and Xray lifecycle.
|
||||||
|
sh "$helper" check || return 1
|
||||||
|
sync_lock="${OWRT_REMOTE_LOG_DIR:-/tmp/owrt-remote-logs}/sync-lock"
|
||||||
|
if ! mkdir "$sync_lock" 2>/dev/null; then
|
||||||
|
# Give a sender time to write its PID, then recover an abandoned lock.
|
||||||
|
for attempt in 1 2 3 4 5 6 7 8 9 10; do
|
||||||
|
owner="$(cat "$sync_lock/pid" 2>/dev/null)"
|
||||||
|
case "$owner" in ''|*[!0-9]*) sleep 0.1 ;; *) break ;; esac
|
||||||
|
done
|
||||||
|
owner="$(cat "$sync_lock/pid" 2>/dev/null)"
|
||||||
|
case "$owner" in ''|*[!0-9]*) ;; *) kill -0 "$owner" 2>/dev/null && return 0 ;; esac
|
||||||
|
rm -f "$sync_lock/pid"; rmdir "$sync_lock" 2>/dev/null || return 0
|
||||||
|
mkdir "$sync_lock" 2>/dev/null || return 0
|
||||||
|
fi
|
||||||
|
printf '%s\n' "$$" >"$sync_lock/pid"
|
||||||
|
file=''; response=''
|
||||||
|
trap 'rm -f "$file" "$response" "$sync_lock/pid"; rmdir "$sync_lock" 2>/dev/null || true' EXIT
|
||||||
|
trap 'exit 1' INT TERM
|
||||||
|
if truthy "$(uci_get wan_direct 0)" && [ ! -s "$WAN_STATE/active-interface" ]; then wan_prepare || return 1; fi
|
||||||
|
batch="$(sh "$helper" export)" || return 1
|
||||||
|
router_id="$(safe_id "$(uci_get router_id main)")"
|
||||||
|
# export verifies that this directory is on tmpfs; payloads also stay in RAM.
|
||||||
|
umask 077
|
||||||
|
file="${OWRT_REMOTE_LOG_DIR:-/tmp/owrt-remote-logs}/sync.$$"; response="$file.response"
|
||||||
|
printf '{"id":%s,"batch":%s,"state":%s}\n' "$(json_string "$router_id")" "$batch" "$(global_logs_state)" >"$file"
|
||||||
|
for endpoint in $(heartbeat_candidate_endpoints); do
|
||||||
|
base="$(heartbeat_base_from_endpoint "$endpoint")"
|
||||||
|
if post_json "$base/api/router-logs" "$token" "$file" >"$response" 2>/dev/null &&
|
||||||
|
grep -Eq '"ok"[[:space:]]*:[[:space:]]*true' "$response"; then
|
||||||
|
journal="$(jsonfilter -i "$response" -e '@.journal_id' 2>/dev/null)"
|
||||||
|
offset="$(jsonfilter -i "$response" -e '@.offset' 2>/dev/null)"
|
||||||
|
clear_token="$(jsonfilter -i "$response" -e '@.clear_request' 2>/dev/null)"
|
||||||
|
sh "$helper" ack "$journal" "$offset" "$clear_token"
|
||||||
|
rc=$?
|
||||||
|
rm -f "$file" "$response"
|
||||||
|
rm -f "$sync_lock/pid"; rmdir "$sync_lock" 2>/dev/null || true
|
||||||
|
trap - EXIT INT TERM
|
||||||
|
return "$rc"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
rm -f "$file" "$response"
|
||||||
|
rm -f "$sync_lock/pid"; rmdir "$sync_lock" 2>/dev/null || true
|
||||||
|
trap - EXIT INT TERM
|
||||||
|
return 1
|
||||||
|
)
|
||||||
|
|
||||||
heartbeat_base_from_endpoint() {
|
heartbeat_base_from_endpoint() {
|
||||||
printf '%s' "${1%/api/heartbeat}"
|
printf '%s' "${1%/api/heartbeat}"
|
||||||
}
|
}
|
||||||
@@ -1284,6 +1347,9 @@ case "$cmd" in
|
|||||||
heartbeat-loop)
|
heartbeat-loop)
|
||||||
heartbeat_loop
|
heartbeat_loop
|
||||||
;;
|
;;
|
||||||
|
logs-sync)
|
||||||
|
sync_global_logs
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
usage >&2
|
usage >&2
|
||||||
exit 2
|
exit 2
|
||||||
|
|||||||
@@ -133,7 +133,7 @@ set_result() {
|
|||||||
RESULT_BODY="$2"
|
RESULT_BODY="$2"
|
||||||
RESULT_KIND="${3:-info}"
|
RESULT_KIND="${3:-info}"
|
||||||
if [ -r "$LOG_HELPER" ]; then
|
if [ -r "$LOG_HELPER" ]; then
|
||||||
printf '%s\n' "$RESULT_BODY" | sh "$LOG_HELPER" event "Панель: $RESULT_TITLE; результат=$RESULT_KIND" >/dev/null 2>&1 || true
|
printf '%s\n' "$RESULT_BODY" | sh "$LOG_HELPER" event "Панель: $RESULT_TITLE; результат=$RESULT_KIND" "$RESULT_KIND" >/dev/null 2>&1 || true
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -145,6 +145,11 @@ logs_response() {
|
|||||||
printf 'Сборщик логов не установлен. Установи локальный фикс целиком.\n'
|
printf 'Сборщик логов не установлен. Установи локальный фикс целиком.\n'
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
if ! sh "$LOG_HELPER" check >/dev/null 2>&1; then
|
||||||
|
printf 'Status: 503 Service Unavailable\r\nContent-Type: text/plain; charset=utf-8\r\nCache-Control: no-store\r\n\r\n'
|
||||||
|
printf 'Журнал недоступен: для логов требуется ОЗУ (tmpfs). Запись на Flash запрещена.\n'
|
||||||
|
return
|
||||||
|
fi
|
||||||
if [ "$mode" = clear ]; then
|
if [ "$mode" = clear ]; then
|
||||||
if [ "${REQUEST_METHOD:-GET}" != POST ]; then
|
if [ "${REQUEST_METHOD:-GET}" != POST ]; then
|
||||||
printf 'Status: 405 Method Not Allowed\r\nAllow: POST\r\nContent-Type: text/plain; charset=utf-8\r\n\r\n'
|
printf 'Status: 405 Method Not Allowed\r\nAllow: POST\r\nContent-Type: text/plain; charset=utf-8\r\n\r\n'
|
||||||
@@ -359,6 +364,10 @@ run_action() {
|
|||||||
if [ "$rc" != "0" ]; then
|
if [ "$rc" != "0" ]; then
|
||||||
set_result "$RESULT_TITLE" "$(cat "$output")" "bad"
|
set_result "$RESULT_TITLE" "$(cat "$output")" "bad"
|
||||||
fi
|
fi
|
||||||
|
# Deliver the completed stop result without keeping a mobile HTTP request open.
|
||||||
|
if [ "$action" = stop ]; then
|
||||||
|
( "$AGENT" logs-sync ) </dev/null >/dev/null 2>&1 &
|
||||||
|
fi
|
||||||
rm -f "$output"
|
rm -f "$output"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -474,7 +483,7 @@ render_page() {
|
|||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<meta name="owrt-remote-ui-version" content="$OWRT_REMOTE_UI_VERSION">
|
<meta name="owrt-remote-ui-version" content="$OWRT_REMOTE_UI_VERSION">
|
||||||
<title>OpenWrt Remote Hub v115</title>
|
<title>OpenWrt Remote Hub v116</title>
|
||||||
<style>
|
<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)}
|
: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}
|
*{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}
|
||||||
@@ -497,6 +506,7 @@ form{margin:0}.formgrid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr
|
|||||||
.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}
|
.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}
|
||||||
.globalLogsPanel[hidden]{display:none}.globalLogsPanel{margin-top:16px}.globalLogsPanel .actions{justify-content:flex-start;margin:0 0 12px}.globalLogsText{margin:12px 0 0;max-height:55vh;overflow:auto;white-space:pre-wrap;overflow-wrap:anywhere;word-break:break-word;font:12px/1.5 ui-monospace,SFMono-Regular,Consolas,monospace;background:rgba(8,5,18,.72);border:1px solid var(--line);border-radius:8px;padding:12px;min-height:150px}.globalLogsStatus{color:var(--muted);overflow-wrap:anywhere}.globalLogsToggle{cursor:pointer;font-family:inherit;border-color:rgba(34,197,94,.65);background:var(--green);color:#07120a;box-shadow:0 10px 22px rgba(34,197,94,.22)}
|
.globalLogsPanel[hidden]{display:none}.globalLogsPanel{margin-top:16px}.globalLogsPanel .actions{justify-content:flex-start;margin:0 0 12px}.globalLogsText{margin:12px 0 0;max-height:55vh;overflow:auto;white-space:pre-wrap;overflow-wrap:anywhere;word-break:break-word;font:12px/1.5 ui-monospace,SFMono-Regular,Consolas,monospace;background:rgba(8,5,18,.72);border:1px solid var(--line);border-radius:8px;padding:12px;min-height:150px}.globalLogsStatus{color:var(--muted);overflow-wrap:anywhere}.globalLogsToggle{cursor:pointer;font-family:inherit;border-color:rgba(34,197,94,.65);background:var(--green);color:#07120a;box-shadow:0 10px 22px rgba(34,197,94,.22)}
|
||||||
.globalLogsNote{margin:0 0 12px;padding:10px 12px;border:1px solid rgba(245,158,11,.35);border-left:3px solid var(--amber);border-radius:8px;background:rgba(245,158,11,.10);color:#fde68a;font-size:12px;line-height:1.5;overflow-wrap:anywhere}
|
.globalLogsNote{margin:0 0 12px;padding:10px 12px;border:1px solid rgba(245,158,11,.35);border-left:3px solid var(--amber);border-radius:8px;background:rgba(245,158,11,.10);color:#fde68a;font-size:12px;line-height:1.5;overflow-wrap:anywhere}
|
||||||
|
.globalLogsLegend{display:flex;gap:8px 14px;flex-wrap:wrap;margin:0 0 12px;font-size:12px;font-weight:700}.globalLogLine{display:block}.globalLogOk{color:#86efac}.globalLogWarn{color:#fde68a}.globalLogError{color:#f87171}
|
||||||
@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){.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%}}
|
@media(max-width:820px){.brandPanel{grid-template-columns:repeat(2,minmax(0,1fr));width:100%}.brandPanel .appBanner{width:100%}}
|
||||||
@media(max-width:820px){.hero{gap:10px}.hero .brand{width:100%;min-width:0}.hero .uiPill,.hero .appBanner{width:100%;min-width:0;min-height:44px}.hero .appBanner{line-height:1.2}.topActions{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));width:100%;gap:8px}.vpnCard,.returnCard{width:100%;min-width:0}.returnCard{grid-column:1/-1}.backBtn{white-space:normal;text-align:center}}
|
@media(max-width:820px){.hero{gap:10px}.hero .brand{width:100%;min-width:0}.hero .uiPill,.hero .appBanner{width:100%;min-width:0;min-height:44px}.hero .appBanner{line-height:1.2}.topActions{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));width:100%;gap:8px}.vpnCard,.returnCard{width:100%;min-width:0}.returnCard{grid-column:1/-1}.backBtn{white-space:normal;text-align:center}}
|
||||||
@@ -508,7 +518,7 @@ form{margin:0}.formgrid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr
|
|||||||
<div class="brand">
|
<div class="brand">
|
||||||
<div class="brandPanel">
|
<div class="brandPanel">
|
||||||
<div class="titleRow">
|
<div class="titleRow">
|
||||||
<h1 class="appBanner"><span>OpenWrt Remote Hub <span class="appBannerVersion">v115</span></span></h1>
|
<h1 class="appBanner"><span>OpenWrt Remote Hub <span class="appBannerVersion">v116</span></span></h1>
|
||||||
</div>
|
</div>
|
||||||
<div class="links">
|
<div class="links">
|
||||||
<a class="uiPill" href="https://t.me/kzolotarev95" target="_blank" rel="noopener noreferrer">Telegram</a>
|
<a class="uiPill" href="https://t.me/kzolotarev95" target="_blank" rel="noopener noreferrer">Telegram</a>
|
||||||
@@ -532,7 +542,8 @@ form{margin:0}.formgrid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr
|
|||||||
|
|
||||||
<section class="panel globalLogsPanel" id="globalLogsPanel" hidden>
|
<section class="panel globalLogsPanel" id="globalLogsPanel" hidden>
|
||||||
<div class="panelHead"><h2>Глобал логи</h2><button class="btn" id="globalLogsClose" type="button">Закрыть</button></div>
|
<div class="panelHead"><h2>Глобал логи</h2><button class="btn" id="globalLogsClose" type="button">Закрыть</button></div>
|
||||||
<blockquote class="globalLogsNote">Действия панели, Heartbeat, WAN и ошибки Xray этого роутера. Журнал хранится в оперативной памяти, очищается после перезагрузки и каждые 24 часа. Максимум около 2 МБ. Ключи и пароли скрываются.</blockquote>
|
<blockquote class="globalLogsNote">Действия панели, изменения связи с Hub и WAN, предупреждения и ошибки Xray. Одинаковые события не дублируются. Журнал хранится только в ОЗУ, очищается после перезагрузки и каждые 24 часа. Максимум около 2 МБ. Ключи и пароли скрываются.</blockquote>
|
||||||
|
<div class="globalLogsLegend" aria-label="Цвета журнала"><span class="globalLogOk">● Успешно</span><span class="globalLogWarn">● Предупреждение</span><span class="globalLogError">● Ошибка</span></div>
|
||||||
<div class="actions">
|
<div class="actions">
|
||||||
<a class="btn" href="?key=$(h "$key")&action=logs_download">Скачать логи</a>
|
<a class="btn" href="?key=$(h "$key")&action=logs_download">Скачать логи</a>
|
||||||
<button class="btn" id="globalLogsLive" type="button">Запустить в реальном времени</button>
|
<button class="btn" id="globalLogsLive" type="button">Запустить в реальном времени</button>
|
||||||
@@ -656,6 +667,34 @@ EOF
|
|||||||
var output = document.getElementById('globalLogsText');
|
var output = document.getElementById('globalLogsText');
|
||||||
var status = document.getElementById('globalLogsStatus');
|
var status = document.getElementById('globalLogsStatus');
|
||||||
var timer = null, controller = null, generation = 0, running = false;
|
var timer = null, controller = null, generation = 0, running = false;
|
||||||
|
var renderedText = null;
|
||||||
|
function lineTone(line) {
|
||||||
|
if (/^\[ERROR\]/.test(line)) return 'globalLogError';
|
||||||
|
if (/^\[WARN\]/.test(line)) return 'globalLogWarn';
|
||||||
|
if (/^\[OK\]/.test(line)) return 'globalLogOk';
|
||||||
|
var message = line.replace(/^.*?owrt-remote(?:\[\d+\])?:\s*/, '');
|
||||||
|
if (/core: Xray .* started/i.test(message)) return 'globalLogOk';
|
||||||
|
if (/\[error\]|ошибка|не удалось|результат=bad|failed|cannot |could not |error:|syntax error|permission denied|network is unreachable|connection (refused|reset)|timed out|not permitted|no selected wan|wan has no|wan direct requires|already used by another rule|does not belong to remote|не применилось|dns failed|crash loop/i.test(message)) return 'globalLogError';
|
||||||
|
if (/\[warn(?:ing)?\]|предупреждение|результат=warn|retry|not ready|missing|не найден|postponed|dns unavailable|fallback|reconnecting|restarting|failover/i.test(message)) return 'globalLogWarn';
|
||||||
|
return 'globalLogOk';
|
||||||
|
}
|
||||||
|
function renderLogs(text, empty) {
|
||||||
|
if (renderedText === text && output.querySelector('.globalLogLine')) return;
|
||||||
|
var atBottom = output.scrollHeight - output.clientHeight - output.scrollTop < 24;
|
||||||
|
var previousTop = output.scrollTop;
|
||||||
|
var fragment = document.createDocumentFragment();
|
||||||
|
var lines = text ? text.replace(/\r\n/g, '\n').replace(/\n$/, '').split('\n') : [empty];
|
||||||
|
lines.forEach(function(line) {
|
||||||
|
var row = document.createElement('span');
|
||||||
|
row.className = 'globalLogLine ' + lineTone(line);
|
||||||
|
row.textContent = line || ' ';
|
||||||
|
fragment.appendChild(row);
|
||||||
|
});
|
||||||
|
output.textContent = '';
|
||||||
|
output.appendChild(fragment);
|
||||||
|
renderedText = text;
|
||||||
|
output.scrollTop = atBottom ? output.scrollHeight : previousTop;
|
||||||
|
}
|
||||||
function endpoint(action) {
|
function endpoint(action) {
|
||||||
var url = new URL(window.location.href);
|
var url = new URL(window.location.href);
|
||||||
url.searchParams.set('action', action);
|
url.searchParams.set('action', action);
|
||||||
@@ -684,12 +723,7 @@ EOF
|
|||||||
var text = await response.text();
|
var text = await response.text();
|
||||||
if (current !== generation || (!running && !once)) return;
|
if (current !== generation || (!running && !once)) return;
|
||||||
if ((response.headers.get('Content-Type') || '').indexOf('text/plain') !== 0) throw new Error('Доступ к журналу завершён. Открой панель заново.');
|
if ((response.headers.get('Content-Type') || '').indexOf('text/plain') !== 0) throw new Error('Доступ к журналу завершён. Открой панель заново.');
|
||||||
var atBottom = output.scrollHeight - output.clientHeight - output.scrollTop < 24;
|
renderLogs(text, once ? 'Журнал пока пуст. Новые записи появятся после действий в панели или событий Remote. Нажми «Запустить в реальном времени», чтобы увидеть их.' : 'Журнал пуст. Новые события появятся автоматически.');
|
||||||
var previousTop = output.scrollTop;
|
|
||||||
if (output.textContent !== text) {
|
|
||||||
output.textContent = text || (once ? 'Журнал пока пуст. Новые записи появятся после действий в панели или событий Remote. Нажми «Запустить в реальном времени», чтобы увидеть их.' : 'Журнал пуст. Новые события появятся автоматически.');
|
|
||||||
output.scrollTop = atBottom ? output.scrollHeight : previousTop;
|
|
||||||
}
|
|
||||||
status.textContent = (once ? 'Сохранённые записи' : 'Просмотр в реальном времени') + ' · обновлено ' + new Date().toLocaleTimeString() + ' · последние 64 КБ журнала' + (once ? '. Для автообновления нажми «Запустить в реальном времени».' : '');
|
status.textContent = (once ? 'Сохранённые записи' : 'Просмотр в реальном времени') + ' · обновлено ' + new Date().toLocaleTimeString() + ' · последние 64 КБ журнала' + (once ? '. Для автообновления нажми «Запустить в реальном времени».' : '');
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (current === generation && (running || once)) {
|
if (current === generation && (running || once)) {
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ return view.extend({
|
|||||||
|
|
||||||
if (!key) {
|
if (!key) {
|
||||||
return E('div', { 'class': 'cbi-map' }, [
|
return E('div', { 'class': 'cbi-map' }, [
|
||||||
E('h2', {}, _('OpenWrt Remote Hub v115')),
|
E('h2', {}, _('OpenWrt Remote Hub v116')),
|
||||||
E('div', { 'class': 'alert-message warning' }, [
|
E('div', { 'class': 'alert-message warning' }, [
|
||||||
_('Web key not found. Reinstall the module or create /etc/owrt-remote/web.key.')
|
_('Web key not found. Reinstall the module or create /etc/owrt-remote/web.key.')
|
||||||
])
|
])
|
||||||
@@ -34,7 +34,7 @@ return view.extend({
|
|||||||
}, 100);
|
}, 100);
|
||||||
|
|
||||||
return E('div', { 'class': 'cbi-map' }, [
|
return E('div', { 'class': 'cbi-map' }, [
|
||||||
E('h2', {}, _('OpenWrt Remote Hub v115')),
|
E('h2', {}, _('OpenWrt Remote Hub v116')),
|
||||||
E('p', {}, _('Opening remote access panel...')),
|
E('p', {}, _('Opening remote access panel...')),
|
||||||
E('p', {}, [
|
E('p', {}, [
|
||||||
E('a', { 'class': 'btn cbi-button cbi-button-apply', 'href': url }, _('Open panel'))
|
E('a', { 'class': 'btn cbi-button cbi-button-apply', 'href': url }, _('Open panel'))
|
||||||
|
|||||||
+12
-12
@@ -1,4 +1,4 @@
|
|||||||
# Фиксация VPS host и независимое соединение Remote через WAN (v115)
|
# Фиксация VPS host и независимое соединение Remote через WAN (v116)
|
||||||
|
|
||||||
`vps_host_mode=manual` сохраняет заданный на роутере адрес. Это значение
|
`vps_host_mode=manual` сохраняет заданный на роутере адрес. Это значение
|
||||||
используется и когда опция отсутствует у старой установки. Только явно
|
используется и когда опция отсутствует у старой установки. Только явно
|
||||||
@@ -42,8 +42,8 @@ powershell.exe -NoProfile -ExecutionPolicy Bypass -File "vps\deploy-hub-url-fix.
|
|||||||
```
|
```
|
||||||
|
|
||||||
Откат: те же команды с `-Action Rollback`, без `-HubUrl`. Резервные копии:
|
Откат: те же команды с `-Action Rollback`, без `-HubUrl`. Резервные копии:
|
||||||
`/root/owrt-remote-backup-before-hub-url-v115` на роутере и
|
`/root/owrt-remote-backup-before-hub-url-v116` на роутере и
|
||||||
`/opt/owrt-remote/owrt-remote-hub.py.bak-before-hub-url-v115` на VPS.
|
`/opt/owrt-remote/owrt-remote-hub.py.bak-before-hub-url-v116` на VPS.
|
||||||
`HEARTBEAT_OK` подтверждает ответ Hub. Если файлы установлены, но Hub недоступен,
|
`HEARTBEAT_OK` подтверждает ответ Hub. Если файлы установлены, но Hub недоступен,
|
||||||
скрипт отдельно сообщает `HEARTBEAT_FAILED`; это не подтверждение связи.
|
скрипт отдельно сообщает `HEARTBEAT_FAILED`; это не подтверждение связи.
|
||||||
|
|
||||||
@@ -125,21 +125,21 @@ powershell.exe -NoProfile -ExecutionPolicy Bypass -File "vps\deploy-host-policy.
|
|||||||
|
|
||||||
Установка загружает локальные файлы, без Git. До остановки службы проверяются
|
Установка загружает локальные файлы, без Git. До остановки службы проверяются
|
||||||
доступность WAN и поддержка таблицы реальной командой ip на роутере.
|
доступность WAN и поддержка таблицы реальной командой ip на роутере.
|
||||||
На роутер загружается и файл LuCI: версия v115 появляется и в основной
|
На роутер загружается и файл LuCI: версия v116 появляется и в основной
|
||||||
CGI-панели, и в странице входа в неё через LuCI.
|
CGI-панели, и в странице входа в неё через LuCI.
|
||||||
Сначала сохраняются файлы
|
Сначала сохраняются файлы
|
||||||
и конфигурация; после замены проверяется heartbeat/health. При ошибке
|
и конфигурация; после замены проверяется heartbeat/health. При ошибке
|
||||||
автоматически восстанавливается состояние перед текущей попыткой.
|
автоматически восстанавливается состояние перед текущей попыткой.
|
||||||
Сохранённая резервная копия для ручного отката не перезаписывается.
|
Сохранённая резервная копия для ручного отката не перезаписывается.
|
||||||
|
|
||||||
* Роутер: `/root/owrt-remote-backup-before-host-policy-v115` — агент,
|
* Роутер: `/root/owrt-remote-backup-before-host-policy-v116` — агент,
|
||||||
helper, init, CGI, UCI-конфигурация и Xray-конфиг (в закрытом каталоге).
|
helper, init, CGI, UCI-конфигурация и Xray-конфиг (в закрытом каталоге).
|
||||||
* VPS: `/opt/owrt-remote/owrt-remote-hub.py.bak-before-host-policy-v115`.
|
* VPS: `/opt/owrt-remote/owrt-remote-hub.py.bak-before-host-policy-v116`.
|
||||||
База роутеров и настройки авторизации не заменяются.
|
База роутеров и настройки авторизации не заменяются.
|
||||||
|
|
||||||
Успешная установка заканчивается `HOST_POLICY_ROUTER_V115_OK` на роутере
|
Успешная установка заканчивается `HOST_POLICY_ROUTER_V116_OK` на роутере
|
||||||
и `HOST_POLICY_VPS_V115_Install_OK` на VPS. Старые резервные копии предыдущей
|
и `HOST_POLICY_VPS_V116_Install_OK` на VPS. Старые резервные копии предыдущей
|
||||||
версии сохраняются; новые команды отката используют отдельные копии для v115.
|
версии сохраняются; новые команды отката используют отдельные копии для v116.
|
||||||
|
|
||||||
### Переход с nftables-маркировки на адресную маршрутизацию
|
### Переход с nftables-маркировки на адресную маршрутизацию
|
||||||
|
|
||||||
@@ -148,11 +148,11 @@ CGI-панели, и в странице входа в неё через LuCI.
|
|||||||
Обновление VPS для этого изменения не требуется.
|
Обновление VPS для этого изменения не требуется.
|
||||||
|
|
||||||
```powershell
|
```powershell
|
||||||
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "vps\deploy-host-policy.ps1" -Target Router -Machine "root@192.168.2.1" -PreserveConnectionSettings -BackupName "podkop-compat-v115" -Action Install
|
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "vps\deploy-host-policy.ps1" -Target Router -Machine "root@192.168.2.1" -PreserveConnectionSettings -BackupName "podkop-compat-v116" -Action Install
|
||||||
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "vps\deploy-host-policy.ps1" -Target Router -Machine "root@192.168.2.1" -BackupName "podkop-compat-v115" -Action Rollback
|
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "vps\deploy-host-policy.ps1" -Target Router -Machine "root@192.168.2.1" -BackupName "podkop-compat-v116" -Action Rollback
|
||||||
```
|
```
|
||||||
|
|
||||||
Копия: `/root/owrt-remote-backup-before-podkop-compat-v115`.
|
Копия: `/root/owrt-remote-backup-before-podkop-compat-v116`.
|
||||||
После установки повторите диагностику Podkop. Предупреждение от прежних правил
|
После установки повторите диагностику Podkop. Предупреждение от прежних правил
|
||||||
Remote должно исчезнуть. Настоящие дополнительные правила других приложений
|
Remote должно исчезнуть. Настоящие дополнительные правила других приложений
|
||||||
по-прежнему обнаруживаются штатной диагностикой.
|
по-прежнему обнаруживаются штатной диагностикой.
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# reCAPTCHA v3 в OpenWrt Remote Hub v115
|
# reCAPTCHA v3 в OpenWrt Remote Hub v116
|
||||||
|
|
||||||
В меню владельца, в блоке «Капча на экране входа», доступны цифры,
|
В меню владельца, в блоке «Капча на экране входа», доступны цифры,
|
||||||
Google reCAPTCHA v2 Checkbox и Google reCAPTCHA v3. Установка обновления
|
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-v115`
|
* `/opt/owrt-remote/owrt-remote-hub.py.bak-before-recaptcha-v3-v116`
|
||||||
* `/opt/owrt-remote/captcha-before-recaptcha-v3-v115.json` (режим 0600).
|
* `/opt/owrt-remote/captcha-before-recaptcha-v3-v116.json` (режим 0600).
|
||||||
|
|
||||||
Скрипт рассчитан на стандартные пути установленного Hub:
|
Скрипт рассчитан на стандартные пути установленного Hub:
|
||||||
`/opt/owrt-remote/owrt-remote-hub.py`, `/var/lib/owrt-remote/hub-auth.json`
|
`/opt/owrt-remote/owrt-remote-hub.py`, `/var/lib/owrt-remote/hub-auth.json`
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# Аудит ресурсов OpenWrt Remote Hub v115
|
# Аудит ресурсов OpenWrt Remote Hub v116
|
||||||
|
|
||||||
Исправления внесены поверх `7f809fd`. Версия панели остаётся v115.
|
Исправления внесены поверх `7f809fd`. Версия панели остаётся v116.
|
||||||
|
|
||||||
## SQLite
|
## SQLite
|
||||||
|
|
||||||
@@ -115,7 +115,7 @@ powershell.exe -NoProfile -ExecutionPolicy Bypass -File "vps\deploy-resource-fix
|
|||||||
|
|
||||||
Установщик загружает локальный файл без Git, запускает изолированные тесты,
|
Установщик загружает локальный файл без Git, запускает изолированные тесты,
|
||||||
сохраняет исходный серверный файл:
|
сохраняет исходный серверный файл:
|
||||||
`/opt/owrt-remote/owrt-remote-hub.py.bak-before-resource-fix-v115`,
|
`/opt/owrt-remote/owrt-remote-hub.py.bak-before-resource-fix-v116`,
|
||||||
атомарно заменяет Python файл, перезапускает `owrt-remote` и проверяет health.
|
атомарно заменяет Python файл, перезапускает `owrt-remote` и проверяет health.
|
||||||
Существующая резервная копия не перезаписывается. При ошибке установки
|
Существующая резервная копия не перезаписывается. При ошибке установки
|
||||||
восстанавливается файл, работавший непосредственно перед текущей попыткой.
|
восстанавливается файл, работавший непосредственно перед текущей попыткой.
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# Виджеты ресурсов VPS (v115)
|
# Виджеты ресурсов VPS (v116)
|
||||||
|
|
||||||
Три карточки ЦП, ОЗУ и ДИСК находятся над кнопками «Рестарт Xray VPS»,
|
Три карточки ЦП, ОЗУ и ДИСК находятся над кнопками «Рестарт 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
|
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_V115_Install_OK` обновите страницу через Ctrl+F5.
|
После `VPS_WIDGETS_V116_Install_OK` обновите страницу через Ctrl+F5.
|
||||||
Скрипт загружает локальный файл, проверяет его до замены, перезапускает
|
Скрипт загружает локальный файл, проверяет его до замены, перезапускает
|
||||||
службу и проверяет health. При ошибке после замены восстанавливает файл
|
службу и проверяет 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-v115`.
|
`/opt/owrt-remote/owrt-remote-hub.py.bak-before-vps-widgets-v116`.
|
||||||
Успешное завершение: `VPS_WIDGETS_V115_Rollback_OK`.
|
Успешное завершение: `VPS_WIDGETS_V116_Rollback_OK`.
|
||||||
|
|
||||||
## Локальные проверки
|
## Локальные проверки
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# Несколько WAN интерфейсов и резервирование (v115)
|
# Несколько WAN интерфейсов и резервирование (v116)
|
||||||
|
|
||||||
Кнопка **Выбрать интерфейсы** раскрывает список с галочками. Можно отметить
|
Кнопка **Выбрать интерфейсы** раскрывает список с галочками. Можно отметить
|
||||||
один, два, три и больше интерфейсов. Список содержит имена
|
один, два, три и больше интерфейсов. Список содержит имена
|
||||||
@@ -46,7 +46,7 @@ powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\
|
|||||||
|
|
||||||
Скрипт устанавливает CGI, LuCI, агент, WAN helper и hotplug вместе. До замены
|
Скрипт устанавливает CGI, LuCI, агент, WAN helper и hotplug вместе. До замены
|
||||||
сохраняются прежние файлы, UCI-настройки и Xray config в
|
сохраняются прежние файлы, UCI-настройки и Xray config в
|
||||||
`/root/owrt-remote-backup-before-wan-multi-v115`.
|
`/root/owrt-remote-backup-before-wan-multi-v116`.
|
||||||
Успех подтверждает `WAN_MULTI_ROUTER_Install_OK`. После установки обновить
|
Успех подтверждает `WAN_MULTI_ROUTER_Install_OK`. После установки обновить
|
||||||
панель роутера через Ctrl+F5, отметить интерфейсы и сохранить выбор.
|
панель роутера через Ctrl+F5, отметить интерфейсы и сохранить выбор.
|
||||||
VPS обновлять не требуется. Старый `deploy-wan-interface-picker.ps1`
|
VPS обновлять не требуется. Старый `deploy-wan-interface-picker.ps1`
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# Исправление запуска прямого WAN в v115
|
# Исправление запуска прямого WAN в v116
|
||||||
|
|
||||||
На проблемном роутере обычный `wan` был поднят, имел IPv4-адрес,
|
На проблемном роутере обычный `wan` был поднят, имел IPv4-адрес,
|
||||||
маршрут и рабочий DNS. Проверка `ip -4 route show table 210` возвращала
|
маршрут и рабочий DNS. Проверка `ip -4 route show table 210` возвращала
|
||||||
@@ -16,7 +16,7 @@ instance после шести падений. Из-за остановленн
|
|||||||
конфигурации останавливают агент до запуска Xray.
|
конфигурации останавливают агент до запуска Xray.
|
||||||
|
|
||||||
Изменены только `files/usr/lib/owrt-remote/wan.sh` и
|
Изменены только `files/usr/lib/owrt-remote/wan.sh` и
|
||||||
`files/usr/sbin/owrt-remote`. Версия остаётся v115. Настройки Podkop,
|
`files/usr/sbin/owrt-remote`. Версия остаётся v116. Настройки Podkop,
|
||||||
LAN и источники установки GitHub/GitLab не меняются. Обновление VPS
|
LAN и источники установки GitHub/GitLab не меняются. Обновление VPS
|
||||||
для этого исправления не требуется.
|
для этого исправления не требуется.
|
||||||
|
|
||||||
@@ -28,7 +28,7 @@ powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\
|
|||||||
|
|
||||||
Скрипт перед заменой проверяет синтаксис и подготовку WAN новым helper,
|
Скрипт перед заменой проверяет синтаксис и подготовку WAN новым helper,
|
||||||
сохраняет агент, helper, UCI и Xray-конфигурацию в
|
сохраняет агент, helper, UCI и Xray-конфигурацию в
|
||||||
`/root/owrt-remote-backup-before-wan-stability-v115`. Сохранённая копия
|
`/root/owrt-remote-backup-before-wan-stability-v116`. Сохранённая копия
|
||||||
не перезаписывается при повторной установке. После замены выполняются
|
не перезаписывается при повторной установке. После замены выполняются
|
||||||
перезапуск, проверка процесса Xray и настоящий heartbeat до Hub.
|
перезапуск, проверка процесса Xray и настоящий heartbeat до Hub.
|
||||||
При ошибке восстанавливается состояние до текущей попытки.
|
При ошибке восстанавливается состояние до текущей попытки.
|
||||||
|
|||||||
+4
-4
@@ -1,4 +1,4 @@
|
|||||||
# Применение OpenWrt config через панель роутера (v115)
|
# Применение OpenWrt config через панель роутера (v116)
|
||||||
|
|
||||||
При отправке textarea браузер кодирует переносы строк как CRLF. CGI
|
При отправке textarea браузер кодирует переносы строк как CRLF. CGI
|
||||||
декодировал их без нормализации и записывал CR в исполняемый shell-скрипт.
|
декодировал их без нормализации и записывал CR в исполняемый shell-скрипт.
|
||||||
@@ -22,7 +22,7 @@ CRLF и LF, heredoc, пустые строки, кодированные сим
|
|||||||
|
|
||||||
Скрипт обновляет только CGI на роутере. VPS обновлять для этого фикса
|
Скрипт обновляет только CGI на роутере. VPS обновлять для этого фикса
|
||||||
не требуется. До замены сохраняется первая резервная копия CGI:
|
не требуется. До замены сохраняется первая резервная копия CGI:
|
||||||
`/root/owrt-remote-backup-before-xray-apply-v115/owrt-remote`.
|
`/root/owrt-remote-backup-before-xray-apply-v116/owrt-remote`.
|
||||||
|
|
||||||
Из PowerShell Windows 11; замените IP, если адрес роутера отличается:
|
Из PowerShell Windows 11; замените IP, если адрес роутера отличается:
|
||||||
|
|
||||||
@@ -53,7 +53,7 @@ python tests/test_xray_apply.py -v
|
|||||||
|
|
||||||
Переносы строк в формах описаны в [стандарте HTML](https://html.spec.whatwg.org/multipage/form-control-infrastructure.html).
|
Переносы строк в формах описаны в [стандарте HTML](https://html.spec.whatwg.org/multipage/form-control-infrastructure.html).
|
||||||
|
|
||||||
## Мобильная вставка команд (локальный фикс v115)
|
## Мобильная вставка команд (локальный фикс v116)
|
||||||
|
|
||||||
Воспроизведён отдельный случай `rc=255`: в строке
|
Воспроизведён отдельный случай `rc=255`: в строке
|
||||||
`uci set owrtremote.main.router_name=‘Дом у моря’` типографские кавычки
|
`uci set owrtremote.main.router_name=‘Дом у моря’` типографские кавычки
|
||||||
@@ -77,7 +77,7 @@ python tests/test_xray_apply.py -v
|
|||||||
|
|
||||||
Обновляется только `/www/cgi-bin/owrt-remote` на роутере, без перезапуска
|
Обновляется только `/www/cgi-bin/owrt-remote` на роутере, без перезапуска
|
||||||
служб и изменений настроек при установке. Резервная копия отдельная:
|
служб и изменений настроек при установке. Резервная копия отдельная:
|
||||||
`/root/owrt-remote-backup-before-xray-mobile-v115/owrt-remote`.
|
`/root/owrt-remote-backup-before-xray-mobile-v116/owrt-remote`.
|
||||||
|
|
||||||
Установка из PowerShell Windows 11:
|
Установка из PowerShell Windows 11:
|
||||||
|
|
||||||
|
|||||||
+151
-7
@@ -1,5 +1,7 @@
|
|||||||
"""Exercise the real RAM journal and authorized router CGI with temporary files."""
|
"""Exercise the real RAM journal and authorized router CGI with temporary files."""
|
||||||
import concurrent.futures
|
import concurrent.futures
|
||||||
|
import base64
|
||||||
|
import json
|
||||||
import os
|
import os
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
import shutil
|
import shutil
|
||||||
@@ -24,6 +26,8 @@ class GlobalLogTests(unittest.TestCase):
|
|||||||
source = (ROOT / 'files/usr/lib/owrt-remote/logs.sh').read_text(encoding='utf-8')
|
source = (ROOT / 'files/usr/lib/owrt-remote/logs.sh').read_text(encoding='utf-8')
|
||||||
source = source.replace('log_clock() { cut -d. -f1 /proc/uptime; }',
|
source = source.replace('log_clock() { cut -d. -f1 /proc/uptime; }',
|
||||||
'log_clock() { echo "${TEST_UPTIME:-1000}"; }')
|
'log_clock() { echo "${TEST_UPTIME:-1000}"; }')
|
||||||
|
self.helper_source = source
|
||||||
|
source = source.replace('log_ram_storage() {', 'log_ram_storage() { return 0;', 1)
|
||||||
self.helper.write_text(source, encoding='utf-8', newline='\n')
|
self.helper.write_text(source, encoding='utf-8', newline='\n')
|
||||||
self.cgi = self.root / 'cgi'
|
self.cgi = self.root / 'cgi'
|
||||||
self.cgi.write_text((ROOT / 'files/www/cgi-bin/owrt-remote').read_text(encoding='utf-8'),
|
self.cgi.write_text((ROOT / 'files/www/cgi-bin/owrt-remote').read_text(encoding='utf-8'),
|
||||||
@@ -56,12 +60,113 @@ class GlobalLogTests(unittest.TestCase):
|
|||||||
self.assertIn('Content-Disposition: attachment; filename="owrt-remote-global-', downloaded)
|
self.assertIn('Content-Disposition: attachment; filename="owrt-remote-global-', downloaded)
|
||||||
self.assertIn('Xray connected', downloaded)
|
self.assertIn('Xray connected', downloaded)
|
||||||
self.assertIn('Cache-Control: no-store', downloaded)
|
self.assertIn('Cache-Control: no-store', downloaded)
|
||||||
for _ in range(70):
|
# The bounded read is independent of append filtering; supply an existing large journal.
|
||||||
self.helper_call('append', 'y' * 1024 + '\n')
|
with (self.log_dir / 'current.log').open('a', encoding='utf-8') as journal:
|
||||||
|
journal.write(''.join(f'{i}: ' + 'y' * 1024 + '\n' for i in range(70)))
|
||||||
live = self.cgi_call('logs_live').split('\n\n', 1)[1]
|
live = self.cgi_call('logs_live').split('\n\n', 1)[1]
|
||||||
|
# Git for Windows can translate CRLF inside native pipes.
|
||||||
self.assertLessEqual(len(live.encode()), 65536)
|
self.assertLessEqual(len(live.encode()), 65536)
|
||||||
|
self.assertGreater(len(live.encode()), 64000)
|
||||||
self.assertNotIn('Content-Disposition', self.cgi_call('logs_live'))
|
self.assertNotIn('Content-Disposition', self.cgi_call('logs_live'))
|
||||||
|
|
||||||
|
def test_connection_noise_is_omitted_and_duplicate_sources_are_one_fact(self):
|
||||||
|
self.helper_call('append',
|
||||||
|
'Tue Oct 13 05:00:00 2026 daemon.err owrt-remote[3173]: Xray: запуск туннеля\n'
|
||||||
|
'Tue Oct 13 05:00:01 2026 daemon.info owrt-remote[3173]: [Info] transport/internet: opening connection\n'
|
||||||
|
'Tue Oct 13 05:00:01 2026 daemon.info owrt-remote[3173]: from tcp:1.2.3.4:80 accepted tcp:localhost:80\n'
|
||||||
|
'Tue Oct 13 05:00:01 2026 daemon.info owrt-remote[3173]: [Debug] connection buffer\n'
|
||||||
|
'Tue Oct 13 05:00:02 2026 user.notice owrt-remote: Another event\n'
|
||||||
|
'Tue Oct 13 05:00:03 2026 user.notice owrt-remote: Xray: запуск туннеля\n'
|
||||||
|
'Tue Oct 13 05:00:04 2026 daemon.info owrt-remote[3173]: [Warning] core: Xray 26.3.27 started\n')
|
||||||
|
lines = self.helper_call('read').splitlines()
|
||||||
|
self.assertEqual(len(lines), 3)
|
||||||
|
self.assertTrue(all(line.startswith('[OK]') for line in lines))
|
||||||
|
self.assertEqual(sum('запуск туннеля' in line for line in lines), 1)
|
||||||
|
self.assertFalse(any('opening connection' in line or 'accepted' in line for line in lines))
|
||||||
|
|
||||||
|
def test_managed_agent_uses_one_system_log_sink_and_cli_keeps_its_output(self):
|
||||||
|
agent = (ROOT / 'files/usr/sbin/owrt-remote').read_text(encoding='utf-8').split('cmd="${1:-help}"')[0]
|
||||||
|
script = agent + '\nlogger() { printf "LOGGER=%s\\n" "$3"; }\nlog "event"\n'
|
||||||
|
result = subprocess.run([SH], input=script, encoding='utf-8', capture_output=True,
|
||||||
|
env={**self.env, 'OWRT_REMOTE_SERVICE_LOG': '1'}, timeout=20)
|
||||||
|
self.assertEqual(result.returncode, 0, result.stderr)
|
||||||
|
self.assertEqual(result.stdout, 'LOGGER=event\n')
|
||||||
|
self.assertEqual(result.stderr, '')
|
||||||
|
result = subprocess.run([SH], input=script, encoding='utf-8', capture_output=True,
|
||||||
|
env={**self.env, 'OWRT_REMOTE_SERVICE_LOG': '0'}, timeout=20)
|
||||||
|
self.assertEqual(result.returncode, 0, result.stderr)
|
||||||
|
self.assertEqual(result.stderr, 'event\n')
|
||||||
|
|
||||||
|
def test_heartbeat_records_changes_failures_and_recovery_instead_of_each_interval(self):
|
||||||
|
good = 'Heartbeat: OK; Hub=https://hub.example; WAN_direct=1; WAN_active=wan\n'
|
||||||
|
self.helper_call('append', good * 3)
|
||||||
|
self.helper_call('append', 'Other action\n')
|
||||||
|
self.helper_call('append', good, env={**self.env, 'TEST_UPTIME': '2000'})
|
||||||
|
self.assertEqual(self.helper_call('read', env={**self.env, 'TEST_UPTIME': '2000'}).count('Heartbeat: OK;'), 1)
|
||||||
|
failed = 'Heartbeat: ошибка; endpoint=https://hub.example; rc=7; connection refused\n'
|
||||||
|
self.helper_call('append', failed * 3, env={**self.env, 'TEST_UPTIME': '2001'})
|
||||||
|
self.helper_call('append', good, env={**self.env, 'TEST_UPTIME': '2002'})
|
||||||
|
self.helper_call('append', failed, env={**self.env, 'TEST_UPTIME': '2003'})
|
||||||
|
self.helper_call('append', good.replace('WAN_active=wan', 'WAN_active=wwan'),
|
||||||
|
env={**self.env, 'TEST_UPTIME': '2004'})
|
||||||
|
stored = self.helper_call('read', env={**self.env, 'TEST_UPTIME': '2004'})
|
||||||
|
self.assertEqual(stored.count('[ERROR] Heartbeat:'), 2, 'same failure after recovery must appear')
|
||||||
|
self.assertEqual(stored.count('[OK] Heartbeat:'), 3, 'first, recovery and another WAN')
|
||||||
|
|
||||||
|
def test_recurring_failure_is_recorded_again_after_a_quiet_period(self):
|
||||||
|
failure = 'owrt-remote: cannot download Xray\n'
|
||||||
|
self.helper_call('append', failure)
|
||||||
|
self.helper_call('append', failure, env={**self.env, 'TEST_UPTIME': '1050'})
|
||||||
|
self.helper_call('append', failure, env={**self.env, 'TEST_UPTIME': '1169'})
|
||||||
|
self.helper_call('append', failure, env={**self.env, 'TEST_UPTIME': '1290'})
|
||||||
|
self.assertEqual(self.helper_call('read', env={**self.env, 'TEST_UPTIME': '1290'}).count('cannot download'), 2)
|
||||||
|
self.helper_call('append', 'Xray is not ready yet, retry in 5s (1/18)\n'
|
||||||
|
'Xray is not ready yet, retry in 5s (2/18)\n')
|
||||||
|
self.assertEqual(self.helper_call('read').count('retry in 5s'), 1)
|
||||||
|
|
||||||
|
def test_panel_failure_classifies_the_body_and_preserves_redaction(self):
|
||||||
|
self.helper_call('event', 'rc=255\nhub_token=SECRET_TOKEN\n', 'Панель: Xray; результат=bad', 'bad')
|
||||||
|
lines = self.helper_call('read').splitlines()
|
||||||
|
self.assertEqual(len(lines), 3)
|
||||||
|
self.assertTrue(all(line.startswith('[ERROR]') for line in lines))
|
||||||
|
self.assertNotIn('SECRET_TOKEN', '\n'.join(lines))
|
||||||
|
self.helper_call('event', 'retry later\n', 'Панель: WAN; результат=warn', 'warn')
|
||||||
|
self.assertTrue(self.helper_call('read').endswith('[WARN] retry later\n'))
|
||||||
|
|
||||||
|
def test_wan_failure_and_recoverable_dns_fallback_have_correct_severity(self):
|
||||||
|
self.helper_call('append', 'WAN has no IPv4 default route on wan\n'
|
||||||
|
'RTNETLINK answers: Network is unreachable\n'
|
||||||
|
'Heartbeat: Hub ответил, но обновление настроек не применилось\n'
|
||||||
|
'WAN DNS unavailable for hub.example; using last successful WAN address 192.0.2.1\n')
|
||||||
|
lines = self.helper_call('read').splitlines()
|
||||||
|
self.assertEqual([line.split(']', 1)[0] for line in lines], ['[ERROR', '[ERROR', '[ERROR', '[WARN'])
|
||||||
|
|
||||||
|
def test_persistent_storage_is_rejected_before_any_file_is_written(self):
|
||||||
|
mounts = self.root / 'mounts'
|
||||||
|
mounts.write_text('/dev/root / overlay rw 0 0\n', encoding='utf-8')
|
||||||
|
source = self.helper_source.replace('/proc/mounts', mounts.as_posix())
|
||||||
|
self.helper.write_text(source, encoding='utf-8', newline='\n')
|
||||||
|
env = self.env
|
||||||
|
result = subprocess.run([SH, self.helper.as_posix(), 'append'], input='must not be written\n',
|
||||||
|
encoding='utf-8', capture_output=True, env=env, timeout=20)
|
||||||
|
self.assertNotEqual(result.returncode, 0)
|
||||||
|
self.assertIn('refusing persistent storage', result.stderr)
|
||||||
|
self.assertFalse(self.log_dir.exists())
|
||||||
|
self.env = env
|
||||||
|
self.assertIn('503 Service Unavailable', self.cgi_call('logs_live'))
|
||||||
|
self.assertFalse(self.log_dir.exists())
|
||||||
|
# The same location is permitted only when its containing mount is tmpfs.
|
||||||
|
mounts.write_text('/dev/root / overlay rw 0 0\ntmpfs ' + self.root.as_posix() + ' tmpfs rw 0 0\n', encoding='utf-8')
|
||||||
|
self.helper_call('append', 'RAM fact\n')
|
||||||
|
self.assertEqual(self.helper_call('read'), '[OK] RAM fact\n')
|
||||||
|
mounts.write_text('/dev/root / overlay rw 0 0\ntmpfs ' + self.root.as_posix()
|
||||||
|
+ ' tmpfs rw 0 0\n/dev/flash ' + self.log_dir.as_posix()
|
||||||
|
+ ' overlay rw 0 0\n', encoding='utf-8')
|
||||||
|
result = subprocess.run([SH, self.helper.as_posix(), 'append'], input='must not enter nested Flash mount\n',
|
||||||
|
encoding='utf-8', capture_output=True, env=env, timeout=20)
|
||||||
|
self.assertNotEqual(result.returncode, 0)
|
||||||
|
self.assertEqual((self.log_dir / 'current.log').read_text(), '[OK] RAM fact\n')
|
||||||
|
|
||||||
def test_clear_requires_post_and_correct_key(self):
|
def test_clear_requires_post_and_correct_key(self):
|
||||||
self.helper_call('append', 'retain this event\n')
|
self.helper_call('append', 'retain this event\n')
|
||||||
self.assertIn('Доступ запрещен', self.cgi_call('logs_download', key='wrong'))
|
self.assertIn('Доступ запрещен', self.cgi_call('logs_download', key='wrong'))
|
||||||
@@ -71,7 +176,7 @@ class GlobalLogTests(unittest.TestCase):
|
|||||||
self.assertIn('Логи Remote очищены', self.cgi_call('logs_clear', method='POST'))
|
self.assertIn('Логи Remote очищены', self.cgi_call('logs_clear', method='POST'))
|
||||||
self.assertEqual(self.helper_call('read'), '')
|
self.assertEqual(self.helper_call('read'), '')
|
||||||
self.helper_call('append', 'new event\n')
|
self.helper_call('append', 'new event\n')
|
||||||
self.assertEqual(self.helper_call('read'), 'new event\n')
|
self.assertEqual(self.helper_call('read'), '[OK] new event\n')
|
||||||
|
|
||||||
def test_retention_uses_uptime_and_clears_on_reboot(self):
|
def test_retention_uses_uptime_and_clears_on_reboot(self):
|
||||||
self.helper_call('append', 'old event\n')
|
self.helper_call('append', 'old event\n')
|
||||||
@@ -80,13 +185,52 @@ class GlobalLogTests(unittest.TestCase):
|
|||||||
self.helper_call('append', 'after daily clear\n', env={**self.env, 'TEST_UPTIME': '87401'})
|
self.helper_call('append', 'after daily clear\n', env={**self.env, 'TEST_UPTIME': '87401'})
|
||||||
self.assertEqual(self.helper_call('read', env={**self.env, 'TEST_UPTIME': '20'}), '')
|
self.assertEqual(self.helper_call('read', env={**self.env, 'TEST_UPTIME': '20'}), '')
|
||||||
|
|
||||||
|
def test_export_acknowledges_only_received_bytes_and_remote_clear_is_idempotent(self):
|
||||||
|
self.helper_call('append', 'First event\n')
|
||||||
|
first = json.loads(self.helper_call('export'))
|
||||||
|
raw = base64.b64decode(first['data'])
|
||||||
|
self.assertEqual(raw, b'[OK] First event\n')
|
||||||
|
self.assertEqual(first['to'] - first['from'], len(raw))
|
||||||
|
self.assertEqual(json.loads(self.helper_call('export')), first, 'lost reply retries same bytes')
|
||||||
|
self.helper_call('ack', '', first['journal_id'], str(first['to']))
|
||||||
|
self.assertEqual(json.loads(self.helper_call('export'))['data'], '')
|
||||||
|
self.helper_call('append', 'Second event\n')
|
||||||
|
second = json.loads(self.helper_call('export'))
|
||||||
|
self.assertEqual(second['from'], first['to'])
|
||||||
|
self.assertEqual(base64.b64decode(second['data']), b'[OK] Second event\n')
|
||||||
|
self.helper_call('ack', '', second['journal_id'], str(second['to']), 'clear-123')
|
||||||
|
cleared = json.loads(self.helper_call('export'))
|
||||||
|
self.assertNotEqual(cleared['journal_id'], first['journal_id'])
|
||||||
|
self.assertEqual(cleared['clear_ack'], 'clear-123')
|
||||||
|
self.assertEqual(cleared['data'], '')
|
||||||
|
self.helper_call('append', 'After clear\n')
|
||||||
|
self.helper_call('ack', '', second['journal_id'], str(second['to']), 'clear-123')
|
||||||
|
self.assertIn('After clear', self.helper_call('read'), 'retrying clear must not clear new events')
|
||||||
|
|
||||||
|
def test_export_catches_up_in_bounded_batches_after_rotation(self):
|
||||||
|
self.helper_call('clear')
|
||||||
|
raw = b'[OK] ' + b'x' * 100000 + b'\n'
|
||||||
|
(self.log_dir / 'current.log').write_bytes(raw)
|
||||||
|
first = json.loads(self.helper_call('export'))
|
||||||
|
first_raw = base64.b64decode(first['data'])
|
||||||
|
self.assertLessEqual(len(first_raw), 65536)
|
||||||
|
self.helper_call('ack', '', first['journal_id'], str(first['to']))
|
||||||
|
second = json.loads(self.helper_call('export'))
|
||||||
|
self.assertEqual(first_raw + base64.b64decode(second['data']), raw)
|
||||||
|
# Bytes dropped by local rotation are detected by the server from the gap.
|
||||||
|
(self.log_dir / 'current.log').write_bytes(b'[OK] Latest\n')
|
||||||
|
(self.log_dir / 'total').write_text('200000')
|
||||||
|
late = json.loads(self.helper_call('export'))
|
||||||
|
self.assertEqual(late['from'], 200000 - len(b'[OK] Latest\n'))
|
||||||
|
self.assertEqual(base64.b64decode(late['data']), b'[OK] Latest\n')
|
||||||
|
|
||||||
def test_rotation_retains_recent_log_and_clear_removes_both(self):
|
def test_rotation_retains_recent_log_and_clear_removes_both(self):
|
||||||
self.helper_call('clear')
|
self.helper_call('clear')
|
||||||
current = self.log_dir / 'current.log'
|
current = self.log_dir / 'current.log'
|
||||||
current.write_text('A' * 1048576, encoding='utf-8')
|
current.write_text('A' * 1048576, encoding='utf-8')
|
||||||
self.helper_call('append', 'second file\n')
|
self.helper_call('append', 'second file\n')
|
||||||
self.assertTrue((self.log_dir / 'previous.log').exists())
|
self.assertTrue((self.log_dir / 'previous.log').exists())
|
||||||
self.assertEqual(current.read_text(), 'second file\n')
|
self.assertEqual(current.read_text(), '[OK] second file\n')
|
||||||
current.write_text('B' * 1048576, encoding='utf-8')
|
current.write_text('B' * 1048576, encoding='utf-8')
|
||||||
self.helper_call('append', 'third file\n')
|
self.helper_call('append', 'third file\n')
|
||||||
output = self.helper_call('read')
|
output = self.helper_call('read')
|
||||||
@@ -111,7 +255,7 @@ class GlobalLogTests(unittest.TestCase):
|
|||||||
def test_parallel_events_do_not_corrupt_or_drop_lines(self):
|
def test_parallel_events_do_not_corrupt_or_drop_lines(self):
|
||||||
with concurrent.futures.ThreadPoolExecutor(max_workers=4) as pool:
|
with concurrent.futures.ThreadPoolExecutor(max_workers=4) as pool:
|
||||||
list(pool.map(lambda i: self.helper_call('append', f'event-{i}\n'), range(12)))
|
list(pool.map(lambda i: self.helper_call('append', f'event-{i}\n'), range(12)))
|
||||||
self.assertEqual(set(self.helper_call('read').splitlines()), {f'event-{i}' for i in range(12)})
|
self.assertEqual(set(self.helper_call('read').splitlines()), {f'[OK] event-{i}' for i in range(12)})
|
||||||
self.assertFalse((self.log_dir / 'lock').exists())
|
self.assertFalse((self.log_dir / 'lock').exists())
|
||||||
|
|
||||||
def test_stale_lock_recovers(self):
|
def test_stale_lock_recovers(self):
|
||||||
@@ -120,7 +264,7 @@ class GlobalLogTests(unittest.TestCase):
|
|||||||
lock.mkdir()
|
lock.mkdir()
|
||||||
(lock / 'pid').write_text('99999999')
|
(lock / 'pid').write_text('99999999')
|
||||||
self.helper_call('append', 'recovered\n')
|
self.helper_call('append', 'recovered\n')
|
||||||
self.assertEqual(self.helper_call('read'), 'recovered\n')
|
self.assertEqual(self.helper_call('read'), '[OK] recovered\n')
|
||||||
|
|
||||||
def test_missing_collector_is_reported(self):
|
def test_missing_collector_is_reported(self):
|
||||||
self.helper.unlink()
|
self.helper.unlink()
|
||||||
@@ -130,7 +274,7 @@ class GlobalLogTests(unittest.TestCase):
|
|||||||
self.helper_call('clear')
|
self.helper_call('clear')
|
||||||
(self.log_dir / 'lock').mkdir()
|
(self.log_dir / 'lock').mkdir()
|
||||||
self.helper_call('append', 'after empty lock\n')
|
self.helper_call('append', 'after empty lock\n')
|
||||||
self.assertEqual(self.helper_call('read'), 'after empty lock\n')
|
self.assertEqual(self.helper_call('read'), '[OK] after empty lock\n')
|
||||||
|
|
||||||
def test_collector_failure_cleans_both_children_and_fifo(self):
|
def test_collector_failure_cleans_both_children_and_fifo(self):
|
||||||
source = self.helper.read_text(encoding='utf-8')
|
source = self.helper.read_text(encoding='utf-8')
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ class GlobalLogsDeploymentTests(unittest.TestCase):
|
|||||||
mappings['/etc/init.d/rpcd'] = (self.root / 'etc/init.d/rpcd').as_posix()
|
mappings['/etc/init.d/rpcd'] = (self.root / 'etc/init.d/rpcd').as_posix()
|
||||||
mappings['/etc/init.d/uhttpd'] = (self.root / 'etc/init.d/uhttpd').as_posix()
|
mappings['/etc/init.d/uhttpd'] = (self.root / 'etc/init.d/uhttpd').as_posix()
|
||||||
mappings['/tmp/owrt-remote-logs'] = (self.root / 'journal').as_posix()
|
mappings['/tmp/owrt-remote-logs'] = (self.root / 'journal').as_posix()
|
||||||
mappings['/root/owrt-remote-backup-before-global-logs-v115'] = self.backup.as_posix()
|
mappings['/root/owrt-remote-backup-before-global-logs-stop-v116'] = self.backup.as_posix()
|
||||||
pattern = '|'.join(re.escape(target) for target in sorted(mappings, key=len, reverse=True))
|
pattern = '|'.join(re.escape(target) for target in sorted(mappings, key=len, reverse=True))
|
||||||
self.script = re.sub(pattern, lambda match: mappings[match.group()], self.script)
|
self.script = re.sub(pattern, lambda match: mappings[match.group()], self.script)
|
||||||
# Existing sandbox service scripts only print markers. Mock readiness.
|
# Existing sandbox service scripts only print markers. Mock readiness.
|
||||||
@@ -51,6 +51,7 @@ class GlobalLogsDeploymentTests(unittest.TestCase):
|
|||||||
logread() { return 0; }
|
logread() { return 0; }
|
||||||
ubus() { printf '{"running": true}\\n'; }
|
ubus() { printf '{"running": true}\\n'; }
|
||||||
mkfifo() { return 0; }
|
mkfifo() { return 0; }
|
||||||
|
jsonfilter() { return 0; }
|
||||||
logger() { printf '%s\\n' "$3" | sh "$TEST_LOG_HELPER" append; }
|
logger() { printf '%s\\n' "$3" | sh "$TEST_LOG_HELPER" append; }
|
||||||
'''
|
'''
|
||||||
self.script = self.script.replace('for item in cgi agent init;', mocks + '\nfor item in cgi agent init;', 1)
|
self.script = self.script.replace('for item in cgi agent init;', mocks + '\nfor item in cgi agent init;', 1)
|
||||||
@@ -73,6 +74,7 @@ logger() { printf '%s\\n' "$3" | sh "$TEST_LOG_HELPER" append; }
|
|||||||
text = (ROOT / source).read_text(encoding='utf-8')
|
text = (ROOT / source).read_text(encoding='utf-8')
|
||||||
if item == 'logs.sh':
|
if item == 'logs.sh':
|
||||||
text = text.replace('log_clock() { cut -d. -f1 /proc/uptime; }', 'log_clock() { echo 1000; }')
|
text = text.replace('log_clock() { cut -d. -f1 /proc/uptime; }', 'log_clock() { echo 1000; }')
|
||||||
|
text = text.replace('log_ram_storage() {', 'log_ram_storage() { return 0;', 1)
|
||||||
if item == 'logs-init':
|
if item == 'logs-init':
|
||||||
text = '#!/bin/sh\necho logs-service-$1\n'
|
text = '#!/bin/sh\necho logs-service-$1\n'
|
||||||
if bad and item == 'cgi':
|
if bad and item == 'cgi':
|
||||||
@@ -101,7 +103,7 @@ logger() { printf '%s\\n' "$3" | sh "$TEST_LOG_HELPER" append; }
|
|||||||
self.assertIn('GLOBAL_LOGS_ROUTER_Install_OK', result.stdout)
|
self.assertIn('GLOBAL_LOGS_ROUTER_Install_OK', result.stdout)
|
||||||
for item in ('cgi', 'luci'):
|
for item in ('cgi', 'luci'):
|
||||||
installed = self.root / self.targets[item].lstrip('/')
|
installed = self.root / self.targets[item].lstrip('/')
|
||||||
self.assertIn('v115', installed.read_text(encoding='utf-8'))
|
self.assertIn('v116', installed.read_text(encoding='utf-8'))
|
||||||
for item, data in self.initial.items():
|
for item, data in self.initial.items():
|
||||||
self.assertEqual(self.backup.joinpath(item).read_bytes(), data)
|
self.assertEqual(self.backup.joinpath(item).read_bytes(), data)
|
||||||
result = self.deploy('Rollback')
|
result = self.deploy('Rollback')
|
||||||
@@ -127,6 +129,21 @@ logger() { printf '%s\\n' "$3" | sh "$TEST_LOG_HELPER" append; }
|
|||||||
self.assertIn('Restoring files from this attempt.', result.stderr)
|
self.assertIn('Restoring files from this attempt.', result.stderr)
|
||||||
self.assert_initial()
|
self.assert_initial()
|
||||||
|
|
||||||
|
def test_rollback_restores_existing_log_service_and_helper(self):
|
||||||
|
# This fix is normally applied on top of v116's already installed journal.
|
||||||
|
for item in ('logs.sh', 'logs-init'):
|
||||||
|
target = self.root / self.targets[item].lstrip('/')
|
||||||
|
target.parent.mkdir(parents=True, exist_ok=True)
|
||||||
|
target.write_text('#!/bin/sh\necho previous-' + item + '-$1\n', encoding='utf-8', newline='\n')
|
||||||
|
self.initial[item] = target.read_bytes()
|
||||||
|
result = self.deploy('Install')
|
||||||
|
self.assertEqual(result.returncode, 0, result.stderr)
|
||||||
|
result = self.deploy('Rollback')
|
||||||
|
self.assertEqual(result.returncode, 0, result.stderr)
|
||||||
|
for item, data in self.initial.items():
|
||||||
|
self.assertEqual((self.root / self.targets[item].lstrip('/')).read_bytes(), data)
|
||||||
|
self.assertIn('previous-logs-init-start', result.stdout)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
unittest.main()
|
unittest.main()
|
||||||
@@ -7,6 +7,13 @@ const { chromium } = require('playwright');
|
|||||||
const root = path.resolve('.test-output/global-logs');
|
const root = path.resolve('.test-output/global-logs');
|
||||||
let text = Array.from({length: 150}, (_, i) => `Heartbeat ${i}: OK`).join('\n');
|
let text = Array.from({length: 150}, (_, i) => `Heartbeat ${i}: OK`).join('\n');
|
||||||
let reads = 0, clears = 0;
|
let reads = 0, clears = 0;
|
||||||
|
function sampleLogs() {
|
||||||
|
return '[ERROR] Heartbeat: ошибка; connection refused\n[WARN] Xray missing, retry in 5s\n'
|
||||||
|
+ '[OK] Heartbeat: OK; Hub=https://hub.example\n'
|
||||||
|
+ 'daemon.err owrt-remote[123]: Xray: запуск туннеля\n'
|
||||||
|
+ '[Warning] core: Xray 26.3.27 started\n'
|
||||||
|
+ Array.from({length: 150}, (_, i) => `[OK] Heartbeat ${i}: OK`).join('\n');
|
||||||
|
}
|
||||||
const server = http.createServer((req, res) => {
|
const server = http.createServer((req, res) => {
|
||||||
const url = new URL(req.url, 'http://localhost');
|
const url = new URL(req.url, 'http://localhost');
|
||||||
if (url.searchParams.get('action') === 'logs_live') {
|
if (url.searchParams.get('action') === 'logs_live') {
|
||||||
@@ -29,7 +36,7 @@ const server = http.createServer((req, res) => {
|
|||||||
const browser = await chromium.launch({headless: true, channel: 'chrome'});
|
const browser = await chromium.launch({headless: true, channel: 'chrome'});
|
||||||
try {
|
try {
|
||||||
for (const mobile of [false, true]) {
|
for (const mobile of [false, true]) {
|
||||||
text = Array.from({length: 150}, (_, i) => `Heartbeat ${i}: OK`).join('\n');
|
text = sampleLogs();
|
||||||
const page = await browser.newPage({viewport: mobile ? {width: 390, height: 844} : {width: 1280, height: 900}});
|
const page = await browser.newPage({viewport: mobile ? {width: 390, height: 844} : {width: 1280, height: 900}});
|
||||||
const errors = [];
|
const errors = [];
|
||||||
page.on('pageerror', error => errors.push(error.message));
|
page.on('pageerror', error => errors.push(error.message));
|
||||||
@@ -59,6 +66,13 @@ const server = http.createServer((req, res) => {
|
|||||||
await page.locator('#globalLogsToggle').click();
|
await page.locator('#globalLogsToggle').click();
|
||||||
assert.equal(await page.locator('#globalLogsPanel').isVisible(), true);
|
assert.equal(await page.locator('#globalLogsPanel').isVisible(), true);
|
||||||
await page.waitForFunction(() => document.querySelector('#globalLogsText').textContent.includes('Heartbeat 149'));
|
await page.waitForFunction(() => document.querySelector('#globalLogsText').textContent.includes('Heartbeat 149'));
|
||||||
|
const rows = page.locator('#globalLogsText .globalLogLine');
|
||||||
|
assert.equal(await rows.nth(0).evaluate(el => getComputedStyle(el).color), 'rgb(248, 113, 113)');
|
||||||
|
assert.equal(await rows.nth(1).evaluate(el => getComputedStyle(el).color), 'rgb(253, 230, 138)');
|
||||||
|
for (const index of [2, 3, 4]) {
|
||||||
|
assert.equal(await rows.nth(index).evaluate(el => getComputedStyle(el).color), 'rgb(134, 239, 172)');
|
||||||
|
}
|
||||||
|
assert.equal(await page.locator('.globalLogsLegend span').count(), 3);
|
||||||
assert.equal(reads, beforeOpen + 1, 'opening displays existing records immediately');
|
assert.equal(reads, beforeOpen + 1, 'opening displays existing records immediately');
|
||||||
assert.equal(await page.locator('#globalLogsLive').textContent(), 'Запустить в реальном времени');
|
assert.equal(await page.locator('#globalLogsLive').textContent(), 'Запустить в реальном времени');
|
||||||
await page.waitForTimeout(3300);
|
await page.waitForTimeout(3300);
|
||||||
@@ -66,6 +80,8 @@ const server = http.createServer((req, res) => {
|
|||||||
await page.locator('#globalLogsLive').click();
|
await page.locator('#globalLogsLive').click();
|
||||||
await page.waitForFunction(() => document.querySelector('#globalLogsText').textContent.includes('Heartbeat 149'));
|
await page.waitForFunction(() => document.querySelector('#globalLogsText').textContent.includes('Heartbeat 149'));
|
||||||
assert.equal(await page.locator('#globalLogsLive').textContent(), 'Остановить просмотр');
|
assert.equal(await page.locator('#globalLogsLive').textContent(), 'Остановить просмотр');
|
||||||
|
await page.locator('#globalLogsText').evaluate(el => el.scrollTop = 0);
|
||||||
|
await page.screenshot({path: path.join(root, mobile ? 'mobile-colors.png' : 'desktop-colors.png'), fullPage: true});
|
||||||
await page.locator('#globalLogsText').evaluate(el => {el.scrollTop = 40;});
|
await page.locator('#globalLogsText').evaluate(el => {el.scrollTop = 40;});
|
||||||
text += '\nnew event\n<script>window.bad=1</script>';
|
text += '\nnew event\n<script>window.bad=1</script>';
|
||||||
await page.waitForFunction(() => document.querySelector('#globalLogsText').textContent.includes('new event'));
|
await page.waitForFunction(() => document.querySelector('#globalLogsText').textContent.includes('new event'));
|
||||||
|
|||||||
@@ -0,0 +1,81 @@
|
|||||||
|
"""Validate VPS install, rollback and automatic recovery in a disposable tree."""
|
||||||
|
import os
|
||||||
|
from pathlib import Path
|
||||||
|
import shutil
|
||||||
|
import subprocess
|
||||||
|
import tempfile
|
||||||
|
import unittest
|
||||||
|
|
||||||
|
ROOT = Path(__file__).resolve().parents[1]
|
||||||
|
GIT_BIN = Path(os.environ.get('ProgramFiles', 'C:/Program Files')) / 'Git/usr/bin'
|
||||||
|
SH = str(GIT_BIN / 'sh.exe') if os.name == 'nt' else shutil.which('sh')
|
||||||
|
|
||||||
|
|
||||||
|
@unittest.skipUnless(SH, 'POSIX shell required')
|
||||||
|
class VpsLogDeployTests(unittest.TestCase):
|
||||||
|
def setUp(self):
|
||||||
|
self.temp = tempfile.TemporaryDirectory(prefix='vps-log-deploy-')
|
||||||
|
self.addCleanup(self.temp.cleanup)
|
||||||
|
self.root = Path(self.temp.name)
|
||||||
|
self.target = self.root / 'hub.py'
|
||||||
|
self.previous = b'print("previous Hub")\n'
|
||||||
|
self.target.write_bytes(self.previous)
|
||||||
|
self.backup = self.root / 'hub.py.bak-before-global-logs-ui-v116'
|
||||||
|
source = (ROOT / 'vps/deploy-global-logs-vps.ps1').read_text(encoding='utf-8')
|
||||||
|
self.script = source.split("$RemoteScript = @'\n", 1)[1].split("\n'@", 1)[0]
|
||||||
|
self.script = self.script.replace('/opt/owrt-remote/owrt-remote-hub.py', self.target.as_posix())
|
||||||
|
self.script = self.script.replace('python_bin=/opt/owrt-remote/venv/bin/python', 'python_bin=python')
|
||||||
|
self.script = self.script.replace('[ -x "$python_bin" ] || python_bin=python3', '')
|
||||||
|
mocks = '''
|
||||||
|
systemctl() { [ "${TEST_RESTART_FAIL:-0}" != 1 ] || [ "$1" != restart ]; }
|
||||||
|
journalctl() { echo sandbox-journal; }
|
||||||
|
curl() { [ "${TEST_HEALTH_FAIL:-0}" != 1 ] && printf '{"ok":true}'; }
|
||||||
|
sleep() { return 0; }
|
||||||
|
'''
|
||||||
|
self.script = self.script.replace('test -s "$target"', mocks + '\ntest -s "$target"', 1)
|
||||||
|
self.env = dict(os.environ)
|
||||||
|
if os.name == 'nt':
|
||||||
|
self.env['PATH'] = str(GIT_BIN) + os.pathsep + self.env['PATH']
|
||||||
|
|
||||||
|
def deploy(self, action, invalid=False, **flags):
|
||||||
|
stage = self.root / 'stage'
|
||||||
|
stage.mkdir()
|
||||||
|
if action == 'Install':
|
||||||
|
data = 'if invalid:\n' if invalid else (ROOT / 'vps/owrt-remote-hub.py').read_text(encoding='utf-8')
|
||||||
|
stage.joinpath('hub.py').write_text(data, encoding='utf-8', newline='\n')
|
||||||
|
script = self.script.replace('stage=/tmp/__UPLOAD_NAME__', 'stage="' + stage.as_posix() + '"')
|
||||||
|
script = script.replace('__UPLOAD_NAME__', 'sandbox').replace('__ACTION__', action)
|
||||||
|
result = subprocess.run([SH], input=script, encoding='utf-8', capture_output=True,
|
||||||
|
env={**self.env, **flags}, timeout=25)
|
||||||
|
self.assertFalse(stage.exists())
|
||||||
|
self.assertFalse(list(self.root.glob('*.new-sandbox')))
|
||||||
|
return result
|
||||||
|
|
||||||
|
def test_install_and_rollback_preserve_original_backup(self):
|
||||||
|
for _ in range(2):
|
||||||
|
result = self.deploy('Install')
|
||||||
|
self.assertEqual(result.returncode, 0, result.stderr)
|
||||||
|
self.assertIn('GLOBAL_LOGS_VPS_V116_Install_OK', result.stdout)
|
||||||
|
self.assertIn(b'def receive_router_logs(', self.target.read_bytes())
|
||||||
|
self.assertEqual(self.backup.read_bytes(), self.previous)
|
||||||
|
result = self.deploy('Rollback')
|
||||||
|
self.assertEqual(result.returncode, 0, result.stderr)
|
||||||
|
self.assertEqual(self.target.read_bytes(), self.previous)
|
||||||
|
|
||||||
|
def test_failed_health_restores_file_from_this_attempt(self):
|
||||||
|
self.assertEqual(self.deploy('Install').returncode, 0)
|
||||||
|
installed = self.target.read_bytes()
|
||||||
|
result = self.deploy('Rollback', TEST_HEALTH_FAIL='1')
|
||||||
|
self.assertNotEqual(result.returncode, 0)
|
||||||
|
self.assertIn('Restoring the previous Hub file', result.stderr)
|
||||||
|
self.assertEqual(self.target.read_bytes(), installed)
|
||||||
|
|
||||||
|
def test_invalid_candidate_and_missing_backup_change_nothing(self):
|
||||||
|
self.assertNotEqual(self.deploy('Install', invalid=True).returncode, 0)
|
||||||
|
self.assertFalse(self.backup.exists())
|
||||||
|
self.assertNotEqual(self.deploy('Rollback').returncode, 0)
|
||||||
|
self.assertEqual(self.target.read_bytes(), self.previous)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
unittest.main()
|
||||||
@@ -600,6 +600,7 @@ post_json http://hub.example/api/heartbeat test-token "$TEST_ROOT/payload"
|
|||||||
result = self.run_shell("render_client_config --stdout")
|
result = self.run_shell("render_client_config --stdout")
|
||||||
self.assertEqual(result.returncode, 0, result.stderr)
|
self.assertEqual(result.returncode, 0, result.stderr)
|
||||||
config = json.loads(result.stdout)
|
config = json.loads(result.stdout)
|
||||||
|
self.assertEqual(config['log'], {'access': 'none', 'error': '', 'loglevel': 'warning'})
|
||||||
for outbound in config["outbounds"]:
|
for outbound in config["outbounds"]:
|
||||||
if outbound["tag"].startswith("vps-"):
|
if outbound["tag"].startswith("vps-"):
|
||||||
self.assertEqual(outbound["streamSettings"]["sockopt"], {"mark": 2097152, "interface": "pppoe-wan"})
|
self.assertEqual(outbound["streamSettings"]["sockopt"], {"mark": 2097152, "interface": "pppoe-wan"})
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ class HubFixture:
|
|||||||
assert "groups" in json.loads(self.request("/api/router-groups"))
|
assert "groups" in json.loads(self.request("/api/router-groups"))
|
||||||
assert "notifications" in json.loads(self.request("/api/notifications"))
|
assert "notifications" in json.loads(self.request("/api/notifications"))
|
||||||
assert self.request("/access/test-router/") == b"router proxy fixture"
|
assert self.request("/access/test-router/") == b"router proxy fixture"
|
||||||
assert b"v115" in self.request("/")
|
assert b"v116" in self.request("/")
|
||||||
self.app.snapshot_router_states()
|
self.app.snapshot_router_states()
|
||||||
|
|
||||||
def __exit__(self, *args):
|
def __exit__(self, *args):
|
||||||
|
|||||||
@@ -0,0 +1,248 @@
|
|||||||
|
"""Router log delivery, offline archive, authorization and retry regressions."""
|
||||||
|
import base64
|
||||||
|
import concurrent.futures
|
||||||
|
import importlib.util
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
from pathlib import Path
|
||||||
|
import sys
|
||||||
|
import tempfile
|
||||||
|
import threading
|
||||||
|
import unittest
|
||||||
|
import urllib.error
|
||||||
|
import urllib.request
|
||||||
|
from unittest import mock
|
||||||
|
|
||||||
|
ROOT = Path(__file__).resolve().parents[1]
|
||||||
|
STATE = tempfile.TemporaryDirectory(prefix='router-log-archive-')
|
||||||
|
spec = importlib.util.spec_from_file_location('log_archive_hub', ROOT / 'vps/owrt-remote-hub.py')
|
||||||
|
hub = importlib.util.module_from_spec(spec)
|
||||||
|
sys.modules[spec.name] = hub
|
||||||
|
with mock.patch.dict(os.environ, {'OWRT_REMOTE_STATE_DIR': STATE.name}):
|
||||||
|
spec.loader.exec_module(hub)
|
||||||
|
|
||||||
|
|
||||||
|
def batch(raw, start=0, journal='journal-1', clear_ack=''):
|
||||||
|
return {'journal_id': journal, 'from': start, 'to': start + len(raw),
|
||||||
|
'data': base64.b64encode(raw).decode(), 'clear_ack': clear_ack}
|
||||||
|
|
||||||
|
|
||||||
|
class QuietHandler(hub.Handler):
|
||||||
|
def log_message(self, *args):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
class ArchiveTests(unittest.TestCase):
|
||||||
|
def setUp(self):
|
||||||
|
self.temp = tempfile.TemporaryDirectory(dir=STATE.name)
|
||||||
|
self.addCleanup(self.temp.cleanup)
|
||||||
|
self.app = hub.App(Path(self.temp.name) / 'hub.db', 'session-test', 'agent-test', '')
|
||||||
|
with self.app.conn() as conn:
|
||||||
|
hub.upsert_router(conn, {'id': 'main', 'name': 'Test router', 'vps_host': 'hub.example'})
|
||||||
|
hub.upsert_router(conn, {'id': 'other', 'name': 'Other router', 'vps_host': 'hub.example'})
|
||||||
|
hub.write_json_private(hub.AUTH_FILE, {'username': 'owner', 'password_hash': 'unused'})
|
||||||
|
self.server = hub.HubHTTPServer(('127.0.0.1', 0), QuietHandler)
|
||||||
|
self.server.app = self.app
|
||||||
|
self.server.is_tls = False
|
||||||
|
self.thread = threading.Thread(target=self.server.serve_forever, daemon=True)
|
||||||
|
self.thread.start()
|
||||||
|
self.addCleanup(self.close)
|
||||||
|
|
||||||
|
def close(self):
|
||||||
|
self.server.shutdown()
|
||||||
|
self.server.server_close()
|
||||||
|
self.thread.join(timeout=5)
|
||||||
|
|
||||||
|
def request(self, path, payload=None, cookie=True, agent=False, method=None):
|
||||||
|
headers = {}
|
||||||
|
if cookie:
|
||||||
|
headers['Cookie'] = 'owrt_remote_session=session-test'
|
||||||
|
if agent:
|
||||||
|
headers['Authorization'] = 'Bearer agent-test'
|
||||||
|
raw = None
|
||||||
|
if payload is not None:
|
||||||
|
raw = json.dumps(payload).encode('utf-8')
|
||||||
|
headers['Content-Type'] = 'application/json'
|
||||||
|
request = urllib.request.Request(f'http://127.0.0.1:{self.server.server_port}{path}',
|
||||||
|
data=raw, headers=headers, method=method)
|
||||||
|
with urllib.request.urlopen(request, timeout=5) as response:
|
||||||
|
return response.read(), response.headers
|
||||||
|
|
||||||
|
def ingest(self, value, state=None):
|
||||||
|
payload = {'id': 'main', 'batch': value}
|
||||||
|
if state is not None:
|
||||||
|
payload['state'] = state
|
||||||
|
raw, _ = self.request('/api/router-logs', payload, cookie=False, agent=True)
|
||||||
|
return json.loads(raw)
|
||||||
|
|
||||||
|
def snapshot(self):
|
||||||
|
raw, _ = self.request('/api/router/main/logs')
|
||||||
|
return json.loads(raw)
|
||||||
|
|
||||||
|
def test_offline_router_page_download_and_archive_survive_hub_restart(self):
|
||||||
|
raw = '[ERROR] WAN: connection refused\n[WARN] Retry\n[OK] Before disconnect\n'.encode()
|
||||||
|
self.ingest(batch(raw))
|
||||||
|
snapshot = self.snapshot()
|
||||||
|
self.assertFalse(snapshot['online'])
|
||||||
|
self.assertEqual(snapshot['text'].encode(), raw)
|
||||||
|
page, _ = self.request('/router/main/logs')
|
||||||
|
self.assertIn('Глобал логи'.encode(), page)
|
||||||
|
self.assertIn('Роутер оффлайн'.encode(), page)
|
||||||
|
downloaded, headers = self.request('/api/router/main/logs/download')
|
||||||
|
self.assertEqual(downloaded, raw)
|
||||||
|
self.assertIn('attachment;', headers['Content-Disposition'])
|
||||||
|
self.server.app = hub.App(self.app.db_path, 'session-test', 'agent-test', '')
|
||||||
|
self.assertEqual(self.snapshot()['text'].encode(), raw)
|
||||||
|
with self.app.conn() as conn:
|
||||||
|
router = hub.router_with_access(hub.row_to_router(hub.get_router(conn, 'main')), {'is_owner': True})
|
||||||
|
self.assertTrue(router['permissions']['logs'])
|
||||||
|
self.assertEqual(router['logs_url'], '/router/main/logs')
|
||||||
|
self.assertFalse(router['online'])
|
||||||
|
|
||||||
|
def test_lost_ack_retries_and_overlapping_batches_do_not_duplicate(self):
|
||||||
|
first = b'[OK] first\n'
|
||||||
|
second = b'[ERROR] next\n'
|
||||||
|
self.ingest(batch(first))
|
||||||
|
self.ingest(batch(first))
|
||||||
|
self.ingest(batch(first + second))
|
||||||
|
self.assertEqual(self.snapshot()['text'].encode(), first + second)
|
||||||
|
with concurrent.futures.ThreadPoolExecutor(max_workers=4) as pool:
|
||||||
|
list(pool.map(lambda _: self.ingest(batch(first + second)), range(4)))
|
||||||
|
self.assertEqual(self.snapshot()['text'].encode(), first + second)
|
||||||
|
self.ingest(batch(b'[OK] after reboot\n', journal='journal-2'))
|
||||||
|
self.assertIn('новый журнал', self.snapshot()['text'])
|
||||||
|
self.assertIn('first', self.snapshot()['text'])
|
||||||
|
|
||||||
|
def test_offline_clear_does_not_restore_old_logs_on_reconnection(self):
|
||||||
|
old = b'[ERROR] old\n'
|
||||||
|
self.ingest(batch(old))
|
||||||
|
raw, _ = self.request('/api/router/main/logs/clear', {}, method='POST')
|
||||||
|
self.assertTrue(json.loads(raw)['pending_clear'])
|
||||||
|
self.assertEqual(self.snapshot()['text'], '')
|
||||||
|
reply = self.ingest(batch(old))
|
||||||
|
token = reply['clear_request']
|
||||||
|
self.assertTrue(token)
|
||||||
|
self.assertEqual(self.snapshot()['text'], '')
|
||||||
|
self.ingest(batch(b'', journal='after-clear', clear_ack=token))
|
||||||
|
self.assertFalse(self.snapshot()['pending_clear'])
|
||||||
|
fresh = b'[OK] fresh\n'
|
||||||
|
self.ingest(batch(fresh, journal='after-clear', clear_ack=token))
|
||||||
|
self.assertEqual(self.snapshot()['text'].encode(), fresh)
|
||||||
|
self.ingest(batch(fresh, journal='after-clear', clear_ack=token))
|
||||||
|
self.assertEqual(self.snapshot()['text'].encode(), fresh)
|
||||||
|
|
||||||
|
def test_credentials_are_redacted_and_retention_is_bounded(self):
|
||||||
|
self.ingest(batch(b'[ERROR] hub_token=SECRET\n'))
|
||||||
|
self.assertNotIn('SECRET', self.snapshot()['text'])
|
||||||
|
self.assertTrue(self.snapshot()['text'].startswith('[ERROR]'))
|
||||||
|
with mock.patch.object(hub, 'ROUTER_LOG_MAX_BYTES', 80):
|
||||||
|
self.ingest(batch(b'[OK] ' + b'X' * 150 + b'\n', journal='new'))
|
||||||
|
self.assertEqual(self.snapshot()['bytes'], 80)
|
||||||
|
|
||||||
|
def test_malformed_batches_rejected_without_touching_archive(self):
|
||||||
|
for value in (batch(b'abc', start=-1), {**batch(b'abc'), 'to': 9},
|
||||||
|
{**batch(b'abc'), 'data': 'invalid base64'}, batch(b'x' * 65537),
|
||||||
|
batch(b'', journal='../file')):
|
||||||
|
with self.subTest(value=list(value)):
|
||||||
|
with self.assertRaises(urllib.error.HTTPError) as error:
|
||||||
|
self.ingest(value)
|
||||||
|
self.assertEqual(error.exception.code, 400)
|
||||||
|
self.assertEqual(self.snapshot()['text'], '')
|
||||||
|
|
||||||
|
def test_agent_token_and_router_permission_are_required(self):
|
||||||
|
with self.assertRaises(urllib.error.HTTPError) as error:
|
||||||
|
self.request('/api/router-logs', {'id': 'main', 'batch': batch(b'')}, cookie=True)
|
||||||
|
self.assertEqual(error.exception.code, 401)
|
||||||
|
with self.assertRaises(urllib.error.HTTPError) as error:
|
||||||
|
self.request('/api/router/main/logs', cookie=False)
|
||||||
|
self.assertEqual(error.exception.code, 401)
|
||||||
|
delegated = {'username': 'viewer', 'is_owner': False, 'router_flags': {'other': ['G'], 'main': ['A']}}
|
||||||
|
with mock.patch.object(hub.Handler, 'current_account_profile', return_value=delegated):
|
||||||
|
for path, method in [('/router/main/logs', None), ('/api/router/main/logs', None),
|
||||||
|
('/api/router/main/logs/download', None), ('/api/router/main/logs/clear', 'POST')]:
|
||||||
|
with self.assertRaises(urllib.error.HTTPError) as error:
|
||||||
|
self.request(path, {} if method else None, method=method)
|
||||||
|
self.assertEqual(error.exception.code, 403)
|
||||||
|
|
||||||
|
def test_hub_records_offline_transition_once_and_delivery_does_not_mark_online(self):
|
||||||
|
with self.app.conn() as conn:
|
||||||
|
conn.execute('update routers set last_seen = ? where id = ?', (hub.now_ts(), 'main'))
|
||||||
|
self.app.prime_router_state_snapshot()
|
||||||
|
with self.app.conn() as conn:
|
||||||
|
conn.execute('update routers set last_seen = 1 where id = ?', ('main',))
|
||||||
|
with mock.patch.object(hub, 'notify_router_offline'):
|
||||||
|
self.app.check_router_state_changes()
|
||||||
|
self.app.check_router_state_changes()
|
||||||
|
self.assertEqual(self.snapshot()['text'].count('истекло время'), 1)
|
||||||
|
self.ingest(batch(b'[OK] live logs with no heartbeat\n'))
|
||||||
|
self.assertFalse(self.snapshot()['online'])
|
||||||
|
|
||||||
|
def test_stop_reason_arrives_while_offline_and_no_heartbeat_is_required(self):
|
||||||
|
initial = b'[OK] Heartbeat: OK; Hub=https://hub.example\n'
|
||||||
|
self.ingest(batch(initial))
|
||||||
|
stopped = '[OK] Панель: действие=stop; начало\n[OK] Сервис: остановка туннеля\n[WARN] Панель: Сервис остановлен; результат=warn\n'.encode()
|
||||||
|
self.ingest(batch(stopped, start=len(initial)), {'enabled': False, 'xray': 'stopped'})
|
||||||
|
snapshot = self.snapshot()
|
||||||
|
self.assertFalse(snapshot['online'])
|
||||||
|
self.assertIn('Сервис остановлен', snapshot['text'])
|
||||||
|
self.assertIn('Remote выключен', snapshot['diagnosis']['text'])
|
||||||
|
self.assertEqual(snapshot['diagnosis']['level'], 'warn')
|
||||||
|
# Empty periodic deliveries must still carry the state without new log lines.
|
||||||
|
self.ingest(batch(b'', start=len(initial) + len(stopped)), {'enabled': True, 'xray': 'stopped'})
|
||||||
|
self.assertEqual(self.snapshot()['diagnosis']['level'], 'error')
|
||||||
|
self.assertIn('Xray остановлен', self.snapshot()['diagnosis']['text'])
|
||||||
|
self.ingest(batch(b'', start=len(initial) + len(stopped)), {'enabled': True, 'xray': 'running'})
|
||||||
|
self.assertNotIn('Remote выключен', self.snapshot()['diagnosis']['text'])
|
||||||
|
|
||||||
|
def test_offline_monitor_states_known_stop_cause_instead_of_referring_to_router(self):
|
||||||
|
with self.app.conn() as conn:
|
||||||
|
conn.execute('update routers set last_seen = ? where id = ?', (hub.now_ts() - 1, 'main'))
|
||||||
|
self.app.prime_router_state_snapshot()
|
||||||
|
self.ingest(batch('[WARN] Панель: Сервис остановлен; результат=warn\n'.encode()),
|
||||||
|
{'enabled': False, 'xray': 'stopped'})
|
||||||
|
with self.app.conn() as conn:
|
||||||
|
conn.execute('update routers set last_seen = 1 where id = ?', ('main',))
|
||||||
|
with mock.patch.object(hub, 'notify_router_offline'):
|
||||||
|
self.app.check_router_state_changes()
|
||||||
|
text = self.snapshot()['text']
|
||||||
|
self.assertIn('Remote выключен', text)
|
||||||
|
self.assertNotIn('Причина на роутере', text)
|
||||||
|
|
||||||
|
def test_unknown_outage_is_not_reported_as_a_confirmed_cause(self):
|
||||||
|
self.ingest(batch(b'[OK] Heartbeat: OK; Hub=https://hub.example\n'))
|
||||||
|
self.assertIn('Причина обрыва не доставлена', self.snapshot()['diagnosis']['text'])
|
||||||
|
raw = b'[ERROR] WAN has no IPv4 default route on wan\n'
|
||||||
|
self.ingest(batch(raw, journal='network-outage'))
|
||||||
|
reason = self.snapshot()['diagnosis']['text']
|
||||||
|
self.assertIn('WAN has no IPv4 default route', reason)
|
||||||
|
self.assertIn('Последнее доставленное', reason)
|
||||||
|
|
||||||
|
def test_legacy_delivered_stop_reason_is_visible_without_new_agent_state(self):
|
||||||
|
self.ingest(batch('[WARN] Панель: Сервис остановлен; результат=warn\n'.encode()))
|
||||||
|
self.assertIn('остановлен через панель', self.snapshot()['diagnosis']['text'])
|
||||||
|
self.ingest(batch('[OK] Сервис: запуск\n'.encode(), journal='restart'))
|
||||||
|
self.assertNotIn('остановлен через панель', self.snapshot()['diagnosis']['text'])
|
||||||
|
|
||||||
|
def test_invalid_state_rolls_back_batch_and_does_not_change_archive(self):
|
||||||
|
self.ingest(batch(b'[OK] before\n'))
|
||||||
|
original = self.snapshot()['text']
|
||||||
|
with self.assertRaises(urllib.error.HTTPError):
|
||||||
|
self.ingest(batch(b'[ERROR] invalid\n', journal='invalid-state'), {'enabled': 'false', 'xray': 'running'})
|
||||||
|
self.assertEqual(self.snapshot()['text'], original)
|
||||||
|
|
||||||
|
def test_existing_archive_gains_state_columns_without_losing_logs(self):
|
||||||
|
raw = b'[OK] saved by the previous Hub\n'
|
||||||
|
self.ingest(batch(raw))
|
||||||
|
with self.app.conn() as conn:
|
||||||
|
conn.execute('alter table router_logs drop column state_json')
|
||||||
|
conn.execute('alter table router_logs drop column state_at')
|
||||||
|
self.server.app = hub.App(self.app.db_path, 'session-test', 'agent-test', '')
|
||||||
|
self.assertEqual(self.snapshot()['text'].encode(), raw)
|
||||||
|
self.ingest(batch(b'', start=len(raw)), {'enabled': False, 'xray': 'stopped'})
|
||||||
|
snapshot = self.snapshot()
|
||||||
|
self.assertIn('Remote выключен', snapshot['diagnosis']['text'])
|
||||||
|
self.assertEqual(snapshot['text'].encode(), raw)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
unittest.main()
|
||||||
@@ -0,0 +1,140 @@
|
|||||||
|
const assert = require('node:assert/strict');
|
||||||
|
const fs = require('node:fs');
|
||||||
|
const http = require('node:http');
|
||||||
|
const path = require('node:path');
|
||||||
|
const {execFileSync} = require('node:child_process');
|
||||||
|
const {chromium} = require('playwright');
|
||||||
|
const root = path.resolve('.test-output/global-logs');
|
||||||
|
execFileSync(process.env.TEST_PYTHON || 'python', ['-c', String.raw`
|
||||||
|
import importlib.util, os, sys, tempfile
|
||||||
|
from pathlib import Path
|
||||||
|
with tempfile.TemporaryDirectory(prefix='router-log-preview-') as state:
|
||||||
|
os.environ['OWRT_REMOTE_STATE_DIR'] = state
|
||||||
|
spec = importlib.util.spec_from_file_location('preview_hub', 'vps/owrt-remote-hub.py')
|
||||||
|
hub = importlib.util.module_from_spec(spec); sys.modules[spec.name] = hub; spec.loader.exec_module(hub)
|
||||||
|
app = hub.App(Path(state)/'hub.db', 'preview-session', 'preview-agent', '')
|
||||||
|
with app.conn() as conn:
|
||||||
|
hub.upsert_router(conn, {'id':'main', 'name':'Test offline router', 'vps_host':'hub.example'})
|
||||||
|
router = hub.router_with_access(hub.row_to_router(hub.get_router(conn,'main')), {'is_owner':True})
|
||||||
|
out = Path('.test-output/global-logs'); out.mkdir(parents=True,exist_ok=True)
|
||||||
|
out.joinpath('vps-dashboard.html').write_text(hub.dashboard_html([router],'owner',auth_bootstrap={'username':'owner','is_owner':True}),encoding='utf-8')
|
||||||
|
out.joinpath('vps-logs.html').write_text(hub.router_logs_html(router),encoding='utf-8')
|
||||||
|
out.joinpath('vps-terminal.html').write_text(hub.ssh_terminal_html_v2(hub.vps_terminal_row(),'preview-only'),encoding='utf-8')
|
||||||
|
`], {cwd:path.resolve(__dirname,'..')});
|
||||||
|
const dashboard = fs.readFileSync(path.join(root, 'vps-dashboard.html'), 'utf8');
|
||||||
|
const routers = JSON.parse(dashboard.match(/window\.ROUTERS = (\[.*\]);/)[1]);
|
||||||
|
let reads = 0, clears = 0;
|
||||||
|
function initialText() {
|
||||||
|
return '[ERROR] WAN connection refused\n[WARN] Hub: Heartbeat timeout\n[OK] Xray started\n'
|
||||||
|
+ Array.from({length: 120}, (_, i) => `[OK] Event ${i}`).join('\n');
|
||||||
|
}
|
||||||
|
let text = initialText();
|
||||||
|
const server = http.createServer((req, res) => {
|
||||||
|
const url = new URL(req.url, 'http://localhost');
|
||||||
|
if (url.pathname === '/api/router/main/logs') {
|
||||||
|
reads++;
|
||||||
|
res.setHeader('Content-Type', 'application/json');
|
||||||
|
return res.end(JSON.stringify({ok:true, online:false, text, bytes:Buffer.byteLength(text), last_sync:1791954000,
|
||||||
|
diagnosis:{level:'warn',text:'Remote выключен на роутере. Туннель и Heartbeat остановлены.',at:1791954000}}));
|
||||||
|
}
|
||||||
|
if (url.pathname === '/api/router/main/logs/clear') {
|
||||||
|
assert.equal(req.method, 'POST'); clears++; text='';
|
||||||
|
res.setHeader('Content-Type', 'application/json');
|
||||||
|
return res.end(JSON.stringify({ok:true, pending_clear:true, message:'Архив VPS очищен. Очистка роутера ожидает связи.'}));
|
||||||
|
}
|
||||||
|
if (url.pathname === '/api/routers') {res.setHeader('Content-Type','application/json'); return res.end(JSON.stringify({routers}));}
|
||||||
|
if (url.pathname.startsWith('/api/')) {res.setHeader('Content-Type','application/json'); return res.end('{}');}
|
||||||
|
res.setHeader('Content-Type', 'text/html; charset=utf-8');
|
||||||
|
const file = url.pathname === '/router/main/logs' ? 'vps-logs.html' : url.pathname === '/vps-terminal/' ? 'vps-terminal.html' : 'vps-dashboard.html';
|
||||||
|
res.end(fs.readFileSync(path.join(root, file)));
|
||||||
|
});
|
||||||
|
(async()=>{
|
||||||
|
await new Promise(resolve=>server.listen(0,'127.0.0.1',resolve));
|
||||||
|
const browser=await chromium.launch({headless:true,channel:'chrome'});
|
||||||
|
try{
|
||||||
|
for (const mobile of [false,true]) {
|
||||||
|
const page=await browser.newPage({viewport:mobile?{width:390,height:844}:{width:1280,height:900}});
|
||||||
|
// Compare the actual rendered backgrounds without starting a terminal.
|
||||||
|
const reference=await browser.newPage({viewport:page.viewportSize(),javascriptEnabled:false});
|
||||||
|
await reference.route('https://cdn.jsdelivr.net/**',route=>route.abort());
|
||||||
|
await reference.goto(`http://127.0.0.1:${server.address().port}/vps-terminal/`);
|
||||||
|
const terminalBackground=await reference.locator('body').evaluate(el=>{
|
||||||
|
const s=getComputedStyle(el);return {image:s.backgroundImage,color:s.backgroundColor,attachment:s.backgroundAttachment};
|
||||||
|
});
|
||||||
|
await reference.close();
|
||||||
|
const errors=[];page.on('pageerror',error=>errors.push(error.message));
|
||||||
|
await page.goto(`http://127.0.0.1:${server.address().port}/`);
|
||||||
|
const link=page.locator('[data-global-logs-link]');
|
||||||
|
await link.waitFor({state:'attached'});
|
||||||
|
assert.equal(await page.locator('#routerStats').isVisible(),true,'statistics are expanded at entry');
|
||||||
|
assert.equal(await page.locator('#routerStats .statCard').count(),3);
|
||||||
|
if(mobile){
|
||||||
|
const toggle=page.locator('#routerStatsToggle');
|
||||||
|
assert.equal(await toggle.textContent(),'Скрыть статистику');
|
||||||
|
assert.equal(await toggle.getAttribute('aria-expanded'),'true');
|
||||||
|
await toggle.click();
|
||||||
|
await page.evaluate(()=>loadRouters());
|
||||||
|
assert.equal(await page.locator('#routerStats').isVisible(),false,'refresh preserves manual collapse');
|
||||||
|
await toggle.click();
|
||||||
|
assert.equal(await page.locator('#routerStats').isVisible(),true);
|
||||||
|
}
|
||||||
|
assert.equal(await link.count(),1);
|
||||||
|
assert.equal(await link.getAttribute('target'),'_blank');
|
||||||
|
assert.equal(await link.getAttribute('rel'),'noopener noreferrer');
|
||||||
|
assert.equal(await link.getAttribute('href'),'/router/main/logs');
|
||||||
|
assert.equal(await link.evaluate(el=>el.classList.contains('disabled')),false);
|
||||||
|
await page.locator('[data-card-toggle]').count() && await page.locator('[data-card-toggle]').click();
|
||||||
|
if (mobile) await page.locator('[data-actions-toggle]').click();
|
||||||
|
assert.equal(await link.isVisible(),true,'offline card has enabled log link');
|
||||||
|
await page.screenshot({path:path.join(root,mobile?'vps-card-mobile.png':'vps-card-desktop.png'),fullPage:true});
|
||||||
|
const [popup] = await Promise.all([page.waitForEvent('popup'), link.click()]);
|
||||||
|
await popup.waitForLoadState('domcontentloaded');
|
||||||
|
assert.equal(new URL(popup.url()).pathname,'/router/main/logs');
|
||||||
|
assert.equal(new URL(page.url()).pathname,'/');
|
||||||
|
await popup.close();
|
||||||
|
text=initialText();const before=reads;
|
||||||
|
await page.goto(`http://127.0.0.1:${server.address().port}/router/main/logs`);
|
||||||
|
await page.waitForFunction(()=>document.querySelector('#logsText').textContent.includes('Event 119'));
|
||||||
|
assert.deepEqual(await page.locator('body').evaluate(el=>{
|
||||||
|
const s=getComputedStyle(el);return {image:s.backgroundImage,color:s.backgroundColor,attachment:s.backgroundAttachment};
|
||||||
|
}),terminalBackground,'log page uses the VPS terminal background');
|
||||||
|
if(mobile){
|
||||||
|
const legend=page.locator('.legend');
|
||||||
|
assert.equal(await legend.evaluate(el=>getComputedStyle(el).justifyContent),'center');
|
||||||
|
const bounds=await legend.evaluate(el=>{
|
||||||
|
const box=el.getBoundingClientRect(), first=el.firstElementChild.getBoundingClientRect(), last=el.lastElementChild.getBoundingClientRect();
|
||||||
|
return {center:(box.left+box.right)/2,contentCenter:(first.left+last.right)/2,rows:[first.top,last.top]};
|
||||||
|
});
|
||||||
|
assert.equal(bounds.rows[0],bounds.rows[1],'all three labels fit in one row');
|
||||||
|
assert(Math.abs(bounds.center-bounds.contentCenter)<2,'legend labels are centered');
|
||||||
|
}
|
||||||
|
assert.equal(reads,before+1);
|
||||||
|
assert((await page.locator('#logsStatus').textContent()).includes('Роутер оффлайн'));
|
||||||
|
assert((await page.locator('#logsDiagnosis').textContent()).includes('Remote выключен'));
|
||||||
|
assert.equal(await page.locator('#logsDiagnosis').evaluate(el=>getComputedStyle(el).color),'rgb(253, 230, 138)');
|
||||||
|
const lines=page.locator('#logsText .line');
|
||||||
|
assert.equal(await lines.nth(0).evaluate(el=>getComputedStyle(el).color),'rgb(248, 113, 113)');
|
||||||
|
assert.equal(await lines.nth(1).evaluate(el=>getComputedStyle(el).color),'rgb(253, 230, 138)');
|
||||||
|
assert.equal(await lines.nth(2).evaluate(el=>getComputedStyle(el).color),'rgb(134, 239, 172)');
|
||||||
|
await page.waitForTimeout(3200);
|
||||||
|
assert.equal(reads,before+1,'snapshot does not poll');
|
||||||
|
await page.locator('#logsLive').click();
|
||||||
|
await page.locator('#logsText').evaluate(el=>el.scrollTop=0);
|
||||||
|
await page.screenshot({path:path.join(root,mobile?'vps-logs-mobile.png':'vps-logs-desktop.png'),fullPage:true});
|
||||||
|
await page.locator('#logsText').evaluate(el=>el.scrollTop=40);
|
||||||
|
text+='\n[ERROR] <script>window.injected=1</script>\n[OK] Latest event';
|
||||||
|
await page.waitForFunction(()=>document.querySelector('#logsText').textContent.includes('Latest event'));
|
||||||
|
assert.equal(await page.locator('#logsText').evaluate(el=>el.scrollTop),40);
|
||||||
|
assert.equal(await page.evaluate(()=>window.injected),undefined);
|
||||||
|
assert.equal(await page.locator('#logsText script').count(),0);
|
||||||
|
assert(await page.evaluate(()=>document.documentElement.scrollWidth<=innerWidth));
|
||||||
|
await page.locator('#logsLive').click();
|
||||||
|
const stopped=reads;await page.waitForTimeout(3200);assert.equal(reads,stopped);
|
||||||
|
const beforeClear=clears;await page.locator('#logsClear').click();
|
||||||
|
await page.waitForFunction(()=>document.querySelector('#logsStatus').textContent.includes('очищен'));
|
||||||
|
assert.equal(clears,beforeClear+1);
|
||||||
|
assert.deepEqual(errors,[]);
|
||||||
|
await page.close();console.log('ROUTER_LOG_ARCHIVE_UI_OK',mobile?'mobile':'desktop');
|
||||||
|
}
|
||||||
|
}finally{await browser.close();server.close();}
|
||||||
|
})().catch(error=>{console.error(error);server.close();process.exitCode=1;});
|
||||||
@@ -0,0 +1,151 @@
|
|||||||
|
"""Exercise router delivery through the real helper and agent HTTP selection."""
|
||||||
|
import base64
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
from pathlib import Path
|
||||||
|
import subprocess
|
||||||
|
import sys
|
||||||
|
import unittest
|
||||||
|
|
||||||
|
import test_global_logs as journal_tests
|
||||||
|
|
||||||
|
ROOT, SH = journal_tests.ROOT, journal_tests.SH
|
||||||
|
|
||||||
|
|
||||||
|
@unittest.skipUnless(SH, 'POSIX shell required')
|
||||||
|
class RouterLogTransportTests(unittest.TestCase):
|
||||||
|
def setUp(self):
|
||||||
|
self.journal = journal_tests.GlobalLogTests()
|
||||||
|
self.journal.setUp()
|
||||||
|
self.addCleanup(self.journal.doCleanups)
|
||||||
|
self.journal.helper_call('append', 'Before disconnect\n')
|
||||||
|
self.source = (ROOT / 'files/usr/sbin/owrt-remote').read_text(encoding='utf-8').split('cmd="${1:-help}"')[0]
|
||||||
|
self.env = {**self.journal.env, 'OWRT_REMOTE_WAN_HELPER': (ROOT / 'files/usr/lib/owrt-remote/wan.sh').as_posix(),
|
||||||
|
'TEST_ROOT': self.journal.root.as_posix(), 'TEST_PYTHON': Path(sys.executable).as_posix()}
|
||||||
|
self.mocks = r'''
|
||||||
|
uci_get() {
|
||||||
|
case "$1" in
|
||||||
|
enabled) printf '%s' "${TEST_ENABLED:-1}" ;; hub_token) printf test-token ;; router_id) printf main ;;
|
||||||
|
wan_direct) printf '%s' "${TEST_DIRECT:-0}" ;; *) printf '%s' "$2" ;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
heartbeat_candidate_endpoints() { printf 'http://unavailable/api/heartbeat\nhttps://available/api/heartbeat\n'; }
|
||||||
|
wan_prepare() { echo prepare >>"$TEST_ROOT/requests"; [ "${TEST_WAN_FAIL:-0}" != 1 ]; }
|
||||||
|
xray_running() { [ "${TEST_XRAY_RUNNING:-0}" = 1 ]; }
|
||||||
|
wan_post_json() { echo direct >>"$TEST_ROOT/requests"; fake_post "$1" "$3"; }
|
||||||
|
curl() {
|
||||||
|
local file arg next url
|
||||||
|
next=0; file=''
|
||||||
|
for arg in "$@"; do
|
||||||
|
[ "$next" != 1 ] || { file="${arg#@}"; next=0; }
|
||||||
|
[ "$arg" != --data-binary ] || next=1
|
||||||
|
url="$arg"
|
||||||
|
done
|
||||||
|
fake_post "$url" "$file"
|
||||||
|
}
|
||||||
|
fake_post() {
|
||||||
|
echo "$1" >>"$TEST_ROOT/requests"
|
||||||
|
[ "${TEST_HTTP_FAIL:-0}" != 1 ] || return 22
|
||||||
|
case "$1" in http://unavailable/*) return 22 ;; esac
|
||||||
|
cp "$2" "$TEST_ROOT/delivered.json"
|
||||||
|
"$TEST_PYTHON" -c 'import json,sys; b=json.load(open(sys.argv[1]))["batch"]; print(json.dumps({"ok":True,"journal_id":b["journal_id"],"offset":b["to"],"clear_request":""}))' "$2"
|
||||||
|
}
|
||||||
|
jsonfilter() {
|
||||||
|
"$TEST_PYTHON" -c 'import json,sys; print(json.load(open(sys.argv[1])).get(sys.argv[2][2:],""))' "$2" "$4"
|
||||||
|
}
|
||||||
|
'''
|
||||||
|
|
||||||
|
def sync(self, **flags):
|
||||||
|
script = self.source + '\n' + self.mocks + '\nsync_global_logs\n'
|
||||||
|
return subprocess.run([SH], input=script, encoding='utf-8', capture_output=True,
|
||||||
|
env={**self.env, **flags}, timeout=25)
|
||||||
|
|
||||||
|
def test_fallback_and_direct_wan_ack_only_after_successful_delivery(self):
|
||||||
|
for direct in ('0', '1'):
|
||||||
|
with self.subTest(direct=direct):
|
||||||
|
self.journal.helper_call('clear')
|
||||||
|
self.journal.helper_call('append', 'Before disconnect\n')
|
||||||
|
(self.journal.root / 'requests').write_text('')
|
||||||
|
result = self.sync(TEST_DIRECT=direct)
|
||||||
|
self.assertEqual(result.returncode, 0, result.stderr)
|
||||||
|
payload = json.loads((self.journal.root / 'delivered.json').read_text())
|
||||||
|
self.assertEqual(payload['id'], 'main')
|
||||||
|
self.assertEqual(base64.b64decode(payload['batch']['data']), b'[OK] Before disconnect\n')
|
||||||
|
requests = (self.journal.root / 'requests').read_text()
|
||||||
|
self.assertIn('https://available/api/router-logs', requests)
|
||||||
|
self.assertEqual('direct' in requests, direct == '1')
|
||||||
|
self.assertEqual('prepare' in requests, direct == '1')
|
||||||
|
self.assertEqual(json.loads(self.journal.helper_call('export'))['data'], '')
|
||||||
|
self.assertFalse(list(self.journal.log_dir.glob('sync.*')))
|
||||||
|
|
||||||
|
def test_failed_delivery_preserves_unsent_records_and_removes_payload_files(self):
|
||||||
|
before = json.loads(self.journal.helper_call('export'))
|
||||||
|
result = self.sync(TEST_HTTP_FAIL='1')
|
||||||
|
self.assertEqual(result.returncode, 1, result.stderr)
|
||||||
|
self.assertEqual(json.loads(self.journal.helper_call('export')), before)
|
||||||
|
self.assertFalse(list(self.journal.log_dir.glob('sync.*')))
|
||||||
|
|
||||||
|
def test_disabled_remote_still_delivers_stop_reason_and_state_without_restart(self):
|
||||||
|
self.journal.helper_call('append', 'Сервис: остановка туннеля\n')
|
||||||
|
for direct in ('0', '1'):
|
||||||
|
with self.subTest(direct=direct):
|
||||||
|
result = self.sync(TEST_ENABLED='0', TEST_DIRECT=direct)
|
||||||
|
self.assertEqual(result.returncode, 0, result.stderr)
|
||||||
|
payload = json.loads((self.journal.root / 'delivered.json').read_text())
|
||||||
|
self.assertEqual(payload['state'], {'enabled': False, 'xray': 'stopped'})
|
||||||
|
self.assertFalse(list(self.journal.log_dir.glob('sync.*')))
|
||||||
|
self.assertEqual(json.loads(self.journal.helper_call('export'))['data'], '')
|
||||||
|
|
||||||
|
def test_overlapping_delivery_does_not_start_second_sender(self):
|
||||||
|
lock = self.journal.log_dir / 'sync-lock'
|
||||||
|
lock.mkdir()
|
||||||
|
# The shell's own PID is alive for the duration of sync_global_logs.
|
||||||
|
script = self.source + '\n' + self.mocks + '\nprintf "%s" "$$" >"$OWRT_REMOTE_LOG_DIR/sync-lock/pid"\nsync_global_logs\n'
|
||||||
|
result = subprocess.run([SH], input=script, encoding='utf-8', capture_output=True, env=self.env, timeout=20)
|
||||||
|
self.assertEqual(result.returncode, 0, result.stderr)
|
||||||
|
self.assertFalse((self.journal.root / 'requests').exists())
|
||||||
|
self.assertNotEqual(json.loads(self.journal.helper_call('export'))['data'], '')
|
||||||
|
|
||||||
|
def test_wan_failure_releases_delivery_lock_for_next_attempt(self):
|
||||||
|
result = self.sync(TEST_DIRECT='1', TEST_WAN_FAIL='1', TEST_ENABLED='0')
|
||||||
|
self.assertEqual(result.returncode, 1, result.stderr)
|
||||||
|
self.assertFalse((self.journal.log_dir / 'sync-lock').exists())
|
||||||
|
self.assertNotEqual(json.loads(self.journal.helper_call('export'))['data'], '')
|
||||||
|
self.assertEqual(self.sync(TEST_DIRECT='1', TEST_ENABLED='0').returncode, 0)
|
||||||
|
|
||||||
|
def test_abandoned_empty_delivery_lock_is_recovered(self):
|
||||||
|
(self.journal.log_dir / 'sync-lock').mkdir()
|
||||||
|
result = self.sync(TEST_ENABLED='0')
|
||||||
|
self.assertEqual(result.returncode, 0, result.stderr)
|
||||||
|
self.assertFalse((self.journal.log_dir / 'sync-lock').exists())
|
||||||
|
self.assertTrue((self.journal.root / 'delivered.json').exists())
|
||||||
|
|
||||||
|
def test_panel_stop_sends_completed_result_without_waiting_for_restart(self):
|
||||||
|
# Exercise the CGI action and real journal; replace only router services.
|
||||||
|
source = (ROOT / 'files/www/cgi-bin/owrt-remote').read_text(encoding='utf-8').split('\nread_request\n')[0]
|
||||||
|
source = source.replace('/etc/init.d/owrt-remote', 'mock_service')
|
||||||
|
agent = self.journal.root / 'mock-agent'
|
||||||
|
agent.write_text('''#!/bin/sh
|
||||||
|
if [ "$1" = logs-sync ]; then
|
||||||
|
sh "$OWRT_REMOTE_LOG_HELPER" read >"$TEST_ROOT/stop-delivery"
|
||||||
|
cat "$TEST_ROOT/enabled" >>"$TEST_ROOT/stop-delivery"
|
||||||
|
fi
|
||||||
|
''', encoding='utf-8', newline='\n')
|
||||||
|
agent.chmod(0o755)
|
||||||
|
source += r'''
|
||||||
|
uci_set() { [ "$1" != enabled ] || printf '%s' "$2" >"$TEST_ROOT/enabled"; }
|
||||||
|
uci() { return 0; }
|
||||||
|
mock_service() { return 0; }
|
||||||
|
run_action stop
|
||||||
|
wait
|
||||||
|
'''
|
||||||
|
result = subprocess.run([SH], input=source, encoding='utf-8', capture_output=True,
|
||||||
|
env={**self.env, 'AGENT': agent.as_posix()}, timeout=20)
|
||||||
|
self.assertEqual(result.returncode, 0, result.stderr)
|
||||||
|
delivered = (self.journal.root / 'stop-delivery').read_text(encoding='utf-8')
|
||||||
|
self.assertIn('Сервис остановлен; результат=warn', delivered)
|
||||||
|
self.assertTrue(delivered.endswith('0'), 'send runs after enabled=0 and the stop result is journaled')
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
unittest.main()
|
||||||
@@ -31,7 +31,7 @@ class WanStabilityRollbackTests(unittest.TestCase):
|
|||||||
source = (ROOT / "vps/deploy-wan-stability-fix.ps1").read_text(encoding="utf-8")
|
source = (ROOT / "vps/deploy-wan-stability-fix.ps1").read_text(encoding="utf-8")
|
||||||
script = source.split("$RemoteScript = @'\n", 1)[1].split("\n'@", 1)[0]
|
script = source.split("$RemoteScript = @'\n", 1)[1].split("\n'@", 1)[0]
|
||||||
script = script.replace('stage=/tmp/__UPLOAD_NAME__', 'stage=' + shlex.quote(self.stage.as_posix()))
|
script = script.replace('stage=/tmp/__UPLOAD_NAME__', 'stage=' + shlex.quote(self.stage.as_posix()))
|
||||||
script = script.replace('backup=/root/owrt-remote-backup-before-wan-stability-v115', 'backup=' + shlex.quote(self.backup.as_posix()))
|
script = script.replace('backup=/root/owrt-remote-backup-before-wan-stability-v116', 'backup=' + shlex.quote(self.backup.as_posix()))
|
||||||
script = script.replace('config=/etc/config/owrtremote', 'config=' + shlex.quote(self.files["config"].as_posix()))
|
script = script.replace('config=/etc/config/owrtremote', 'config=' + shlex.quote(self.files["config"].as_posix()))
|
||||||
for name, original in (("agent", "/usr/sbin/owrt-remote"), ("wan.sh", "/usr/lib/owrt-remote/wan.sh")):
|
for name, original in (("agent", "/usr/sbin/owrt-remote"), ("wan.sh", "/usr/lib/owrt-remote/wan.sh")):
|
||||||
script = script.replace('printf ' + original + ' ;;', "printf '%s' " + shlex.quote(self.files[name].as_posix()) + ' ;;')
|
script = script.replace('printf ' + original + ' ;;', "printf '%s' " + shlex.quote(self.files[name].as_posix()) + ' ;;')
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ class XrayMobileDeploymentTests(unittest.TestCase):
|
|||||||
source = (ROOT / "vps/deploy-xray-mobile-fix.ps1").read_text(encoding="utf-8")
|
source = (ROOT / "vps/deploy-xray-mobile-fix.ps1").read_text(encoding="utf-8")
|
||||||
self.script = source.split("$RemoteScript = @'\n", 1)[1].split("\n'@", 1)[0]
|
self.script = source.split("$RemoteScript = @'\n", 1)[1].split("\n'@", 1)[0]
|
||||||
self.script = self.script.replace("target=/www/cgi-bin/owrt-remote", "target=" + shlex.quote(self.target.as_posix()))
|
self.script = self.script.replace("target=/www/cgi-bin/owrt-remote", "target=" + shlex.quote(self.target.as_posix()))
|
||||||
self.script = self.script.replace("backup_dir=/root/owrt-remote-backup-before-xray-mobile-v115",
|
self.script = self.script.replace("backup_dir=/root/owrt-remote-backup-before-xray-mobile-v116",
|
||||||
"backup_dir=" + shlex.quote(self.backup_dir.as_posix()))
|
"backup_dir=" + shlex.quote(self.backup_dir.as_posix()))
|
||||||
|
|
||||||
def deploy(self, action, content=None, fail_verify=False):
|
def deploy(self, action, content=None, fail_verify=False):
|
||||||
|
|||||||
@@ -0,0 +1,150 @@
|
|||||||
|
param(
|
||||||
|
[Parameter(Mandatory = $true)][ValidateNotNullOrEmpty()][string]$Vps,
|
||||||
|
[ValidateSet('Install', 'Rollback')][string]$Action = 'Install',
|
||||||
|
[switch]$PrepareOnly
|
||||||
|
)
|
||||||
|
|
||||||
|
$ErrorActionPreference = 'Stop'
|
||||||
|
$RepoRoot = Split-Path -Parent $PSScriptRoot
|
||||||
|
$UploadName = 'owrt-global-logs-vps-' + [guid]::NewGuid().ToString('N')
|
||||||
|
$StageRoot = Join-Path ([System.IO.Path]::GetTempPath()) $UploadName
|
||||||
|
$Utf8 = [System.Text.UTF8Encoding]::new($false)
|
||||||
|
|
||||||
|
$RemoteScript = @'
|
||||||
|
#!/bin/sh
|
||||||
|
set -eu
|
||||||
|
stage=/tmp/__UPLOAD_NAME__
|
||||||
|
target=/opt/owrt-remote/owrt-remote-hub.py
|
||||||
|
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-global-logs-ui-v116
|
||||||
|
candidate=$target.new-__UPLOAD_NAME__
|
||||||
|
changed=0
|
||||||
|
|
||||||
|
show_failure() {
|
||||||
|
echo '--- owrt-remote status ---' >&2
|
||||||
|
systemctl --no-pager -l status owrt-remote >&2 || true
|
||||||
|
echo '--- owrt-remote journal ---' >&2
|
||||||
|
journalctl -u owrt-remote -n 80 --no-pager -l >&2 || true
|
||||||
|
}
|
||||||
|
|
||||||
|
cleanup() {
|
||||||
|
code=$?
|
||||||
|
trap - EXIT
|
||||||
|
if [ "$code" -ne 0 ]; then
|
||||||
|
echo "Remote step failed with rc=$code" >&2
|
||||||
|
show_failure
|
||||||
|
fi
|
||||||
|
if [ "$code" -ne 0 ] && [ "$changed" = 1 ] && [ -s "$stage/previous.py" ]; then
|
||||||
|
echo 'Restoring the previous Hub file...' >&2
|
||||||
|
cp -p "$stage/previous.py" "$candidate"
|
||||||
|
mv -f "$candidate" "$target"
|
||||||
|
systemctl restart owrt-remote || true
|
||||||
|
fi
|
||||||
|
rm -f "$candidate"
|
||||||
|
rm -rf "$stage"
|
||||||
|
exit "$code"
|
||||||
|
}
|
||||||
|
trap cleanup EXIT
|
||||||
|
|
||||||
|
test -s "$target"
|
||||||
|
python_bin=/opt/owrt-remote/venv/bin/python
|
||||||
|
[ -x "$python_bin" ] || python_bin=python3
|
||||||
|
|
||||||
|
if [ '__ACTION__' = Install ]; then
|
||||||
|
test -s "$stage/hub.py"
|
||||||
|
echo 'Validating candidate...'
|
||||||
|
"$python_bin" -m py_compile "$stage/hub.py"
|
||||||
|
"$python_bin" - "$stage/hub.py" <<'PY'
|
||||||
|
from pathlib import Path
|
||||||
|
import sys
|
||||||
|
source = Path(sys.argv[1]).read_text(encoding='utf-8')
|
||||||
|
required = (
|
||||||
|
'def receive_router_logs(',
|
||||||
|
'def router_log_diagnosis(',
|
||||||
|
'def router_logs_html(',
|
||||||
|
'def router_logs_api(',
|
||||||
|
'data-global-logs-link=',
|
||||||
|
'ROUTER_LOG_MAX_BYTES = 2 * 1024 * 1024',
|
||||||
|
)
|
||||||
|
missing = [marker for marker in required if marker not in source]
|
||||||
|
if missing:
|
||||||
|
for marker in missing:
|
||||||
|
print('Missing marker:', repr(marker), file=sys.stderr)
|
||||||
|
raise SystemExit(1)
|
||||||
|
print('Candidate validation OK')
|
||||||
|
PY
|
||||||
|
if [ ! -e "$backup" ]; then
|
||||||
|
cp -p "$target" "$backup"
|
||||||
|
fi
|
||||||
|
source_file="$stage/hub.py"
|
||||||
|
else
|
||||||
|
test -s "$backup"
|
||||||
|
"$python_bin" -m py_compile "$backup"
|
||||||
|
source_file="$backup"
|
||||||
|
fi
|
||||||
|
|
||||||
|
cp -p "$target" "$stage/previous.py"
|
||||||
|
cp "$source_file" "$candidate"
|
||||||
|
chmod 0755 "$candidate"
|
||||||
|
changed=1
|
||||||
|
mv -f "$candidate" "$target"
|
||||||
|
echo 'Restarting owrt-remote...'
|
||||||
|
if ! systemctl restart owrt-remote; then
|
||||||
|
show_failure
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
healthy=0
|
||||||
|
for attempt in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
|
||||||
|
if systemctl is-active --quiet owrt-remote && curl -fsS --max-time 5 http://127.0.0.1:8088/health; then
|
||||||
|
healthy=1
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
sleep 2
|
||||||
|
done
|
||||||
|
if [ "$healthy" -ne 1 ]; then
|
||||||
|
echo 'Health check did not become ready.' >&2
|
||||||
|
show_failure
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
cmp "$source_file" "$target"
|
||||||
|
printf '\nBackup: %s\nGLOBAL_LOGS_VPS_V116_%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') {
|
||||||
|
$Content = [System.IO.File]::ReadAllText((Join-Path $RepoRoot 'vps\owrt-remote-hub.py')).Replace("`r`n", "`n")
|
||||||
|
[System.IO.File]::WriteAllText((Join-Path $StageRoot 'hub.py'), $Content, $Utf8)
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($PrepareOnly) {
|
||||||
|
Write-Host "Prepared only: $StageRoot"
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
& scp -O -r -- $StageRoot "${Vps}:/tmp/"
|
||||||
|
if ($LASTEXITCODE -ne 0) { throw 'Upload failed. VPS was not changed.' }
|
||||||
|
& ssh -T -o ConnectTimeout=10 $Vps "sh /tmp/$UploadName/run.sh"
|
||||||
|
if ($LASTEXITCODE -ne 0) { throw "$Action failed. See the output above; success was not confirmed." }
|
||||||
|
Write-Host "Global logs VPS $Action finished successfully. Refresh Hub with Ctrl+F5."
|
||||||
|
}
|
||||||
|
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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -13,7 +13,7 @@ $RemoteScript = @'
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -eu
|
set -eu
|
||||||
stage=/tmp/__UPLOAD_NAME__
|
stage=/tmp/__UPLOAD_NAME__
|
||||||
backup=/root/owrt-remote-backup-before-global-logs-v115
|
backup=/root/owrt-remote-backup-before-global-logs-stop-v116
|
||||||
items='cgi agent init logs.sh logs-init luci'
|
items='cgi agent init logs.sh logs-init luci'
|
||||||
changed=0
|
changed=0
|
||||||
phase=preflight
|
phase=preflight
|
||||||
@@ -101,9 +101,13 @@ if [ '__ACTION__' = Install ]; then
|
|||||||
command -v logread >/dev/null
|
command -v logread >/dev/null
|
||||||
command -v ubus >/dev/null
|
command -v ubus >/dev/null
|
||||||
command -v mkfifo >/dev/null
|
command -v mkfifo >/dev/null
|
||||||
|
command -v base64 >/dev/null
|
||||||
|
command -v jsonfilter >/dev/null
|
||||||
grep -F -q 'globalLogsToggle' "$stage/cgi"
|
grep -F -q 'globalLogsToggle' "$stage/cgi"
|
||||||
for item in cgi luci; do grep -F -q 'v115' "$stage/$item"; done
|
for item in cgi luci; do grep -F -q 'v116' "$stage/$item"; done
|
||||||
grep -F -q 'LOG_KEEP_SECONDS=86400' "$stage/logs.sh"
|
grep -F -q 'LOG_KEEP_SECONDS=86400' "$stage/logs.sh"
|
||||||
|
grep -F -q 'log_sync_loop' "$stage/logs.sh"
|
||||||
|
grep -F -q 'sync_global_logs' "$stage/agent"
|
||||||
phase=backup
|
phase=backup
|
||||||
if [ ! -e "$backup" ]; then save_files "$stage/retained"; mv "$stage/retained" "$backup"; fi
|
if [ ! -e "$backup" ]; then save_files "$stage/retained"; mv "$stage/retained" "$backup"; fi
|
||||||
validate_backup "$backup" || { echo "Incomplete backup: $backup. Nothing changed." >&2; exit 1; }
|
validate_backup "$backup" || { echo "Incomplete backup: $backup. Nothing changed." >&2; exit 1; }
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ $RemoteScript = @'
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -eu
|
set -eu
|
||||||
stage=/tmp/__UPLOAD_NAME__
|
stage=/tmp/__UPLOAD_NAME__
|
||||||
backup=/root/owrt-remote-backup-before-heartbeat-redirect-v115
|
backup=/root/owrt-remote-backup-before-heartbeat-redirect-v116
|
||||||
agent=/usr/sbin/owrt-remote
|
agent=/usr/sbin/owrt-remote
|
||||||
wan=/usr/lib/owrt-remote/wan.sh
|
wan=/usr/lib/owrt-remote/wan.sh
|
||||||
changed=0
|
changed=0
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ param(
|
|||||||
[string]$PinnedVpsHost = '193.233.82.38',
|
[string]$PinnedVpsHost = '193.233.82.38',
|
||||||
[ValidatePattern('^[a-zA-Z0-9_-]+$')][string]$WanInterface = 'wan',
|
[ValidatePattern('^[a-zA-Z0-9_-]+$')][string]$WanInterface = 'wan',
|
||||||
[switch]$PreserveConnectionSettings,
|
[switch]$PreserveConnectionSettings,
|
||||||
[ValidatePattern('^[a-zA-Z0-9_-]+$')][string]$BackupName = 'host-policy-v115',
|
[ValidatePattern('^[a-zA-Z0-9_-]+$')][string]$BackupName = 'host-policy-v116',
|
||||||
[switch]$PrepareOnly
|
[switch]$PrepareOnly
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -90,7 +90,7 @@ test -s "$config"
|
|||||||
if [ '__ACTION__' = Install ]; then
|
if [ '__ACTION__' = Install ]; then
|
||||||
for item in agent wan.sh cgi init; do test -s "$stage/$item"; sh -n "$stage/$item"; done
|
for item in agent wan.sh cgi init; do test -s "$stage/$item"; sh -n "$stage/$item"; done
|
||||||
test -s "$stage/luci"
|
test -s "$stage/luci"
|
||||||
for item in cgi luci; do grep -F -q 'v115' "$stage/$item"; done
|
for item in cgi luci; do grep -F -q 'v116' "$stage/$item"; done
|
||||||
# curl is needed to preserve HTTPS SNI and bypass the local DNS/proxy.
|
# 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 curl >/dev/null 2>&1; then
|
||||||
if command -v opkg >/dev/null 2>&1; then opkg update && opkg install curl ca-bundle
|
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
|
exit 1
|
||||||
fi
|
fi
|
||||||
/usr/sbin/owrt-remote status
|
/usr/sbin/owrt-remote status
|
||||||
grep -F -q 'v115' /www/cgi-bin/owrt-remote
|
grep -F -q 'v116' /www/cgi-bin/owrt-remote
|
||||||
grep -F -q 'v115' /www/luci-static/resources/view/owrt_remote.js
|
grep -F -q 'v116' /www/luci-static/resources/view/owrt_remote.js
|
||||||
echo HOST_POLICY_ROUTER_V115_OK
|
echo HOST_POLICY_ROUTER_V116_OK
|
||||||
else
|
else
|
||||||
test -f "$backup/complete"
|
test -f "$backup/complete"
|
||||||
save_files "$stage/previous"
|
save_files "$stage/previous"
|
||||||
changed=1
|
changed=1
|
||||||
restore_files "$backup"
|
restore_files "$backup"
|
||||||
/usr/sbin/owrt-remote status
|
/usr/sbin/owrt-remote status
|
||||||
echo HOST_POLICY_ROUTER_V115_ROLLBACK_OK
|
echo HOST_POLICY_ROUTER_V116_ROLLBACK_OK
|
||||||
fi
|
fi
|
||||||
'@
|
'@
|
||||||
} else {
|
} else {
|
||||||
@@ -180,7 +180,7 @@ fi
|
|||||||
set -eu
|
set -eu
|
||||||
stage=/tmp/__UPLOAD_NAME__
|
stage=/tmp/__UPLOAD_NAME__
|
||||||
target=/opt/owrt-remote/owrt-remote-hub.py
|
target=/opt/owrt-remote/owrt-remote-hub.py
|
||||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-host-policy-v115
|
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-host-policy-v116
|
||||||
changed=0
|
changed=0
|
||||||
cleanup() {
|
cleanup() {
|
||||||
code=$?
|
code=$?
|
||||||
@@ -200,7 +200,7 @@ test -s "$target"
|
|||||||
python_bin=/opt/owrt-remote/venv/bin/python
|
python_bin=/opt/owrt-remote/venv/bin/python
|
||||||
[ -x "$python_bin" ] || python_bin=python3
|
[ -x "$python_bin" ] || python_bin=python3
|
||||||
if [ '__ACTION__' = Install ]; then
|
if [ '__ACTION__' = Install ]; then
|
||||||
grep -F -q 'v115' "$stage/hub.py"
|
grep -F -q 'v116' "$stage/hub.py"
|
||||||
"$python_bin" -m py_compile "$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_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
|
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
|
done
|
||||||
test "$healthy" = 1
|
test "$healthy" = 1
|
||||||
cmp "$candidate" "$target"
|
cmp "$candidate" "$target"
|
||||||
printf '\nHOST_POLICY_VPS_V115_%s_OK\n' '__ACTION__'
|
printf '\nHOST_POLICY_VPS_V116_%s_OK\n' '__ACTION__'
|
||||||
'@
|
'@
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ if ($Target -eq 'Router') {
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -eu
|
set -eu
|
||||||
stage=/tmp/__UPLOAD_NAME__
|
stage=/tmp/__UPLOAD_NAME__
|
||||||
backup=/root/owrt-remote-backup-before-hub-url-v115
|
backup=/root/owrt-remote-backup-before-hub-url-v116
|
||||||
chmod 700 "$stage"
|
chmod 700 "$stage"
|
||||||
config=/etc/config/owrtremote
|
config=/etc/config/owrtremote
|
||||||
changed=0
|
changed=0
|
||||||
@@ -99,7 +99,7 @@ if [ '__ACTION__' = Install ]; then
|
|||||||
grep -F -q 'heartbeat_set_url_if_changed()' "$stage/agent"
|
grep -F -q 'heartbeat_set_url_if_changed()' "$stage/agent"
|
||||||
grep -F -q 'reason=https-downgrade' "$stage/agent"
|
grep -F -q 'reason=https-downgrade' "$stage/agent"
|
||||||
for item in agent wan.sh; do grep -F -q -- '--post301' "$stage/$item"; done
|
for item in agent wan.sh; do grep -F -q -- '--post301' "$stage/$item"; done
|
||||||
for item in cgi luci; do grep -F -q 'v115' "$stage/$item"; done
|
for item in cgi luci; do grep -F -q 'v116' "$stage/$item"; done
|
||||||
if [ ! -e "$backup" ]; then
|
if [ ! -e "$backup" ]; then
|
||||||
save_files "$stage/retained-backup"
|
save_files "$stage/retained-backup"
|
||||||
mv "$stage/retained-backup" "$backup"
|
mv "$stage/retained-backup" "$backup"
|
||||||
@@ -138,7 +138,7 @@ else
|
|||||||
changed=1
|
changed=1
|
||||||
restore_files "$backup"
|
restore_files "$backup"
|
||||||
fi
|
fi
|
||||||
printf '\nBackup: %s\nHUB_URL_ROUTER_V115_%s_OK\n' "$backup" '__ACTION__'
|
printf '\nBackup: %s\nHUB_URL_ROUTER_V116_%s_OK\n' "$backup" '__ACTION__'
|
||||||
'@
|
'@
|
||||||
} else {
|
} else {
|
||||||
$Payloads = @{
|
$Payloads = @{
|
||||||
@@ -152,7 +152,7 @@ set -eu
|
|||||||
stage=/tmp/__UPLOAD_NAME__
|
stage=/tmp/__UPLOAD_NAME__
|
||||||
target=/opt/owrt-remote/owrt-remote-hub.py
|
target=/opt/owrt-remote/owrt-remote-hub.py
|
||||||
chmod 700 "$stage"
|
chmod 700 "$stage"
|
||||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-hub-url-v115
|
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-hub-url-v116
|
||||||
candidate=$target.new-__UPLOAD_NAME__
|
candidate=$target.new-__UPLOAD_NAME__
|
||||||
changed=0
|
changed=0
|
||||||
cleanup() {
|
cleanup() {
|
||||||
@@ -174,7 +174,7 @@ python_bin=/opt/owrt-remote/venv/bin/python
|
|||||||
[ -x "$python_bin" ] || python_bin=python3
|
[ -x "$python_bin" ] || python_bin=python3
|
||||||
if [ '__ACTION__' = Install ]; then
|
if [ '__ACTION__' = Install ]; then
|
||||||
grep -F -q 'def router_hub_origins(' "$stage/hub.py"
|
grep -F -q 'def router_hub_origins(' "$stage/hub.py"
|
||||||
grep -F -q 'v115' "$stage/hub.py"
|
grep -F -q 'v116' "$stage/hub.py"
|
||||||
"$python_bin" -m py_compile "$stage/hub.py"
|
"$python_bin" -m py_compile "$stage/hub.py"
|
||||||
OWRT_HOST_POLICY_HUB_SOURCE="$stage/hub.py" "$python_bin" "$stage/host_policy.py" HostPolicyTests -v
|
OWRT_HOST_POLICY_HUB_SOURCE="$stage/hub.py" "$python_bin" "$stage/host_policy.py" HostPolicyTests -v
|
||||||
OWRT_RESOURCE_HUB_SOURCE="$stage/hub.py" "$python_bin" "$stage/resources.py" IntegrationTests -v
|
OWRT_RESOURCE_HUB_SOURCE="$stage/hub.py" "$python_bin" "$stage/resources.py" IntegrationTests -v
|
||||||
@@ -198,7 +198,7 @@ for attempt in 1 2 3 4 5 6 7 8 9 10; do
|
|||||||
done
|
done
|
||||||
test "$healthy" = 1
|
test "$healthy" = 1
|
||||||
cmp "$source_file" "$target"
|
cmp "$source_file" "$target"
|
||||||
printf '\nBackup: %s\nHUB_URL_VPS_V115_%s_OK\n' "$backup" '__ACTION__'
|
printf '\nBackup: %s\nHUB_URL_VPS_V116_%s_OK\n' "$backup" '__ACTION__'
|
||||||
'@
|
'@
|
||||||
}
|
}
|
||||||
$RemoteScript = $RemoteScript.Replace('__UPLOAD_NAME__', $UploadName).Replace('__ACTION__', $Action).Replace('__HUB_URL__', $HubUrl)
|
$RemoteScript = $RemoteScript.Replace('__UPLOAD_NAME__', $UploadName).Replace('__ACTION__', $Action).Replace('__HUB_URL__', $HubUrl)
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ $RemoteScript = @'
|
|||||||
set -eu
|
set -eu
|
||||||
stage=/tmp/__UPLOAD_NAME__
|
stage=/tmp/__UPLOAD_NAME__
|
||||||
target=/opt/owrt-remote/owrt-remote-hub.py
|
target=/opt/owrt-remote/owrt-remote-hub.py
|
||||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-online-status-v115
|
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-online-status-v116
|
||||||
candidate=$target.new-__UPLOAD_NAME__
|
candidate=$target.new-__UPLOAD_NAME__
|
||||||
changed=0
|
changed=0
|
||||||
cleanup() {
|
cleanup() {
|
||||||
@@ -59,7 +59,7 @@ for attempt in 1 2 3 4 5 6 7 8 9 10; do
|
|||||||
done
|
done
|
||||||
test "$healthy" = 1
|
test "$healthy" = 1
|
||||||
cmp "$source_file" "$target"
|
cmp "$source_file" "$target"
|
||||||
printf '\nBackup: %s\nONLINE_STATUS_V115_%s_OK\n' "$backup" '__ACTION__'
|
printf '\nBackup: %s\nONLINE_STATUS_V116_%s_OK\n' "$backup" '__ACTION__'
|
||||||
'@
|
'@
|
||||||
$RemoteScript = $RemoteScript.Replace('__UPLOAD_NAME__', $UploadName).Replace('__ACTION__', $Action)
|
$RemoteScript = $RemoteScript.Replace('__UPLOAD_NAME__', $UploadName).Replace('__ACTION__', $Action)
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ $RemoteScript = @'
|
|||||||
set -eu
|
set -eu
|
||||||
stage=/tmp/__UPLOAD_NAME__
|
stage=/tmp/__UPLOAD_NAME__
|
||||||
target=/opt/owrt-remote/owrt-remote-hub.py
|
target=/opt/owrt-remote/owrt-remote-hub.py
|
||||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-password-logout-v115
|
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-password-logout-v116
|
||||||
candidate=$target.new-__UPLOAD_NAME__
|
candidate=$target.new-__UPLOAD_NAME__
|
||||||
changed=0
|
changed=0
|
||||||
|
|
||||||
@@ -105,7 +105,7 @@ if [ "$healthy" -ne 1 ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
cmp "$source_file" "$target"
|
cmp "$source_file" "$target"
|
||||||
printf '\nBackup: %s\nPASSWORD_LOGOUT_V115_%s_OK\n' "$backup" '__ACTION__'
|
printf '\nBackup: %s\nPASSWORD_LOGOUT_V116_%s_OK\n' "$backup" '__ACTION__'
|
||||||
'@
|
'@
|
||||||
|
|
||||||
$RemoteScript = $RemoteScript.Replace('__UPLOAD_NAME__', $UploadName).Replace('__ACTION__', $Action)
|
$RemoteScript = $RemoteScript.Replace('__UPLOAD_NAME__', $UploadName).Replace('__ACTION__', $Action)
|
||||||
|
|||||||
@@ -17,8 +17,8 @@ if ($Action -eq 'Install') {
|
|||||||
set -Eeuo pipefail
|
set -Eeuo pipefail
|
||||||
stage=/tmp/__UPLOAD_NAME__
|
stage=/tmp/__UPLOAD_NAME__
|
||||||
target=/opt/owrt-remote/owrt-remote-hub.py
|
target=/opt/owrt-remote/owrt-remote-hub.py
|
||||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-recaptcha-v3-v115
|
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-recaptcha-v3-v116
|
||||||
captcha_backup=/opt/owrt-remote/captcha-before-recaptcha-v3-v115.json
|
captcha_backup=/opt/owrt-remote/captcha-before-recaptcha-v3-v116.json
|
||||||
candidate=$target.new-__UPLOAD_NAME__
|
candidate=$target.new-__UPLOAD_NAME__
|
||||||
changed=0
|
changed=0
|
||||||
cleanup() {
|
cleanup() {
|
||||||
@@ -45,7 +45,7 @@ if [ ! -x "$python_bin" ]; then python_bin=python3; fi
|
|||||||
import ast, pathlib, sys
|
import ast, pathlib, sys
|
||||||
source = pathlib.Path(sys.argv[1]).read_text(encoding='utf-8')
|
source = pathlib.Path(sys.argv[1]).read_text(encoding='utf-8')
|
||||||
tree = ast.parse(source)
|
tree = ast.parse(source)
|
||||||
assert 'v115' in source
|
assert 'v116' in source
|
||||||
assert 'v108' not in source
|
assert 'v108' not in source
|
||||||
assert 'CAPTCHA_MODE_RECAPTCHA_V3' in source
|
assert 'CAPTCHA_MODE_RECAPTCHA_V3' in source
|
||||||
assert 'prepareLoginRecaptcha' in source
|
assert 'prepareLoginRecaptcha' in source
|
||||||
@@ -88,7 +88,7 @@ pid=$(systemctl show owrt-remote -p MainPID --value)
|
|||||||
test "$pid" -gt 0
|
test "$pid" -gt 0
|
||||||
printf 'PID=%s FD=%s\n' "$pid" "$(find /proc/$pid/fd -maxdepth 1 -type l | wc -l)"
|
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'
|
systemctl --no-pager --full status owrt-remote | sed -n '1,16p'
|
||||||
echo RECAPTCHA_V3_V115_OK
|
echo RECAPTCHA_V3_V116_OK
|
||||||
'@
|
'@
|
||||||
} elseif ($Action -eq 'Rollback') {
|
} elseif ($Action -eq 'Rollback') {
|
||||||
$RemoteScript = @'
|
$RemoteScript = @'
|
||||||
@@ -96,8 +96,8 @@ echo RECAPTCHA_V3_V115_OK
|
|||||||
set -Eeuo pipefail
|
set -Eeuo pipefail
|
||||||
stage=/tmp/__UPLOAD_NAME__
|
stage=/tmp/__UPLOAD_NAME__
|
||||||
target=/opt/owrt-remote/owrt-remote-hub.py
|
target=/opt/owrt-remote/owrt-remote-hub.py
|
||||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-recaptcha-v3-v115
|
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-recaptcha-v3-v116
|
||||||
captcha_backup=/opt/owrt-remote/captcha-before-recaptcha-v3-v115.json
|
captcha_backup=/opt/owrt-remote/captcha-before-recaptcha-v3-v116.json
|
||||||
candidate=$target.rollback-__UPLOAD_NAME__
|
candidate=$target.rollback-__UPLOAD_NAME__
|
||||||
changed=0
|
changed=0
|
||||||
restore_captcha() {
|
restore_captcha() {
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ if ($Action -eq 'Install') {
|
|||||||
set -Eeuo pipefail
|
set -Eeuo pipefail
|
||||||
stage=/tmp/__UPLOAD_NAME__
|
stage=/tmp/__UPLOAD_NAME__
|
||||||
target=/opt/owrt-remote/owrt-remote-hub.py
|
target=/opt/owrt-remote/owrt-remote-hub.py
|
||||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-resource-fix-v115
|
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-resource-fix-v116
|
||||||
candidate=$target.new-__UPLOAD_NAME__
|
candidate=$target.new-__UPLOAD_NAME__
|
||||||
changed=0
|
changed=0
|
||||||
cleanup() {
|
cleanup() {
|
||||||
@@ -45,7 +45,7 @@ if [ ! -x "$python_bin" ]; then python_bin=python3; fi
|
|||||||
import ast, pathlib, sys
|
import ast, pathlib, sys
|
||||||
source = pathlib.Path(sys.argv[1]).read_text(encoding='utf-8')
|
source = pathlib.Path(sys.argv[1]).read_text(encoding='utf-8')
|
||||||
tree = ast.parse(source)
|
tree = ast.parse(source)
|
||||||
assert 'v115' in source
|
assert 'v116' in source
|
||||||
assert 'v108' not in source
|
assert 'v108' not in source
|
||||||
factory = next(node for node in tree.body if isinstance(node, ast.FunctionDef) and node.name == 'connect')
|
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)
|
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
|
test "$pid" -gt 0
|
||||||
printf 'PID=%s FD=%s\n' "$pid" "$(find /proc/$pid/fd -maxdepth 1 -type l | wc -l)"
|
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'
|
systemctl --no-pager --full status owrt-remote | sed -n '1,16p'
|
||||||
echo RESOURCE_FIX_V115_OK
|
echo RESOURCE_FIX_V116_OK
|
||||||
'@
|
'@
|
||||||
} elseif ($Action -eq 'Rollback') {
|
} elseif ($Action -eq 'Rollback') {
|
||||||
$RemoteScript = @'
|
$RemoteScript = @'
|
||||||
@@ -86,7 +86,7 @@ echo RESOURCE_FIX_V115_OK
|
|||||||
set -Eeuo pipefail
|
set -Eeuo pipefail
|
||||||
stage=/tmp/__UPLOAD_NAME__
|
stage=/tmp/__UPLOAD_NAME__
|
||||||
target=/opt/owrt-remote/owrt-remote-hub.py
|
target=/opt/owrt-remote/owrt-remote-hub.py
|
||||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-resource-fix-v115
|
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-resource-fix-v116
|
||||||
candidate=$target.rollback-__UPLOAD_NAME__
|
candidate=$target.rollback-__UPLOAD_NAME__
|
||||||
changed=0
|
changed=0
|
||||||
cleanup() {
|
cleanup() {
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ $RemoteScript = @'
|
|||||||
set -eu
|
set -eu
|
||||||
stage=/tmp/__UPLOAD_NAME__
|
stage=/tmp/__UPLOAD_NAME__
|
||||||
target=/opt/owrt-remote/owrt-remote-hub.py
|
target=/opt/owrt-remote/owrt-remote-hub.py
|
||||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-router-card-ui-v115
|
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-router-card-ui-v116
|
||||||
candidate=$target.new-__UPLOAD_NAME__
|
candidate=$target.new-__UPLOAD_NAME__
|
||||||
changed=0
|
changed=0
|
||||||
|
|
||||||
@@ -106,7 +106,7 @@ if [ "$healthy" -ne 1 ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
cmp "$source_file" "$target"
|
cmp "$source_file" "$target"
|
||||||
printf '\nBackup: %s\nROUTER_CARD_UI_V115_%s_OK\n' "$backup" '__ACTION__'
|
printf '\nBackup: %s\nROUTER_CARD_UI_V116_%s_OK\n' "$backup" '__ACTION__'
|
||||||
'@
|
'@
|
||||||
|
|
||||||
$RemoteScript = $RemoteScript.Replace('__UPLOAD_NAME__', $UploadName).Replace('__ACTION__', $Action)
|
$RemoteScript = $RemoteScript.Replace('__UPLOAD_NAME__', $UploadName).Replace('__ACTION__', $Action)
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ param(
|
|||||||
|
|
||||||
$ErrorActionPreference = 'Stop'
|
$ErrorActionPreference = 'Stop'
|
||||||
$RepoRoot = Split-Path -Parent $PSScriptRoot
|
$RepoRoot = Split-Path -Parent $PSScriptRoot
|
||||||
$UploadName = 'owrt-version-v115-' + [guid]::NewGuid().ToString('N')
|
$UploadName = 'owrt-version-v116-' + [guid]::NewGuid().ToString('N')
|
||||||
$StageRoot = Join-Path ([System.IO.Path]::GetTempPath()) $UploadName
|
$StageRoot = Join-Path ([System.IO.Path]::GetTempPath()) $UploadName
|
||||||
$Utf8 = [System.Text.UTF8Encoding]::new($false)
|
$Utf8 = [System.Text.UTF8Encoding]::new($false)
|
||||||
|
|
||||||
@@ -15,7 +15,7 @@ $RemoteScript = @'
|
|||||||
set -eu
|
set -eu
|
||||||
stage=/tmp/__UPLOAD_NAME__
|
stage=/tmp/__UPLOAD_NAME__
|
||||||
target=/opt/owrt-remote/owrt-remote-hub.py
|
target=/opt/owrt-remote/owrt-remote-hub.py
|
||||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-v115
|
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-v116
|
||||||
candidate=$target.new-__UPLOAD_NAME__
|
candidate=$target.new-__UPLOAD_NAME__
|
||||||
changed=0
|
changed=0
|
||||||
|
|
||||||
@@ -57,8 +57,8 @@ if [ '__ACTION__' = Install ]; then
|
|||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
import sys
|
import sys
|
||||||
source = Path(sys.argv[1]).read_text(encoding='utf-8')
|
source = Path(sys.argv[1]).read_text(encoding='utf-8')
|
||||||
required = ('v115',)
|
required = ('v116',)
|
||||||
if 'v' + '114' in source:
|
if 'v' + '115' in source:
|
||||||
print('Old UI version remains in candidate', file=sys.stderr)
|
print('Old UI version remains in candidate', file=sys.stderr)
|
||||||
raise SystemExit(1)
|
raise SystemExit(1)
|
||||||
missing = [marker for marker in required if marker not in source]
|
missing = [marker for marker in required if marker not in source]
|
||||||
@@ -103,7 +103,7 @@ if [ "$healthy" -ne 1 ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
cmp "$source_file" "$target"
|
cmp "$source_file" "$target"
|
||||||
printf '\nBackup: %s\nHUB_V115_%s_OK\n' "$backup" '__ACTION__'
|
printf '\nBackup: %s\nHUB_V116_%s_OK\n' "$backup" '__ACTION__'
|
||||||
'@
|
'@
|
||||||
|
|
||||||
$RemoteScript = $RemoteScript.Replace('__UPLOAD_NAME__', $UploadName).Replace('__ACTION__', $Action)
|
$RemoteScript = $RemoteScript.Replace('__UPLOAD_NAME__', $UploadName).Replace('__ACTION__', $Action)
|
||||||
@@ -130,7 +130,7 @@ try {
|
|||||||
if ($LASTEXITCODE -ne 0) { throw 'Upload failed. VPS was not changed.' }
|
if ($LASTEXITCODE -ne 0) { throw 'Upload failed. VPS was not changed.' }
|
||||||
& ssh -T -o ConnectTimeout=10 $Vps "sh /tmp/$UploadName/run.sh"
|
& ssh -T -o ConnectTimeout=10 $Vps "sh /tmp/$UploadName/run.sh"
|
||||||
if ($LASTEXITCODE -ne 0) { throw "$Action failed. See the output above; success was not confirmed." }
|
if ($LASTEXITCODE -ne 0) { throw "$Action failed. See the output above; success was not confirmed." }
|
||||||
Write-Host "Hub v115 $Action finished successfully. Refresh the Hub panel."
|
Write-Host "Hub v116 $Action finished successfully. Refresh the Hub panel."
|
||||||
}
|
}
|
||||||
finally {
|
finally {
|
||||||
if (-not $PrepareOnly) {
|
if (-not $PrepareOnly) {
|
||||||
@@ -14,7 +14,7 @@ $RemoteScript = @'
|
|||||||
set -eu
|
set -eu
|
||||||
stage=/tmp/__UPLOAD_NAME__
|
stage=/tmp/__UPLOAD_NAME__
|
||||||
target=/opt/owrt-remote/owrt-remote-hub.py
|
target=/opt/owrt-remote/owrt-remote-hub.py
|
||||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-vps-widgets-v115
|
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-vps-widgets-v116
|
||||||
candidate=$target.new-__UPLOAD_NAME__
|
candidate=$target.new-__UPLOAD_NAME__
|
||||||
changed=0
|
changed=0
|
||||||
cleanup() {
|
cleanup() {
|
||||||
@@ -37,7 +37,7 @@ python_bin=/opt/owrt-remote/venv/bin/python
|
|||||||
[ -x "$python_bin" ] || python_bin=python3
|
[ -x "$python_bin" ] || python_bin=python3
|
||||||
if [ '__ACTION__' = Install ]; then
|
if [ '__ACTION__' = Install ]; then
|
||||||
test -s "$stage/hub.py"
|
test -s "$stage/hub.py"
|
||||||
grep -F -q 'v115' "$stage/hub.py"
|
grep -F -q 'v116' "$stage/hub.py"
|
||||||
"$python_bin" -m py_compile "$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
|
OWRT_VPS_WIDGETS_HUB_SOURCE="$stage/hub.py" "$python_bin" "$stage/tests.py" -v
|
||||||
if [ ! -e "$backup" ]; then cp -p "$target" "$backup"; fi
|
if [ ! -e "$backup" ]; then cp -p "$target" "$backup"; fi
|
||||||
@@ -67,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)
|
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
|
test "$code" = 401
|
||||||
fi
|
fi
|
||||||
printf '\nVPS_WIDGETS_V115_%s_OK\n' '__ACTION__'
|
printf '\nVPS_WIDGETS_V116_%s_OK\n' '__ACTION__'
|
||||||
'@
|
'@
|
||||||
$RemoteScript = $RemoteScript.Replace('__UPLOAD_NAME__', $UploadName).Replace('__ACTION__', $Action)
|
$RemoteScript = $RemoteScript.Replace('__UPLOAD_NAME__', $UploadName).Replace('__ACTION__', $Action)
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ $RemoteScript = @'
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -eu
|
set -eu
|
||||||
stage=/tmp/__UPLOAD_NAME__
|
stage=/tmp/__UPLOAD_NAME__
|
||||||
backup=/root/owrt-remote-backup-before-wan-multi-v115
|
backup=/root/owrt-remote-backup-before-wan-multi-v116
|
||||||
config=/etc/config/owrtremote
|
config=/etc/config/owrtremote
|
||||||
changed=0
|
changed=0
|
||||||
item_path() {
|
item_path() {
|
||||||
@@ -81,7 +81,7 @@ test -s "$config"
|
|||||||
if [ '__ACTION__' = Install ]; then
|
if [ '__ACTION__' = Install ]; then
|
||||||
for item in agent wan.sh cgi hotplug; do test -s "$stage/$item"; sh -n "$stage/$item"; done
|
for item in agent wan.sh cgi hotplug; do test -s "$stage/$item"; sh -n "$stage/$item"; done
|
||||||
test -s "$stage/luci"
|
test -s "$stage/luci"
|
||||||
for item in cgi luci; do grep -F -q 'v115' "$stage/$item"; done
|
for item in cgi luci; do grep -F -q 'v116' "$stage/$item"; done
|
||||||
grep -F -q 'wan_interface_picker' "$stage/cgi"
|
grep -F -q 'wan_interface_picker' "$stage/cgi"
|
||||||
grep -F -q 'wan_select_interface()' "$stage/wan.sh"
|
grep -F -q 'wan_select_interface()' "$stage/wan.sh"
|
||||||
grep -F -q 'wan_reconcile_xray()' "$stage/agent"
|
grep -F -q 'wan_reconcile_xray()' "$stage/agent"
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ $RemoteScript = @'
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -eu
|
set -eu
|
||||||
stage=/tmp/__UPLOAD_NAME__
|
stage=/tmp/__UPLOAD_NAME__
|
||||||
backup=/root/owrt-remote-backup-before-wan-stability-v115
|
backup=/root/owrt-remote-backup-before-wan-stability-v116
|
||||||
config=/etc/config/owrtremote
|
config=/etc/config/owrtremote
|
||||||
changed=0
|
changed=0
|
||||||
fail() {
|
fail() {
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ $RemoteScript = @'
|
|||||||
set -eu
|
set -eu
|
||||||
stage=/tmp/__UPLOAD_NAME__
|
stage=/tmp/__UPLOAD_NAME__
|
||||||
target=/opt/owrt-remote/owrt-remote-hub.py
|
target=/opt/owrt-remote/owrt-remote-hub.py
|
||||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-web-push-v115
|
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-web-push-v116
|
||||||
candidate=$target.new-__UPLOAD_NAME__
|
candidate=$target.new-__UPLOAD_NAME__
|
||||||
changed=0
|
changed=0
|
||||||
|
|
||||||
@@ -72,7 +72,7 @@ for attempt in 1 2 3 4 5 6 7 8 9 10; do
|
|||||||
done
|
done
|
||||||
test "$healthy" = 1
|
test "$healthy" = 1
|
||||||
cmp "$source_file" "$target"
|
cmp "$source_file" "$target"
|
||||||
printf '\nBackup: %s\nWEB_PUSH_V115_%s_OK\n' "$backup" '__ACTION__'
|
printf '\nBackup: %s\nWEB_PUSH_V116_%s_OK\n' "$backup" '__ACTION__'
|
||||||
'@
|
'@
|
||||||
|
|
||||||
$RemoteScript = $RemoteScript.Replace('__UPLOAD_NAME__', $UploadName).Replace('__ACTION__', $Action)
|
$RemoteScript = $RemoteScript.Replace('__UPLOAD_NAME__', $UploadName).Replace('__ACTION__', $Action)
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ $RemoteScript = @'
|
|||||||
set -eu
|
set -eu
|
||||||
stage=/tmp/__UPLOAD_NAME__
|
stage=/tmp/__UPLOAD_NAME__
|
||||||
target=/www/cgi-bin/owrt-remote
|
target=/www/cgi-bin/owrt-remote
|
||||||
backup_dir=/root/owrt-remote-backup-before-xray-apply-v115
|
backup_dir=/root/owrt-remote-backup-before-xray-apply-v116
|
||||||
backup=$backup_dir/owrt-remote
|
backup=$backup_dir/owrt-remote
|
||||||
candidate=$target.new-__UPLOAD_NAME__
|
candidate=$target.new-__UPLOAD_NAME__
|
||||||
changed=0
|
changed=0
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ $RemoteScript = @'
|
|||||||
set -eu
|
set -eu
|
||||||
stage=/tmp/__UPLOAD_NAME__
|
stage=/tmp/__UPLOAD_NAME__
|
||||||
target=/www/cgi-bin/owrt-remote
|
target=/www/cgi-bin/owrt-remote
|
||||||
backup_dir=/root/owrt-remote-backup-before-xray-mobile-v115
|
backup_dir=/root/owrt-remote-backup-before-xray-mobile-v116
|
||||||
backup=$backup_dir/owrt-remote
|
backup=$backup_dir/owrt-remote
|
||||||
candidate=$target.new-__UPLOAD_NAME__
|
candidate=$target.new-__UPLOAD_NAME__
|
||||||
changed=0
|
changed=0
|
||||||
|
|||||||
+315
-7
@@ -3083,6 +3083,158 @@ def clean_router_name(value):
|
|||||||
|
|
||||||
|
|
||||||
ROUTER_NOTE_TEXT_MAX_CHARS = 2000
|
ROUTER_NOTE_TEXT_MAX_CHARS = 2000
|
||||||
|
ROUTER_LOG_MAX_BYTES = 2 * 1024 * 1024
|
||||||
|
ROUTER_LOG_BATCH_MAX_BYTES = 65536
|
||||||
|
|
||||||
|
|
||||||
|
def redact_router_log_bytes(raw):
|
||||||
|
"""Defense in depth: do not archive credentials supplied by older agents."""
|
||||||
|
secret = re.compile(rb'authorization|hub_token|vless_uuid|ssh_vless_uuid|password|passwd|web[._ -]?key|[?&](?:key|token)=|"(?:uuid|privatekey)"|[0-9a-f]{8}-[0-9a-f-]{27,}', re.I)
|
||||||
|
redacted = []
|
||||||
|
for line in raw.splitlines(keepends=True):
|
||||||
|
if secret.search(line):
|
||||||
|
level = re.match(rb'\[(OK|WARN|ERROR)\]', line)
|
||||||
|
prefix = level.group(0) if level else b'[WARN]'
|
||||||
|
line = prefix + ' [строка с ключом или паролем скрыта]\n'.encode('utf-8')
|
||||||
|
redacted.append(line)
|
||||||
|
return b''.join(redacted)
|
||||||
|
|
||||||
|
|
||||||
|
def receive_router_logs(conn, router_id, batch, state=None):
|
||||||
|
router_id = clean_router_id(router_id)
|
||||||
|
if not get_active_router(conn, router_id):
|
||||||
|
raise ValueError('router not found; send a heartbeat first')
|
||||||
|
if not isinstance(batch, dict):
|
||||||
|
raise ValueError('invalid log batch')
|
||||||
|
journal_id = str(batch.get('journal_id') or '')
|
||||||
|
clear_ack = str(batch.get('clear_ack') or '')
|
||||||
|
if not re.fullmatch(r'[A-Za-z0-9._:-]{1,80}', journal_id) or (clear_ack and not re.fullmatch(r'[A-Za-z0-9._:-]{1,80}', clear_ack)):
|
||||||
|
raise ValueError('invalid log journal id')
|
||||||
|
start, end = batch.get('from'), batch.get('to')
|
||||||
|
if type(start) is not int or type(end) is not int or not 0 <= start <= end <= 2**53:
|
||||||
|
raise ValueError('invalid log cursor')
|
||||||
|
data = batch.get('data')
|
||||||
|
if not isinstance(data, str) or len(data) > 87384:
|
||||||
|
raise ValueError('log batch is too large')
|
||||||
|
raw = base64.b64decode(data, validate=True)
|
||||||
|
if len(raw) > ROUTER_LOG_BATCH_MAX_BYTES or end - start != len(raw):
|
||||||
|
raise ValueError('invalid log batch size')
|
||||||
|
ts = now_ts()
|
||||||
|
# Serialize ingestion and offline clears using SQLite's existing transaction.
|
||||||
|
conn.execute('update router_logs set last_sync = last_sync where router_id = ?', (router_id,))
|
||||||
|
row = conn.execute('select * from router_logs where router_id = ?', (router_id,)).fetchone()
|
||||||
|
if row is None:
|
||||||
|
conn.execute('insert into router_logs(router_id) values (?)', (router_id,))
|
||||||
|
row = conn.execute('select * from router_logs where router_id = ?', (router_id,)).fetchone()
|
||||||
|
if state is not None:
|
||||||
|
if (not isinstance(state, dict) or type(state.get('enabled')) is not bool
|
||||||
|
or state.get('xray') not in {'running', 'stopped'}):
|
||||||
|
raise ValueError('invalid log delivery state')
|
||||||
|
conn.execute('update router_logs set state_json = ?, state_at = ? where router_id = ?',
|
||||||
|
(json.dumps({'enabled': state['enabled'], 'xray': state['xray']}), ts, router_id))
|
||||||
|
pending = row['clear_request']
|
||||||
|
if pending and clear_ack != pending:
|
||||||
|
conn.execute('update router_logs set last_sync = ? where router_id = ?', (ts, router_id))
|
||||||
|
return {'journal_id': journal_id, 'offset': end, 'clear_request': pending}
|
||||||
|
cursor = int(row['cursor']) if row['journal_id'] == journal_id else 0
|
||||||
|
if not pending and row['journal_id'] == journal_id and end <= cursor:
|
||||||
|
conn.execute('update router_logs set last_sync = ? where router_id = ?', (ts, router_id))
|
||||||
|
return {'journal_id': journal_id, 'offset': cursor, 'clear_request': ''}
|
||||||
|
stored = bytes(row['content'])
|
||||||
|
if pending:
|
||||||
|
cursor = start
|
||||||
|
stored = b''
|
||||||
|
elif row['journal_id'] and row['journal_id'] != journal_id:
|
||||||
|
stored += ('[OK] ' + iso_time(ts) + ' Роутер начал новый журнал: перезагрузка или очистка в ОЗУ.\n').encode('utf-8')
|
||||||
|
if start > cursor:
|
||||||
|
stored += ('[WARN] ' + iso_time(ts) + ' Часть записей не доставлена до ротации журнала на роутере.\n').encode('utf-8')
|
||||||
|
if end > cursor:
|
||||||
|
stored += redact_router_log_bytes(raw[max(0, cursor - start):])
|
||||||
|
stored = stored[-ROUTER_LOG_MAX_BYTES:]
|
||||||
|
conn.execute('''update router_logs set content = ?, journal_id = ?, cursor = ?,
|
||||||
|
updated_at = case when ? then ? else updated_at end, last_sync = ?, clear_request = ''
|
||||||
|
where router_id = ?''',
|
||||||
|
(stored, journal_id, max(cursor, end), bool(raw and end > cursor), ts, ts, router_id))
|
||||||
|
return {'journal_id': journal_id, 'offset': max(cursor, end), 'clear_request': ''}
|
||||||
|
|
||||||
|
|
||||||
|
def router_log_snapshot(conn, router_id):
|
||||||
|
row = conn.execute('select * from router_logs where router_id = ?', (router_id,)).fetchone()
|
||||||
|
raw = bytes(row['content']) if row else b''
|
||||||
|
# The live browser view stays small; downloading returns the full archive.
|
||||||
|
live = raw[-65536:]
|
||||||
|
if len(raw) > 65536 and b'\n' in live:
|
||||||
|
live = live.split(b'\n', 1)[1]
|
||||||
|
diagnosis = router_log_diagnosis(conn, router_id, row, raw)
|
||||||
|
return {'text': live.decode('utf-8', errors='replace'), 'bytes': len(raw), 'diagnosis': diagnosis,
|
||||||
|
'updated_at': row['updated_at'] if row else 0, 'last_sync': row['last_sync'] if row else 0,
|
||||||
|
'pending_clear': bool(row and row['clear_request'])}, raw
|
||||||
|
|
||||||
|
|
||||||
|
def router_log_diagnosis(conn, router_id, archive=None, raw=None):
|
||||||
|
"""Report evidence received on the VPS; never invent a network failure cause."""
|
||||||
|
router_row = get_active_router(conn, router_id)
|
||||||
|
router = row_to_router(router_row) if router_row else {}
|
||||||
|
if archive is None:
|
||||||
|
archive = conn.execute('select * from router_logs where router_id = ?', (router_id,)).fetchone()
|
||||||
|
raw = bytes(archive['content']) if raw is None and archive else (raw or b'')
|
||||||
|
state = json.loads(archive['state_json'] or '{}') if archive else {}
|
||||||
|
state_at = int(archive['state_at']) if archive else 0
|
||||||
|
last_seen = int(router.get('last_seen') or 0)
|
||||||
|
fresh_state = bool(state_at and state_at >= last_seen)
|
||||||
|
if fresh_state and state.get('enabled') is False:
|
||||||
|
detail = 'Туннель и Heartbeat остановлены.' if state.get('xray') == 'stopped' else 'Xray ещё запущен.'
|
||||||
|
return {'level': 'warn', 'text': 'Remote выключен на роутере. ' + detail + ' Отправка логов не отключается вместе с Remote.', 'at': state_at}
|
||||||
|
if fresh_state and state.get('xray') == 'stopped':
|
||||||
|
return {'level': 'error', 'text': 'Роутер сообщил: Xray остановлен. Remote включён, но туннель не работает.', 'at': state_at}
|
||||||
|
# Older agents have no state metadata: use explicit lifecycle facts from
|
||||||
|
# their delivered journal. A later start cancels the earlier stop reason.
|
||||||
|
for line in reversed(raw.decode('utf-8', errors='replace').splitlines()):
|
||||||
|
if ' Hub:' in line:
|
||||||
|
continue
|
||||||
|
if 'Сервис: запуск' in line or 'Сервис перезапущен' in line or 'Сервис запущен' in line:
|
||||||
|
break
|
||||||
|
if 'Сервис остановлен; результат=warn' in line:
|
||||||
|
if not state_at:
|
||||||
|
return {'level': 'warn', 'text': 'Получен журнал: сервис Remote остановлен через панель роутера.', 'at': 0}
|
||||||
|
break
|
||||||
|
if router.get('online'):
|
||||||
|
return {'level': 'ok', 'text': 'Heartbeat поступает.' + (' Роутер сообщил: Xray запущен.' if fresh_state and state.get('xray') == 'running' else ''), 'at': last_seen}
|
||||||
|
# Highlight a delivered error, without claiming it caused an unseen outage.
|
||||||
|
for line in reversed(raw.decode('utf-8', errors='replace').splitlines()):
|
||||||
|
if ' Hub:' in line:
|
||||||
|
continue
|
||||||
|
if 'Heartbeat: OK;' in line or 'core: Xray ' in line and ' started' in line:
|
||||||
|
break
|
||||||
|
if line.startswith(('[ERROR]', '[WARN]')) and 'строка с ключом' not in line:
|
||||||
|
return {'level': 'warn', 'text': 'Heartbeat не поступает. Последнее доставленное предупреждение или ошибка: ' + line[:600], 'at': 0}
|
||||||
|
return {'level': 'warn', 'text': 'Heartbeat не поступает. Причина обрыва не доставлена на VPS; подтверждён только тайм-аут связи.', 'at': 0}
|
||||||
|
|
||||||
|
|
||||||
|
def clear_router_log_archive(conn, router_id):
|
||||||
|
request = uuid.uuid4().hex
|
||||||
|
conn.execute('''insert into router_logs(router_id, clear_request) values (?, ?)
|
||||||
|
on conflict(router_id) do update set content = X'', updated_at = 0, clear_request = excluded.clear_request''',
|
||||||
|
(router_id, request))
|
||||||
|
return request
|
||||||
|
|
||||||
|
|
||||||
|
def record_router_connection_log(conn, router_id, online):
|
||||||
|
# Take the same write lock as ingestion before reading/appending content.
|
||||||
|
conn.execute('update router_logs set last_sync = last_sync where router_id = ?', (router_id,))
|
||||||
|
if not get_active_router(conn, router_id):
|
||||||
|
return
|
||||||
|
row = conn.execute('select content from router_logs where router_id = ?', (router_id,)).fetchone()
|
||||||
|
raw = bytes(row['content']) if row else b''
|
||||||
|
message = ('[OK] ' if online else '[WARN] ') + iso_time(now_ts())
|
||||||
|
reason = router_log_diagnosis(conn, router_id, raw=raw)['text'] if not online else ''
|
||||||
|
message += (' Hub: Heartbeat снова поступает.\n' if online else
|
||||||
|
' Hub: истекло время ожидания Heartbeat, карточка отмечена оффлайн. ' + reason + '\n')
|
||||||
|
raw = (raw + message.encode('utf-8'))[-ROUTER_LOG_MAX_BYTES:]
|
||||||
|
conn.execute('''insert into router_logs(router_id, content, updated_at) values (?, ?, ?)
|
||||||
|
on conflict(router_id) do update set content = excluded.content, updated_at = excluded.updated_at''',
|
||||||
|
(router_id, raw, now_ts()))
|
||||||
|
|
||||||
ROUTER_NOTES_MAX_ENTRIES = 200
|
ROUTER_NOTES_MAX_ENTRIES = 200
|
||||||
ROUTER_NOTES_STORAGE_VERSION = 1
|
ROUTER_NOTES_STORAGE_VERSION = 1
|
||||||
ROUTER_NOTES_MEDIA_DIR = STATE_DIR / "router-note-images"
|
ROUTER_NOTES_MEDIA_DIR = STATE_DIR / "router-note-images"
|
||||||
@@ -3368,6 +3520,13 @@ def init_db(conn):
|
|||||||
)
|
)
|
||||||
"""
|
"""
|
||||||
)
|
)
|
||||||
|
conn.execute('''create table if not exists router_logs (
|
||||||
|
router_id text primary key, content blob not null default X'',
|
||||||
|
journal_id text not null default '', cursor integer not null default 0,
|
||||||
|
updated_at integer not null default 0, last_sync integer not null default 0,
|
||||||
|
clear_request text not null default '')''')
|
||||||
|
ensure_column(conn, 'router_logs', 'state_json', "text not null default '{}'")
|
||||||
|
ensure_column(conn, 'router_logs', 'state_at', 'integer not null default 0')
|
||||||
ensure_column(conn, "routers", "custom_name", "text not null default ''")
|
ensure_column(conn, "routers", "custom_name", "text not null default ''")
|
||||||
ensure_column(conn, "routers", "group_id", "text not null default ''")
|
ensure_column(conn, "routers", "group_id", "text not null default ''")
|
||||||
ensure_column(conn, "routers", "deleted_at", "integer not null default 0")
|
ensure_column(conn, "routers", "deleted_at", "integer not null default 0")
|
||||||
@@ -3537,6 +3696,7 @@ def row_to_router(row):
|
|||||||
data["ssh_url"] = f"/ssh/{urllib.parse.quote(data['id'])}/"
|
data["ssh_url"] = f"/ssh/{urllib.parse.quote(data['id'])}/"
|
||||||
data["config_url"] = f"/router/{urllib.parse.quote(data['id'])}/config"
|
data["config_url"] = f"/router/{urllib.parse.quote(data['id'])}/config"
|
||||||
data["notes_url"] = f"/router/{urllib.parse.quote(data['id'])}/notes"
|
data["notes_url"] = f"/router/{urllib.parse.quote(data['id'])}/notes"
|
||||||
|
data["logs_url"] = f"/router/{urllib.parse.quote(data['id'])}/logs"
|
||||||
data["xray_client_url"] = f"/router/{urllib.parse.quote(data['id'])}/xray-client.json"
|
data["xray_client_url"] = f"/router/{urllib.parse.quote(data['id'])}/xray-client.json"
|
||||||
data.pop("status_json", None)
|
data.pop("status_json", None)
|
||||||
return data
|
return data
|
||||||
@@ -3571,6 +3731,7 @@ def router_with_access(router, account):
|
|||||||
"config": bool(can_manage),
|
"config": bool(can_manage),
|
||||||
"wol": bool(can_manage),
|
"wol": bool(can_manage),
|
||||||
"traffic": bool(can_manage),
|
"traffic": bool(can_manage),
|
||||||
|
"logs": bool(can_manage),
|
||||||
"delete": bool(account and account.get("is_owner")),
|
"delete": bool(account and account.get("is_owner")),
|
||||||
"diagnose": bool(can_manage),
|
"diagnose": bool(can_manage),
|
||||||
}
|
}
|
||||||
@@ -4827,7 +4988,7 @@ input,select{{min-width:0;border:1px solid var(--line);border-radius:8px;padding
|
|||||||
.seasonalFx{{position:fixed;inset:0;display:block;width:100vw;height:100vh;z-index:0;pointer-events:none;opacity:.9;mix-blend-mode:screen}}.desktopHeader{{--hdr-col-1:124px;--hdr-col-2:124px;--hdr-col-3:156px;--hdr-col-4:124px;--hdr-col-5:144px;--hdr-col-6:144px;--hdr-col-7:144px;--hdr-col-8:144px;--top-col-1:256px;--top-col-2:288px;--top-col-3:144px;display:grid;gap:8px;width:max-content;max-width:100%;margin-left:15px}}.desktopHeaderTop{{display:grid;grid-template-columns:var(--top-col-1) var(--top-col-2) var(--top-col-3);align-items:flex-start;gap:8px;width:max-content;max-width:100%;justify-self:start}}.desktopHeaderTop>.appBanner{{width:var(--top-col-1);min-width:var(--top-col-1);max-width:var(--top-col-1)}}.desktopHeaderTop>.routerSearchDock{{width:var(--top-col-2);min-width:var(--top-col-2);max-width:var(--top-col-2)}}.desktopHeaderTop>#seasonDock{{width:var(--top-col-3);min-width:var(--top-col-3);max-width:var(--top-col-3)}}.desktopHeaderBottom{{display:grid;grid-template-columns:var(--hdr-col-1) var(--hdr-col-2) var(--hdr-col-3) var(--hdr-col-4) var(--hdr-col-5) var(--hdr-col-6) var(--hdr-col-7) var(--hdr-col-8);gap:8px;width:max-content;max-width:100%;align-items:start;justify-self:start}}.desktopHeader .appBanner{{grid-column:auto;width:100%;min-width:0}}.desktopHeader .links{{display:grid;grid-column:1/span 3;grid-template-columns:var(--hdr-col-1) var(--hdr-col-2) var(--hdr-col-3);gap:8px;margin-top:0}}.desktopHeader .links a{{width:100%;min-width:0}}.routerSearchDock{{position:relative;display:block;grid-column:auto;width:100%;min-width:0;max-width:100%}}.mobileSearchDock{{display:none;width:100%;position:relative}}.routerSearchToggle{{position:relative;display:inline-flex;align-items:center;justify-content:center;gap:8px;min-height:36px;width:100%;padding:8px 14px;border:1px solid rgba(34,211,238,.30);border-radius:999px;background:linear-gradient(110deg,rgba(34,211,238,.12),rgba(124,58,237,.22),rgba(236,72,153,.12));color:#f3e8ff;font-size:13px;font-weight:800;line-height:1;box-shadow:0 10px 24px rgba(124,58,237,.16),inset 0 1px 0 rgba(255,255,255,.10)}}.routerSearchToggle[data-active="true"],.routerSearchToggle[aria-expanded="true"]{{border-color:rgba(34,211,238,.52);box-shadow:0 14px 30px rgba(34,211,238,.14),inset 0 1px 0 rgba(255,255,255,.12)}}.routerSearchToggleIcon{{flex:0 0 auto;color:#c4b5fd;font-size:14px;line-height:1}}.mobileSearchVersion{{display:inline-flex;align-items:center;justify-content:center;min-height:20px;padding:0 7px;border:1px solid rgba(251,113,133,.34);border-radius:999px;background:rgba(251,113,133,.14);color:#fecdd3;font-size:10px;font-weight:900;line-height:1;letter-spacing:.04em;box-shadow:0 0 14px rgba(251,113,133,.14)}}.mobileSearchDock>.mobileSearchVersion{{display:flex;width:fit-content;margin:0 auto 6px}}#routerSearchToggle,#seasonToggle{{border:1px solid var(--line);background:rgba(255,255,255,.08);box-shadow:inset 0 1px 0 rgba(255,255,255,.06);color:#f3e8ff}}#routerSearchToggle[data-active="true"],#routerSearchToggle[aria-expanded="true"],#seasonToggle[data-open="true"],#seasonToggle[aria-expanded="true"]{{border-color:var(--line);background:rgba(255,255,255,.11);box-shadow:inset 0 1px 0 rgba(255,255,255,.08)}}#routerSearchToggle .routerSearchToggleIcon,#seasonToggle .routerSearchToggleIcon{{color:#ddd6fe}}.routerSearchPanel{{position:absolute;top:calc(100% + 10px);left:0;z-index:55;width:min(296px,calc(100vw - 24px))}}.routerSearchPanel[hidden]{{display:none!important}}.routerSearchCard{{display:grid;grid-template-rows:auto auto auto;align-content:start;gap:8px;width:100%;min-height:82px;padding:12px;border:1px solid rgba(34,211,238,.26);border-radius:18px;background:linear-gradient(180deg,rgba(255,255,255,.09),rgba(255,255,255,.045)),rgba(19,14,32,.96);box-shadow:0 18px 42px rgba(0,0,0,.22),inset 0 1px 0 rgba(255,255,255,.06);backdrop-filter:blur(10px)}}.routerSearchHead{{display:flex;align-items:center;justify-content:space-between;gap:8px}}.routerSearchTitle{{display:block;color:#f3e8ff;font-size:12px;font-weight:900;line-height:1.1}}.routerSearchClear{{min-height:24px;padding:0 9px;border:1px solid rgba(167,139,250,.24);border-radius:999px;background:rgba(255,255,255,.06);color:#ddd6fe;font-size:11px;font-weight:850;cursor:pointer}}.routerSearchClear[disabled]{{opacity:.42;cursor:not-allowed}}.routerSearchField{{display:flex;align-items:center;gap:8px;min-height:38px;padding:0 12px;border:1px solid rgba(34,211,238,.26);border-radius:999px;background:linear-gradient(110deg,rgba(34,211,238,.08),rgba(124,58,237,.14),rgba(236,72,153,.08));box-shadow:inset 0 1px 0 rgba(255,255,255,.06)}}.routerSearchField:focus-within{{border-color:rgba(34,211,238,.54);box-shadow:0 0 0 3px rgba(34,211,238,.10),inset 0 1px 0 rgba(255,255,255,.08)}}.routerSearchField input{{width:100%;padding:0;border:0;background:transparent;color:#f7f2ff;box-shadow:none;outline:none;font-size:13px;font-weight:700}}.routerSearchField input::placeholder{{color:#b9adc9}}.routerSearchIcon{{fLine truncated
|
.seasonalFx{{position:fixed;inset:0;display:block;width:100vw;height:100vh;z-index:0;pointer-events:none;opacity:.9;mix-blend-mode:screen}}.desktopHeader{{--hdr-col-1:124px;--hdr-col-2:124px;--hdr-col-3:156px;--hdr-col-4:124px;--hdr-col-5:144px;--hdr-col-6:144px;--hdr-col-7:144px;--hdr-col-8:144px;--top-col-1:256px;--top-col-2:288px;--top-col-3:144px;display:grid;gap:8px;width:max-content;max-width:100%;margin-left:15px}}.desktopHeaderTop{{display:grid;grid-template-columns:var(--top-col-1) var(--top-col-2) var(--top-col-3);align-items:flex-start;gap:8px;width:max-content;max-width:100%;justify-self:start}}.desktopHeaderTop>.appBanner{{width:var(--top-col-1);min-width:var(--top-col-1);max-width:var(--top-col-1)}}.desktopHeaderTop>.routerSearchDock{{width:var(--top-col-2);min-width:var(--top-col-2);max-width:var(--top-col-2)}}.desktopHeaderTop>#seasonDock{{width:var(--top-col-3);min-width:var(--top-col-3);max-width:var(--top-col-3)}}.desktopHeaderBottom{{display:grid;grid-template-columns:var(--hdr-col-1) var(--hdr-col-2) var(--hdr-col-3) var(--hdr-col-4) var(--hdr-col-5) var(--hdr-col-6) var(--hdr-col-7) var(--hdr-col-8);gap:8px;width:max-content;max-width:100%;align-items:start;justify-self:start}}.desktopHeader .appBanner{{grid-column:auto;width:100%;min-width:0}}.desktopHeader .links{{display:grid;grid-column:1/span 3;grid-template-columns:var(--hdr-col-1) var(--hdr-col-2) var(--hdr-col-3);gap:8px;margin-top:0}}.desktopHeader .links a{{width:100%;min-width:0}}.routerSearchDock{{position:relative;display:block;grid-column:auto;width:100%;min-width:0;max-width:100%}}.mobileSearchDock{{display:none;width:100%;position:relative}}.routerSearchToggle{{position:relative;display:inline-flex;align-items:center;justify-content:center;gap:8px;min-height:36px;width:100%;padding:8px 14px;border:1px solid rgba(34,211,238,.30);border-radius:999px;background:linear-gradient(110deg,rgba(34,211,238,.12),rgba(124,58,237,.22),rgba(236,72,153,.12));color:#f3e8ff;font-size:13px;font-weight:800;line-height:1;box-shadow:0 10px 24px rgba(124,58,237,.16),inset 0 1px 0 rgba(255,255,255,.10)}}.routerSearchToggle[data-active="true"],.routerSearchToggle[aria-expanded="true"]{{border-color:rgba(34,211,238,.52);box-shadow:0 14px 30px rgba(34,211,238,.14),inset 0 1px 0 rgba(255,255,255,.12)}}.routerSearchToggleIcon{{flex:0 0 auto;color:#c4b5fd;font-size:14px;line-height:1}}.mobileSearchVersion{{display:inline-flex;align-items:center;justify-content:center;min-height:20px;padding:0 7px;border:1px solid rgba(251,113,133,.34);border-radius:999px;background:rgba(251,113,133,.14);color:#fecdd3;font-size:10px;font-weight:900;line-height:1;letter-spacing:.04em;box-shadow:0 0 14px rgba(251,113,133,.14)}}.mobileSearchDock>.mobileSearchVersion{{display:flex;width:fit-content;margin:0 auto 6px}}#routerSearchToggle,#seasonToggle{{border:1px solid var(--line);background:rgba(255,255,255,.08);box-shadow:inset 0 1px 0 rgba(255,255,255,.06);color:#f3e8ff}}#routerSearchToggle[data-active="true"],#routerSearchToggle[aria-expanded="true"],#seasonToggle[data-open="true"],#seasonToggle[aria-expanded="true"]{{border-color:var(--line);background:rgba(255,255,255,.11);box-shadow:inset 0 1px 0 rgba(255,255,255,.08)}}#routerSearchToggle .routerSearchToggleIcon,#seasonToggle .routerSearchToggleIcon{{color:#ddd6fe}}.routerSearchPanel{{position:absolute;top:calc(100% + 10px);left:0;z-index:55;width:min(296px,calc(100vw - 24px))}}.routerSearchPanel[hidden]{{display:none!important}}.routerSearchCard{{display:grid;grid-template-rows:auto auto auto;align-content:start;gap:8px;width:100%;min-height:82px;padding:12px;border:1px solid rgba(34,211,238,.26);border-radius:18px;background:linear-gradient(180deg,rgba(255,255,255,.09),rgba(255,255,255,.045)),rgba(19,14,32,.96);box-shadow:0 18px 42px rgba(0,0,0,.22),inset 0 1px 0 rgba(255,255,255,.06);backdrop-filter:blur(10px)}}.routerSearchHead{{display:flex;align-items:center;justify-content:space-between;gap:8px}}.routerSearchTitle{{display:block;color:#f3e8ff;font-size:12px;font-weight:900;line-height:1.1}}.routerSearchClear{{min-height:24px;padding:0 9px;border:1px solid rgba(167,139,250,.24);border-radius:999px;background:rgba(255,255,255,.06);color:#ddd6fe;font-size:11px;font-weight:850;cursor:pointer}}.routerSearchClear[disabled]{{opacity:.42;cursor:not-allowed}}.routerSearchField{{display:flex;align-items:center;gap:8px;min-height:38px;padding:0 12px;border:1px solid rgba(34,211,238,.26);border-radius:999px;background:linear-gradient(110deg,rgba(34,211,238,.08),rgba(124,58,237,.14),rgba(236,72,153,.08));box-shadow:inset 0 1px 0 rgba(255,255,255,.06)}}.routerSearchField:focus-within{{border-color:rgba(34,211,238,.54);box-shadow:0 0 0 3px rgba(34,211,238,.10),inset 0 1px 0 rgba(255,255,255,.08)}}.routerSearchField input{{width:100%;padding:0;border:0;background:transparent;color:#f7f2ff;box-shadow:none;outline:none;font-size:13px;font-weight:700}}.routerSearchField input::placeholder{{color:#b9adc9}}.routerSearchIcon{{fLine truncated
|
||||||
@media(max-width:980px){{.cards,.routerGroupCards{{grid-template-columns:repeat(2,minmax(0,1fr))}}.toolbar{{grid-template-columns:1fr 1fr}}.card.main{{grid-column:span 1}}.top{{justify-items:stretch}}.desktopHeader,.desktopHeaderTop,.desktopHeaderBottom{{width:100%;max-width:none}}.desktopHeader{{--hdr-col-1:minmax(0,1fr);--hdr-col-2:minmax(0,1fr);--hdr-col-3:minmax(0,1.35fr);--hdr-col-4:minmax(0,1fr);--hdr-col-5:minmax(0,1fr);--hdr-col-6:minmax(0,1fr);--hdr-col-7:minmax(0,1fr);--hdr-col-8:minmax(0,1fr)}}.headerActions{{width:100%}}}}
|
@media(max-width:980px){{.cards,.routerGroupCards{{grid-template-columns:repeat(2,minmax(0,1fr))}}.toolbar{{grid-template-columns:1fr 1fr}}.card.main{{grid-column:span 1}}.top{{justify-items:stretch}}.desktopHeader,.desktopHeaderTop,.desktopHeaderBottom{{width:100%;max-width:none}}.desktopHeader{{--hdr-col-1:minmax(0,1fr);--hdr-col-2:minmax(0,1fr);--hdr-col-3:minmax(0,1.35fr);--hdr-col-4:minmax(0,1fr);--hdr-col-5:minmax(0,1fr);--hdr-col-6:minmax(0,1fr);--hdr-col-7:minmax(0,1fr);--hdr-col-8:minmax(0,1fr)}}.headerActions{{width:100%}}}}
|
||||||
@media(max-width:680px){{body{{font-size:13px;background-attachment:scroll}}.wrap{{padding:10px}}.top{{gap:12px;padding:14px 0;align-items:flex-start}}.brand,.brand>div{{width:100%}}h1{{font-size:22px;line-height:1.18}}.appBanner{{width:auto;max-width:100%;justify-content:center;min-height:36px;padding:8px 12px}}.links,.headerActions,.summary,.mobileOwnerTools{{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));width:100%;gap:8px;max-width:none}}.links{{margin-top:10px}}.links a,.badge,.headerActions .btn,.mobileOwnerTools .btn,.mobileOwnerTools .badge,.miniStat{{width:100%;min-width:0;padding:9px 10px;font-size:12px}}.headerStack{{margin-top:0;width:100%;min-width:0}}.headerStack .badge{{width:100%;min-width:0}}.authMenu{{position:fixed;left:10px;right:10px;top:74px;width:auto;max-height:calc(100svh - 90px);overflow:auto}}.authMenuHead{{min-height:40px;padding:0 104px 8px 0}}.authMenu h2{{margin:2px 104px 0 0;line-height:1.2}}.authMenuClose{{display:inline-flex;top:0;right:0;min-height:32px;padding:6px 12px}}.cards,.routerGroupCards,.toolbar,.authGrid{{grid-template-columns:1fr}}.authRow{{grid-template-columns:1fr;gap:7px;padding:8px}}.authRowTitle{{font-size:13px}}.authRowMeta{{font-size:11px;line-height:1.3}}.authRouterFlags{{justify-content:flex-start;gap:6px}}.authFlagPill{{min-height:25px;padding:3px 7px;gap:5px}}.authFlagPill input{{width:12px;height:12px;flex-basis:12px}}.authFlagPill span{{font-size:10px}}.routerStats{{grid-template-columns:repeat(3,minmax(0,1fr));gap:5px;margin-bottom:7px}}.statCard{{min-height:52px;padding:7px 6px}}.statCard span{{font-size:8px;letter-spacing:.015em}}.statCard strong{{font-size:20px}}.statCard em{{display:none}}.statCardHead{{min-height:16px}}.statValueRow,.offlineStatRow{{min-height:20px;margin-top:4px}}.offlineMoreBtn{{right:2px;min-height:16px;padding:0 5px;font-size:7px}}.offlinePopover{{right:3px;width:min(230px,calc(100vw - 20px));padding:8px}}.offlineItem{{padding:6px 7px}}.offlineName{{font-size:10px}}.toolbar{{padding:10px;margin:12px 0}}.card.main{{grid-column:span 1}}.card{{padding:12px;min-height:0}}.card>.metaLine,.card>.tagRow{{display:none}}.nameRow{{gap:6px;margin-top:10px}}.nameRow::before{{flex-basis:26px;width:26px;height:26px}}.name{{font-size:12px;max-width:190px}}.nameEditBtn{{flex-basis:26px;width:26px;height:26px}}.mobilePanelToggle,.routerFormToggle{{display:inline-flex}}.routerSearchDock{{width:100%}}.seasonDock{{width:100%}}#mobileSeasonDock{{width:100%;min-width:0;max-width:none;padding:0;border:0;background:none;box-shadow:none;backdrop-filter:none}}.routerSearchToggle,.seasonToggle{{width:100%}}.routerSearchPanel,.seasonPanel{{position:static;width:100%;margin-top:8px}}.routerSearchCard,.seasonCard{{width:100%;min-height:0;padding:10px 11px;border-radius:16px}}.routerSearchTitle{{font-size:11px}}.routerSearchField{{min-height:36px}}.routerSearchMeta{{text-align:center}}.metrics{{grid-template-columns:repeat(2,minmax(0,1fr));gap:7px}}.metric{{padding:8px}}.diagnosticPanel{{padding:12px}}.diagnosticTop{{gap:8px}}.diagnosticTop h2{{font-size:17px}}.diagnosticLead{{font-size:11px}}.diagnosticGrid{{grid-template-columns:1fr;gap:10px}}.diagnosticGrid label{{font-size:13px}}.diagnosticGrid textarea{{min-height:118px;padding:12px 13px;font-size:15px;line-height:1.35}}.diagBlock{{padding:11px}}.actions{{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:8px}}.actions .btn,.actions button{{width:100%;min-width:0;padding:9px 8px;font-size:12px}}.wolControls,.trafficControls{{grid-template-columns:1fr}}.wolField span,.wolMeta{{text-align:center}}.wolControls .btn,.wolControls button,.trafficControls .btn,.trafficControls button{{width:100%}}.trafficSummary{{justify-content:center}}.trafficViewport{{max-height:360px;padding-right:0}}.trafficRowTop{{grid-template-columns:1fr}}.trafficTotalBadge{{min-width:0;text-align:left}}}}
|
@media(max-width:680px){{body{{font-size:13px;background-attachment:scroll}}.wrap{{padding:10px}}.top{{gap:12px;padding:14px 0;align-items:flex-start}}.brand,.brand>div{{width:100%}}h1{{font-size:22px;line-height:1.18}}.appBanner{{width:auto;max-width:100%;justify-content:center;min-height:36px;padding:8px 12px}}.links,.headerActions,.summary,.mobileOwnerTools{{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));width:100%;gap:8px;max-width:none}}.links{{margin-top:10px}}.links a,.badge,.headerActions .btn,.mobileOwnerTools .btn,.mobileOwnerTools .badge,.miniStat{{width:100%;min-width:0;padding:9px 10px;font-size:12px}}.headerStack{{margin-top:0;width:100%;min-width:0}}.headerStack .badge{{width:100%;min-width:0}}.authMenu{{position:fixed;left:10px;right:10px;top:74px;width:auto;max-height:calc(100svh - 90px);overflow:auto}}.authMenuHead{{min-height:40px;padding:0 104px 8px 0}}.authMenu h2{{margin:2px 104px 0 0;line-height:1.2}}.authMenuClose{{display:inline-flex;top:0;right:0;min-height:32px;padding:6px 12px}}.cards,.routerGroupCards,.toolbar,.authGrid{{grid-template-columns:1fr}}.authRow{{grid-template-columns:1fr;gap:7px;padding:8px}}.authRowTitle{{font-size:13px}}.authRowMeta{{font-size:11px;line-height:1.3}}.authRouterFlags{{justify-content:flex-start;gap:6px}}.authFlagPill{{min-height:25px;padding:3px 7px;gap:5px}}.authFlagPill input{{width:12px;height:12px;flex-basis:12px}}.authFlagPill span{{font-size:10px}}.routerStats{{grid-template-columns:repeat(3,minmax(0,1fr));gap:5px;margin-bottom:7px}}.statCard{{min-height:52px;padding:7px 6px}}.statCard span{{font-size:8px;letter-spacing:.015em}}.statCard strong{{font-size:20px}}.statCard em{{display:none}}.statCardHead{{min-height:16px}}.statValueRow,.offlineStatRow{{min-height:20px;margin-top:4px}}.offlineMoreBtn{{right:2px;min-height:16px;padding:0 5px;font-size:7px}}.offlinePopover{{right:3px;width:min(230px,calc(100vw - 20px));padding:8px}}.offlineItem{{padding:6px 7px}}.offlineName{{font-size:10px}}.toolbar{{padding:10px;margin:12px 0}}.card.main{{grid-column:span 1}}.card{{padding:12px;min-height:0}}.card>.metaLine,.card>.tagRow{{display:none}}.nameRow{{gap:6px;margin-top:10px}}.nameRow::before{{flex-basis:26px;width:26px;height:26px}}.name{{font-size:12px;max-width:190px}}.nameEditBtn{{flex-basis:26px;width:26px;height:26px}}.mobilePanelToggle,.routerFormToggle{{display:inline-flex}}.routerSearchDock{{width:100%}}.seasonDock{{width:100%}}#mobileSeasonDock{{width:100%;min-width:0;max-width:none;padding:0;border:0;background:none;box-shadow:none;backdrop-filter:none}}.routerSearchToggle,.seasonToggle{{width:100%}}.routerSearchPanel,.seasonPanel{{position:static;width:100%;margin-top:8px}}.routerSearchCard,.seasonCard{{width:100%;min-height:0;padding:10px 11px;border-radius:16px}}.routerSearchTitle{{font-size:11px}}.routerSearchField{{min-height:36px}}.routerSearchMeta{{text-align:center}}.metrics{{grid-template-columns:repeat(2,minmax(0,1fr));gap:7px}}.metric{{padding:8px}}.diagnosticPanel{{padding:12px}}.diagnosticTop{{gap:8px}}.diagnosticTop h2{{font-size:17px}}.diagnosticLead{{font-size:11px}}.diagnosticGrid{{grid-template-columns:1fr;gap:10px}}.diagnosticGrid label{{font-size:13px}}.diagnosticGrid textarea{{min-height:118px;padding:12px 13px;font-size:15px;line-height:1.35}}.diagBlock{{padding:11px}}.actions{{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:8px}}.actions .btn,.actions button{{width:100%;min-width:0;padding:9px 8px;font-size:12px}}.wolControls,.trafficControls{{grid-template-columns:1fr}}.wolField span,.wolMeta{{text-align:center}}.wolControls .btn,.wolControls button,.trafficControls .btn,.trafficControls button{{width:100%}}.trafficSummary{{justify-content:center}}.trafficViewport{{max-height:360px;padding-right:0}}.trafficRowTop{{grid-template-columns:1fr}}.trafficTotalBadge{{min-width:0;text-align:left}}}}
|
||||||
@media(max-width:680px){{.desktopHeader{{display:none}}#hubMenuPanelHost{{display:block;width:100%}}#hubMenuPanelHost:empty{{display:none}}.mobileOwnerTools{{display:grid;margin:0 0 8px}}.mobileOwnerTools[hidden]{{display:none!important}}.top{{padding:6px 0 0;gap:0}}.mobileSearchDock{{display:block;margin:0}}.mobilePanelToggle,.routerFormToggle,.actionToggle{{width:100%;min-height:38px;margin:7px 0;padding:9px 12px;border-radius:999px;font-size:12px;line-height:1}}.actionToggle{{display:inline-flex}}body.preload-mobile-panels .headerActions,body.preload-mobile-panels .routerFormWrap,body.preload-mobile-panels .routerStats,body.preload-mobile-panels .mobileOwnerTools{{display:none!important}}.card .actions.mobileCollapsed:not(.open){{display:none}}.cardTop{{gap:0}}}}
|
@media(max-width:680px){{.desktopHeader{{display:none}}#hubMenuPanelHost{{display:block;width:100%}}#hubMenuPanelHost:empty{{display:none}}.mobileOwnerTools{{display:grid;margin:0 0 8px}}.mobileOwnerTools[hidden]{{display:none!important}}.top{{padding:6px 0 0;gap:0}}.mobileSearchDock{{display:block;margin:0}}.mobilePanelToggle,.routerFormToggle,.actionToggle{{width:100%;min-height:38px;margin:7px 0;padding:9px 12px;border-radius:999px;font-size:12px;line-height:1}}.actionToggle{{display:inline-flex}}body.preload-mobile-panels .headerActions,body.preload-mobile-panels .routerFormWrap,body.preload-mobile-panels .mobileOwnerTools{{display:none!important}}.card .actions.mobileCollapsed:not(.open){{display:none}}.cardTop{{gap:0}}}}
|
||||||
@media(max-width:680px){{.headerActions .badge,.headerActions .btn,.mobileOwnerTools .badge,.mobileOwnerTools .btn{{width:100%;min-width:0;max-width:none}}}}
|
@media(max-width:680px){{.headerActions .badge,.headerActions .btn,.mobileOwnerTools .badge,.mobileOwnerTools .btn{{width:100%;min-width:0;max-width:none}}}}
|
||||||
@media(max-width:420px){{.links,.headerActions,.summary,.actions,.mobileOwnerTools{{grid-template-columns:1fr}}.metrics{{grid-template-columns:1fr}}.metric.span2{{grid-column:span 1}}}}
|
@media(max-width:420px){{.links,.headerActions,.summary,.actions,.mobileOwnerTools{{grid-template-columns:1fr}}.metrics{{grid-template-columns:1fr}}.metric.span2{{grid-column:span 1}}}}
|
||||||
@media(max-width:680px){{.desktopHeader{{width:100%}}.summary{{justify-content:center}}}}
|
@media(max-width:680px){{.desktopHeader{{width:100%}}.summary{{justify-content:center}}}}
|
||||||
@@ -4861,7 +5022,7 @@ input,select{{min-width:0;border:1px solid var(--line);border-radius:8px;padding
|
|||||||
<div class="brand">
|
<div class="brand">
|
||||||
<div class="desktopHeader">
|
<div class="desktopHeader">
|
||||||
<div class="desktopHeaderTop">
|
<div class="desktopHeaderTop">
|
||||||
<h1 class="appBanner"><span>OpenWrt Remote Hub <span class="appBannerVersion">v115</span></span></h1>
|
<h1 class="appBanner"><span>OpenWrt Remote Hub <span class="appBannerVersion">v116</span></span></h1>
|
||||||
<div class="routerSearchDock" id="routerSearchDock">
|
<div class="routerSearchDock" id="routerSearchDock">
|
||||||
<button class="routerSearchToggle" id="routerSearchToggle" type="button" aria-expanded="false" aria-controls="routerSearchPanel" data-active="false">
|
<button class="routerSearchToggle" id="routerSearchToggle" type="button" aria-expanded="false" aria-controls="routerSearchPanel" data-active="false">
|
||||||
<span>Поиск роутеров</span>
|
<span>Поиск роутеров</span>
|
||||||
@@ -5214,7 +5375,7 @@ systemctl restart owrt-remote-xray</pre>
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="mobileSearchDock" id="mobileRouterSearchDock">
|
<div class="mobileSearchDock" id="mobileRouterSearchDock">
|
||||||
<span class="mobileSearchVersion">v115</span>
|
<span class="mobileSearchVersion">v116</span>
|
||||||
<button class="routerSearchToggle mobilePanelToggle primary" id="mobileRouterSearchToggle" type="button" aria-expanded="false" aria-controls="mobileRouterSearchPanel" data-active="false">
|
<button class="routerSearchToggle mobilePanelToggle primary" id="mobileRouterSearchToggle" type="button" aria-expanded="false" aria-controls="mobileRouterSearchPanel" data-active="false">
|
||||||
<span>Поиск роутеров</span>
|
<span>Поиск роутеров</span>
|
||||||
</button>
|
</button>
|
||||||
@@ -5296,7 +5457,7 @@ systemctl restart owrt-remote-xray</pre>
|
|||||||
<div class="formMsg" id="routerGroupMsg" hidden></div>
|
<div class="formMsg" id="routerGroupMsg" hidden></div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<button class="mobilePanelToggle primary" id="routerStatsToggle" type="button" hidden>Открыть статистику</button>
|
<button class="mobilePanelToggle primary" id="routerStatsToggle" type="button" aria-expanded="true" aria-controls="routerStats" hidden>Скрыть статистику</button>
|
||||||
<section id="routerStats" class="routerStats" aria-label="Статистика роутеров"></section>
|
<section id="routerStats" class="routerStats" aria-label="Статистика роутеров"></section>
|
||||||
<section id="cards" class="cards"></section>
|
<section id="cards" class="cards"></section>
|
||||||
<section id="diagnosticPanel" class="diagnosticPanel" hidden>
|
<section id="diagnosticPanel" class="diagnosticPanel" hidden>
|
||||||
@@ -7724,6 +7885,9 @@ function render(list) {{
|
|||||||
const notesButton = !!permissions.notes
|
const notesButton = !!permissions.notes
|
||||||
? `<a class="btn" href="${{escapeAttr(r.notes_url || ('/router/' + encodeURIComponent(r.id) + '/notes'))}}" target="_blank" rel="noopener noreferrer">Заметки</a>`
|
? `<a class="btn" href="${{escapeAttr(r.notes_url || ('/router/' + encodeURIComponent(r.id) + '/notes'))}}" target="_blank" rel="noopener noreferrer">Заметки</a>`
|
||||||
: `<span class="btn disabled">Заметки</span>`;
|
: `<span class="btn disabled">Заметки</span>`;
|
||||||
|
const logsButton = !!permissions.logs
|
||||||
|
? `<a class="btn" data-global-logs-link="true" href="${{escapeAttr(r.logs_url || ('/router/' + encodeURIComponent(r.id) + '/logs'))}}" target="_blank" rel="noopener noreferrer">Глобал логи</a>`
|
||||||
|
: `<span class="btn disabled">Глобал логи</span>`;
|
||||||
const renameLabel = 'Переименовать ' + (r.name || r.id || 'роутер');
|
const renameLabel = 'Переименовать ' + (r.name || r.id || 'роутер');
|
||||||
const renameButton = !!permissions.manage
|
const renameButton = !!permissions.manage
|
||||||
? `<button class="nameEditBtn" type="button" data-rename="${{escapeAttr(r.id)}}" aria-label="${{escapeAttr(renameLabel)}}" title="${{escapeAttr(renameLabel)}}"><svg viewBox="0 0 24 24" aria-hidden="true" focusable="false"><path fill="currentColor" d="M3 17.25V21h3.75l11-11.03-3.75-3.75zm17.71-10.04a1.003 1.003 0 0 0 0-1.42l-2.5-2.5a1.003 1.003 0 0 0-1.42 0l-1.96 1.96 3.75 3.75z"/></svg></button>`
|
? `<button class="nameEditBtn" type="button" data-rename="${{escapeAttr(r.id)}}" aria-label="${{escapeAttr(renameLabel)}}" title="${{escapeAttr(renameLabel)}}"><svg viewBox="0 0 24 24" aria-hidden="true" focusable="false"><path fill="currentColor" d="M3 17.25V21h3.75l11-11.03-3.75-3.75zm17.71-10.04a1.003 1.003 0 0 0 0-1.42l-2.5-2.5a1.003 1.003 0 0 0-1.42 0l-1.96 1.96 3.75 3.75z"/></svg></button>`
|
||||||
@@ -7762,6 +7926,7 @@ function render(list) {{
|
|||||||
${{adminButton}}
|
${{adminButton}}
|
||||||
${{sshButton}}
|
${{sshButton}}
|
||||||
${{wolButton}}
|
${{wolButton}}
|
||||||
|
${{logsButton}}
|
||||||
${{permissions.config ? `<a class="btn" href="${{escapeAttr(r.config_url)}}">OpenWrt config</a>` : '<span class="btn disabled">OpenWrt config</span>'}}
|
${{permissions.config ? `<a class="btn" href="${{escapeAttr(r.config_url)}}">OpenWrt config</a>` : '<span class="btn disabled">OpenWrt config</span>'}}
|
||||||
${{permissions.delete ? `<button class="btn" data-delete="${{escapeAttr(r.id)}}">Удалить</button>` : '<span class="btn disabled">Удалить</span>'}}
|
${{permissions.delete ? `<button class="btn" data-delete="${{escapeAttr(r.id)}}">Удалить</button>` : '<span class="btn disabled">Удалить</span>'}}
|
||||||
</div>
|
</div>
|
||||||
@@ -7926,6 +8091,9 @@ render = function(list) {{
|
|||||||
const notesButton = !!permissions.notes
|
const notesButton = !!permissions.notes
|
||||||
? `<a class="btn" href="${{escapeAttr(r.notes_url || ('/router/' + encodeURIComponent(r.id) + '/notes'))}}" target="_blank" rel="noopener noreferrer">Заметки</a>`
|
? `<a class="btn" href="${{escapeAttr(r.notes_url || ('/router/' + encodeURIComponent(r.id) + '/notes'))}}" target="_blank" rel="noopener noreferrer">Заметки</a>`
|
||||||
: `<span class="btn disabled">Заметки</span>`;
|
: `<span class="btn disabled">Заметки</span>`;
|
||||||
|
const logsButton = !!permissions.logs
|
||||||
|
? `<a class="btn" data-global-logs-link="true" href="${{escapeAttr(r.logs_url || ('/router/' + encodeURIComponent(r.id) + '/logs'))}}" target="_blank" rel="noopener noreferrer">Глобал логи</a>`
|
||||||
|
: `<span class="btn disabled">Глобал логи</span>`;
|
||||||
const renameLabel = 'Переименовать ' + (r.name || r.id || 'роутер');
|
const renameLabel = 'Переименовать ' + (r.name || r.id || 'роутер');
|
||||||
const renameButton = !!permissions.manage
|
const renameButton = !!permissions.manage
|
||||||
? `<button class="nameEditBtn" type="button" data-rename="${{escapeAttr(r.id)}}" aria-label="${{escapeAttr(renameLabel)}}" title="${{escapeAttr(renameLabel)}}"><svg viewBox="0 0 24 24" aria-hidden="true" focusable="false"><path fill="currentColor" d="M3 17.25V21h3.75l11-11.03-3.75-3.75zm17.71-10.04a1.003 1.003 0 0 0 0-1.42l-2.5-2.5a1.003 1.003 0 0 0-1.42 0l-1.96 1.96 3.75 3.75z"/></svg></button>`
|
? `<button class="nameEditBtn" type="button" data-rename="${{escapeAttr(r.id)}}" aria-label="${{escapeAttr(renameLabel)}}" title="${{escapeAttr(renameLabel)}}"><svg viewBox="0 0 24 24" aria-hidden="true" focusable="false"><path fill="currentColor" d="M3 17.25V21h3.75l11-11.03-3.75-3.75zm17.71-10.04a1.003 1.003 0 0 0 0-1.42l-2.5-2.5a1.003 1.003 0 0 0-1.42 0l-1.96 1.96 3.75 3.75z"/></svg></button>`
|
||||||
@@ -7982,6 +8150,7 @@ render = function(list) {{
|
|||||||
${{sshButton}}
|
${{sshButton}}
|
||||||
${{wolButton}}
|
${{wolButton}}
|
||||||
${{notesButton}}
|
${{notesButton}}
|
||||||
|
${{logsButton}}
|
||||||
${{permissions.config ? `<a class="btn" href="${{escapeAttr(r.config_url)}}">OpenWrt config</a>` : '<span class="btn disabled">OpenWrt config</span>'}}
|
${{permissions.config ? `<a class="btn" href="${{escapeAttr(r.config_url)}}">OpenWrt config</a>` : '<span class="btn disabled">OpenWrt config</span>'}}
|
||||||
${{permissions.delete ? `<button class="btn" data-delete="${{escapeAttr(r.id)}}">Удалить</button>` : '<span class="btn disabled">Удалить</span>'}}
|
${{permissions.delete ? `<button class="btn" data-delete="${{escapeAttr(r.id)}}">Удалить</button>` : '<span class="btn disabled">Удалить</span>'}}
|
||||||
</div>
|
</div>
|
||||||
@@ -8489,7 +8658,7 @@ if (routerFormToggle) {{
|
|||||||
initRouterFormToggle();
|
initRouterFormToggle();
|
||||||
syncHubMenuPlacement();
|
syncHubMenuPlacement();
|
||||||
initMobilePanelToggle(hubMenuToggle, headerActions, 'Открыть меню хаба', 'Скрыть меню хаба');
|
initMobilePanelToggle(hubMenuToggle, headerActions, 'Открыть меню хаба', 'Скрыть меню хаба');
|
||||||
initMobilePanelToggle(routerStatsToggle, routerStats, 'Открыть статистику', 'Скрыть статистику');
|
initMobilePanelToggle(routerStatsToggle, routerStats, 'Открыть статистику', 'Скрыть статистику', false);
|
||||||
document.body.classList.remove('preload-mobile-panels');
|
document.body.classList.remove('preload-mobile-panels');
|
||||||
|
|
||||||
async function handleXrayReload() {{
|
async function handleXrayReload() {{
|
||||||
@@ -12014,6 +12183,74 @@ window.setTimeout(focusTerminal, 80);
|
|||||||
</html>"""
|
</html>"""
|
||||||
|
|
||||||
|
|
||||||
|
def router_logs_html(router):
|
||||||
|
title = html.escape(str(router.get('name') or router['id']))
|
||||||
|
endpoint = json.dumps('/api/router/' + urllib.parse.quote(router['id'], safe='') + '/logs')
|
||||||
|
download = html.escape('/api/router/' + urllib.parse.quote(router['id'], safe='') + '/logs/download', quote=True)
|
||||||
|
return '''<!doctype html>
|
||||||
|
<html lang="ru"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1">
|
||||||
|
<title>Глобал логи — __TITLE__</title><style>
|
||||||
|
:root{color-scheme:dark;--bg:#07040f;--grid:rgba(168,85,247,.13)}
|
||||||
|
*{box-sizing:border-box}body{min-height:100vh;margin:0;overflow-x:hidden;background-color:var(--bg);background-image:radial-gradient(circle at 16% 10%,rgba(168,85,247,.45),transparent 30%),radial-gradient(circle at 88% 16%,rgba(59,130,246,.28),transparent 32%),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-attachment:fixed;color:#f5f3ff;font:14px/1.5 system-ui,sans-serif}
|
||||||
|
.wrap{max-width:1150px;margin:auto;padding:20px}.panel{padding:18px;border:1px solid #574267;border-radius:12px;background:#191226}
|
||||||
|
.head{display:flex;justify-content:space-between;align-items:center;gap:12px;flex-wrap:wrap}h1{font-size:22px;margin:0}h2{margin:4px 0 12px;font-size:16px;overflow-wrap:anywhere}
|
||||||
|
.note{margin:12px 0;padding:10px 12px;background:#f59e0b1a;border:1px solid #f59e0b59;border-left:3px solid #f59e0b;border-radius:8px;color:#fde68a;font-size:12px}
|
||||||
|
.actions,.legend{display:flex;gap:8px;flex-wrap:wrap;margin:12px 0}.btn{display:inline-flex;align-items:center;justify-content:center;min-height:40px;padding:9px 14px;color:#f5f3ff;background:#393044;border:1px solid #655574;border-radius:8px;font:700 13px system-ui;cursor:pointer;text-decoration:none}.btn:disabled{opacity:.5;cursor:wait}.bad{border-color:#ef444470}
|
||||||
|
.legend{font-size:12px;font-weight:700;gap:14px}.ok{color:#86efac}.warn{color:#fde68a}.error{color:#f87171}
|
||||||
|
#logsDiagnosis{margin:12px 0;padding:10px 12px;border:1px solid currentColor;border-radius:8px;overflow-wrap:anywhere}
|
||||||
|
#logsText{margin:12px 0 0;min-height:200px;max-height:65vh;overflow:auto;padding:12px;background:#0d0917;border:1px solid #514065;border-radius:8px;white-space:pre-wrap;overflow-wrap:anywhere;word-break:break-word;font:12px/1.5 ui-monospace,Consolas,monospace}.line{display:block}#logsStatus{color:#d2c3e0;font-size:12px;overflow-wrap:anywhere}
|
||||||
|
@media(max-width:600px){.wrap{padding:12px}.panel{padding:12px}.actions{display:grid;grid-template-columns:1fr}.actions .btn{width:100%}.head .btn{width:100%}h1{font-size:20px}}
|
||||||
|
@media(max-width:680px),(pointer:coarse){body{background-attachment:scroll;background-image:linear-gradient(145deg,#07040f,#120a24 54%,#05030a)}.legend{justify-content:center;text-align:center;row-gap:8px}}
|
||||||
|
</style></head><body><main class="wrap"><section class="panel">
|
||||||
|
<div class="head"><h1>Глобал логи</h1><a class="btn" href="/">Вернуться в Hub</a></div><h2>__TITLE__</h2>
|
||||||
|
<blockquote class="note">Действия панели, Heartbeat, WAN, предупреждения и ошибки Xray этого роутера. Копия доставляется на VPS каждые 3 секунды, пока доступна связь. Если роутер оффлайн, доступны последние доставленные записи. На роутере журнал хранится только в ОЗУ и очищается после перезагрузки и каждые 24 часа. Архив VPS сохраняется отдельно: до 2 МБ на роутер. Ключи и пароли скрываются.</blockquote>
|
||||||
|
<div class="legend" aria-label="Цвета журнала"><span class="ok">● Успешно</span><span class="warn">● Предупреждение</span><span class="error">● Ошибка</span></div>
|
||||||
|
<div class="actions"><a class="btn" href="__DOWNLOAD__">Скачать логи</a><button class="btn" id="logsLive" type="button">Запустить в реальном времени</button><button class="btn bad" id="logsClear" type="button">Очистить логи</button></div>
|
||||||
|
<div id="logsDiagnosis" class="warn" role="status">Получаю состояние роутера…</div><div id="logsStatus" role="status">Загружаю сохранённые записи с VPS…</div><pre id="logsText" tabindex="0">Загрузка записей журнала…</pre>
|
||||||
|
</section></main><script>
|
||||||
|
(function(){
|
||||||
|
const endpoint=__ENDPOINT__, output=document.getElementById('logsText'), status=document.getElementById('logsStatus'), diagnosis=document.getElementById('logsDiagnosis'), live=document.getElementById('logsLive'), clear=document.getElementById('logsClear');
|
||||||
|
let running=false, timer=null, controller=null, generation=0, lastText=null;
|
||||||
|
function tone(line){if(/^\\[ERROR\\]/.test(line))return 'error';if(/^\\[WARN\\]/.test(line))return 'warn';return 'ok';}
|
||||||
|
function render(text){
|
||||||
|
if(lastText===text && output.querySelector('.line'))return;
|
||||||
|
const bottom=output.scrollHeight-output.clientHeight-output.scrollTop<24, top=output.scrollTop, fragment=document.createDocumentFragment();
|
||||||
|
const lines=text ? text.replace(/\\r\\n/g,'\\n').replace(/\\n$/,'').split('\\n') : ['Журнал пока пуст. Записи появятся после установки фикса на роутер и первой доставки на VPS.'];
|
||||||
|
lines.forEach(line=>{const span=document.createElement('span');span.className='line '+tone(line);span.textContent=line||' ';fragment.appendChild(span);});
|
||||||
|
output.replaceChildren(fragment);lastText=text;output.scrollTop=bottom?output.scrollHeight:top;
|
||||||
|
}
|
||||||
|
function stamp(value){return value ? new Date(value*1000).toLocaleString() : 'ещё не доставлялись';}
|
||||||
|
function showDiagnosis(data){const value=data.diagnosis||{};diagnosis.className=['ok','warn','error'].includes(value.level)?value.level:'warn';diagnosis.textContent=(value.text||'Сведения о причине пока не получены.')+(value.at?' · Подтверждено: '+stamp(value.at):'');}
|
||||||
|
function stop(){running=false;generation++;if(timer!==null)clearTimeout(timer);timer=null;if(controller)controller.abort();controller=null;live.textContent='Запустить в реальном времени';live.setAttribute('aria-pressed','false');}
|
||||||
|
async function refresh(once){
|
||||||
|
if(document.hidden || (!running&&!once))return;
|
||||||
|
const current=generation, request=new AbortController();controller=request;const timeout=setTimeout(()=>request.abort(),10000);
|
||||||
|
try{
|
||||||
|
const response=await fetch(endpoint,{cache:'no-store',signal:request.signal});
|
||||||
|
if(!response.ok)throw new Error('HTTP '+response.status);
|
||||||
|
const data=await response.json();if(current!==generation)return;
|
||||||
|
render(data.text||'');
|
||||||
|
showDiagnosis(data);
|
||||||
|
status.textContent=(data.online?'Роутер онлайн':'Роутер оффлайн — показан архив VPS')+' · Последняя доставка: '+stamp(data.last_sync)+' · Объём архива: '+Math.ceil(data.bytes/1024)+' КБ'+(data.bytes>65536?' · На экране последние 64 КБ; полный журнал доступен через «Скачать логи».':'')+(data.pending_clear?' · Очистка журнала роутера ожидает связи.':'');
|
||||||
|
}catch(error){if(current===generation)status.textContent='Не удалось получить логи: '+error.message+(running?'. Повтор через 3 секунды.':'');}
|
||||||
|
finally{clearTimeout(timeout);if(controller===request)controller=null;if(current===generation&&running&&!document.hidden)timer=setTimeout(refresh,3000);}
|
||||||
|
}
|
||||||
|
live.addEventListener('click',()=>{if(running){stop();return;}stop();running=true;live.textContent='Остановить просмотр';live.setAttribute('aria-pressed','true');refresh();});
|
||||||
|
clear.addEventListener('click',async()=>{
|
||||||
|
const resume=running;stop();clear.disabled=true;live.disabled=true;const request=new AbortController(), timeout=setTimeout(()=>request.abort(),10000);
|
||||||
|
try{
|
||||||
|
const response=await fetch(endpoint+'/clear',{method:'POST',cache:'no-store',signal:request.signal});
|
||||||
|
if(!response.ok)throw new Error('HTTP '+response.status);
|
||||||
|
const data=await response.json();render('');showDiagnosis(data);status.textContent=data.message;
|
||||||
|
}catch(error){status.textContent='Не удалось очистить логи: '+error.message;}
|
||||||
|
finally{clearTimeout(timeout);clear.disabled=false;live.disabled=false;if(resume){running=true;live.textContent='Остановить просмотр';live.setAttribute('aria-pressed','true');refresh();}}
|
||||||
|
});
|
||||||
|
document.addEventListener('visibilitychange',()=>{generation++;if(timer!==null)clearTimeout(timer);timer=null;if(controller)controller.abort();if(running&&!document.hidden)refresh();});
|
||||||
|
window.addEventListener('pagehide',stop);refresh(true);
|
||||||
|
})();
|
||||||
|
</script></body></html>'''.replace('__TITLE__', title).replace('__DOWNLOAD__', download).replace('__ENDPOINT__', endpoint)
|
||||||
|
|
||||||
|
|
||||||
def router_notes_html(router, username="", saved="", error="", draft=None, edit_note_id=""):
|
def router_notes_html(router, username="", saved="", error="", draft=None, edit_note_id=""):
|
||||||
router = dict(router or {})
|
router = dict(router or {})
|
||||||
router_id = str(router.get("id") or "").strip()
|
router_id = str(router.get("id") or "").strip()
|
||||||
@@ -12578,7 +12815,7 @@ button:hover{{filter:brightness(1.06)}}
|
|||||||
<form class="login" method="post" action="/login">
|
<form class="login" method="post" action="/login">
|
||||||
{error_html}
|
{error_html}
|
||||||
<span class="brand">
|
<span class="brand">
|
||||||
<h1 class="appBanner"><span>OpenWrt Remote Hub <span class="appBannerVersion">v115</span></span></h1>
|
<h1 class="appBanner"><span>OpenWrt Remote Hub <span class="appBannerVersion">v116</span></span></h1>
|
||||||
</span>
|
</span>
|
||||||
<label for="hubUsername">Логин</label>
|
<label for="hubUsername">Логин</label>
|
||||||
<input id="hubUsername" name="username" autocomplete="off" autofocus required>
|
<input id="hubUsername" name="username" autocomplete="off" autofocus required>
|
||||||
@@ -13050,7 +13287,7 @@ body::after{{content:"";position:fixed;inset:0;pointer-events:none;background:li
|
|||||||
<circle cx="65" cy="59" r="3" fill="#E5F2FF"/>
|
<circle cx="65" cy="59" r="3" fill="#E5F2FF"/>
|
||||||
</svg>
|
</svg>
|
||||||
</div>
|
</div>
|
||||||
<h2 class="brandTitle">OpenWrt Remote Hub <span class="brandVersion">v115</span></h2>
|
<h2 class="brandTitle">OpenWrt Remote Hub <span class="brandVersion">v116</span></h2>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="brandBottom">
|
<div class="brandBottom">
|
||||||
@@ -14109,6 +14346,8 @@ class App:
|
|||||||
if not new:
|
if not new:
|
||||||
continue
|
continue
|
||||||
if bool(old.get("online")) and not bool(new.get("online")):
|
if bool(old.get("online")) and not bool(new.get("online")):
|
||||||
|
with self.conn() as conn:
|
||||||
|
record_router_connection_log(conn, router_id, False)
|
||||||
notify_router_offline(new.get("router") or {})
|
notify_router_offline(new.get("router") or {})
|
||||||
|
|
||||||
def router_state_monitor_loop(self):
|
def router_state_monitor_loop(self):
|
||||||
@@ -15582,6 +15821,58 @@ a{{display:inline-flex;margin-top:18px;color:#93c5fd}}
|
|||||||
[("Set-Cookie", current_router_cookie(router_id))],
|
[("Set-Cookie", current_router_cookie(router_id))],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def router_logs_page(self, router_id):
|
||||||
|
if not self.require_router_access(router_id, 'G'):
|
||||||
|
return
|
||||||
|
with self.app.conn() as conn:
|
||||||
|
row = get_active_router(conn, router_id)
|
||||||
|
if not row:
|
||||||
|
self.send_text(404, 'router not found')
|
||||||
|
return
|
||||||
|
self.send_bytes(200, router_logs_html(row_to_router(row)).encode('utf-8'), 'text/html; charset=utf-8',
|
||||||
|
[('Cache-Control', 'no-store')])
|
||||||
|
|
||||||
|
def router_logs_api(self, router_id, mode='live'):
|
||||||
|
if not self.require_router_access(router_id, 'G', json_mode=True):
|
||||||
|
return
|
||||||
|
with self.app.conn() as conn:
|
||||||
|
row = get_active_router(conn, router_id)
|
||||||
|
if not row:
|
||||||
|
self.send_json(404, {'ok': False, 'error': 'router not found'})
|
||||||
|
return
|
||||||
|
if mode == 'clear':
|
||||||
|
clear_router_log_archive(conn, router_id)
|
||||||
|
snapshot, raw = router_log_snapshot(conn, router_id)
|
||||||
|
else:
|
||||||
|
snapshot, raw = router_log_snapshot(conn, router_id)
|
||||||
|
router = row_to_router(row)
|
||||||
|
if mode == 'download':
|
||||||
|
name = clean_router_id(router_id)
|
||||||
|
filename = f'owrt-remote-global-{name}-{dt.datetime.now().strftime("%Y%m%d-%H%M%S")}.log'
|
||||||
|
self.send_bytes(200, raw, 'text/plain; charset=utf-8',
|
||||||
|
[('Cache-Control', 'no-store'), ('Content-Disposition', f'attachment; filename="{filename}"')])
|
||||||
|
else:
|
||||||
|
payload = {'ok': True, 'router_id': router_id, 'online': router['online'], **snapshot}
|
||||||
|
if mode == 'clear':
|
||||||
|
payload['message'] = 'Архив VPS очищен. Журнал роутера будет очищен при следующем соединении.'
|
||||||
|
self.send_json(200, payload)
|
||||||
|
|
||||||
|
def receive_router_logs_api(self):
|
||||||
|
if not self.agent_ok():
|
||||||
|
self.send_json(401, {'ok': False, 'error': 'bad agent token'})
|
||||||
|
return
|
||||||
|
try:
|
||||||
|
if self.headers.get('Transfer-Encoding') or not 0 < int(self.headers.get('Content-Length', '0')) <= 100000:
|
||||||
|
self.close_connection = True
|
||||||
|
self.send_json(413, {'ok': False, 'error': 'log request is too large or has no length'})
|
||||||
|
return
|
||||||
|
payload = self.read_payload()
|
||||||
|
with self.app.conn() as conn:
|
||||||
|
reply = receive_router_logs(conn, payload.get('id'), payload.get('batch'), payload.get('state'))
|
||||||
|
self.send_json(200, {'ok': True, **reply})
|
||||||
|
except Exception as exc:
|
||||||
|
self.send_json(400, {'ok': False, 'error': str(exc)})
|
||||||
|
|
||||||
def router_notes_page(self, router_id, error="", draft=None, status=200, edit_note_id=""):
|
def router_notes_page(self, router_id, error="", draft=None, status=200, edit_note_id=""):
|
||||||
if not self.require_router_access(router_id, "A"):
|
if not self.require_router_access(router_id, "A"):
|
||||||
return
|
return
|
||||||
@@ -17246,6 +17537,10 @@ exit 127
|
|||||||
return
|
return
|
||||||
self.send_json(200, push_status_snapshot())
|
self.send_json(200, push_status_snapshot())
|
||||||
return
|
return
|
||||||
|
log_match = re.fullmatch(r'/api/router/([^/]+)/logs(?:/(download))?', path)
|
||||||
|
if log_match:
|
||||||
|
self.router_logs_api(urllib.parse.unquote(log_match[1]), log_match[2] or 'live')
|
||||||
|
return
|
||||||
if path.startswith("/api/router/") and path.endswith("/wol/devices"):
|
if path.startswith("/api/router/") and path.endswith("/wol/devices"):
|
||||||
parts = path.strip("/").split("/")
|
parts = path.strip("/").split("/")
|
||||||
if len(parts) != 5 or parts[0] != "api" or parts[1] != "router" or parts[3] != "wol" or parts[4] != "devices":
|
if len(parts) != 5 or parts[0] != "api" or parts[1] != "router" or parts[3] != "wol" or parts[4] != "devices":
|
||||||
@@ -17266,6 +17561,9 @@ exit 127
|
|||||||
self.send_json(400, {"ok": False, "error": str(exc), "router_id": router_id, "devices": []})
|
self.send_json(400, {"ok": False, "error": str(exc), "router_id": router_id, "devices": []})
|
||||||
return
|
return
|
||||||
if path.startswith("/router/"):
|
if path.startswith("/router/"):
|
||||||
|
if path.endswith('/logs'):
|
||||||
|
self.router_logs_page(self.router_id_from_path('/router/'))
|
||||||
|
return
|
||||||
if "/notes-media/" in path:
|
if "/notes-media/" in path:
|
||||||
self.router_note_media_page(path)
|
self.router_note_media_page(path)
|
||||||
return
|
return
|
||||||
@@ -17302,6 +17600,9 @@ exit 127
|
|||||||
if path.startswith("/api/ssh-session/"):
|
if path.startswith("/api/ssh-session/"):
|
||||||
self.ssh_session_action(path)
|
self.ssh_session_action(path)
|
||||||
return
|
return
|
||||||
|
if path == '/api/router-logs':
|
||||||
|
self.receive_router_logs_api()
|
||||||
|
return
|
||||||
if path == "/api/heartbeat":
|
if path == "/api/heartbeat":
|
||||||
if not self.agent_ok():
|
if not self.agent_ok():
|
||||||
self.send_json(401, {"ok": False, "error": "bad agent token"})
|
self.send_json(401, {"ok": False, "error": "bad agent token"})
|
||||||
@@ -17310,6 +17611,8 @@ exit 127
|
|||||||
payload = self.read_payload()
|
payload = self.read_payload()
|
||||||
with self.app.conn() as conn:
|
with self.app.conn() as conn:
|
||||||
router = heartbeat(conn, payload)
|
router = heartbeat(conn, payload)
|
||||||
|
if router and router.get('_became_online'):
|
||||||
|
record_router_connection_log(conn, router['id'], True)
|
||||||
if router and router.pop("_became_online", False):
|
if router and router.pop("_became_online", False):
|
||||||
notify_router_online(router)
|
notify_router_online(router)
|
||||||
xray_reload = None
|
xray_reload = None
|
||||||
@@ -17347,6 +17650,10 @@ exit 127
|
|||||||
return
|
return
|
||||||
if not self.require_admin():
|
if not self.require_admin():
|
||||||
return
|
return
|
||||||
|
log_match = re.fullmatch(r'/api/router/([^/]+)/logs/clear', path)
|
||||||
|
if log_match:
|
||||||
|
self.router_logs_api(urllib.parse.unquote(log_match[1]), 'clear')
|
||||||
|
return
|
||||||
if path == "/api/auth":
|
if path == "/api/auth":
|
||||||
if not self.require_owner():
|
if not self.require_owner():
|
||||||
return
|
return
|
||||||
@@ -17901,6 +18208,7 @@ exit 127
|
|||||||
"update routers set deleted_at = ?, updated_at = ? where id = ?",
|
"update routers set deleted_at = ?, updated_at = ? where id = ?",
|
||||||
(ts, ts, router_id),
|
(ts, ts, router_id),
|
||||||
)
|
)
|
||||||
|
conn.execute('delete from router_logs where router_id = ?', (router_id,))
|
||||||
conn.commit()
|
conn.commit()
|
||||||
deleted = True
|
deleted = True
|
||||||
if deleted:
|
if deleted:
|
||||||
|
|||||||
Reference in new issue
Block a user