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
+12
-12
@@ -1,4 +1,4 @@
|
||||
# Фиксация VPS host и независимое соединение Remote через WAN (v115)
|
||||
# Фиксация VPS host и независимое соединение Remote через WAN (v116)
|
||||
|
||||
`vps_host_mode=manual` сохраняет заданный на роутере адрес. Это значение
|
||||
используется и когда опция отсутствует у старой установки. Только явно
|
||||
@@ -42,8 +42,8 @@ powershell.exe -NoProfile -ExecutionPolicy Bypass -File "vps\deploy-hub-url-fix.
|
||||
```
|
||||
|
||||
Откат: те же команды с `-Action Rollback`, без `-HubUrl`. Резервные копии:
|
||||
`/root/owrt-remote-backup-before-hub-url-v115` на роутере и
|
||||
`/opt/owrt-remote/owrt-remote-hub.py.bak-before-hub-url-v115` на VPS.
|
||||
`/root/owrt-remote-backup-before-hub-url-v116` на роутере и
|
||||
`/opt/owrt-remote/owrt-remote-hub.py.bak-before-hub-url-v116` на VPS.
|
||||
`HEARTBEAT_OK` подтверждает ответ Hub. Если файлы установлены, но Hub недоступен,
|
||||
скрипт отдельно сообщает `HEARTBEAT_FAILED`; это не подтверждение связи.
|
||||
|
||||
@@ -125,21 +125,21 @@ powershell.exe -NoProfile -ExecutionPolicy Bypass -File "vps\deploy-host-policy.
|
||||
|
||||
Установка загружает локальные файлы, без Git. До остановки службы проверяются
|
||||
доступность WAN и поддержка таблицы реальной командой ip на роутере.
|
||||
На роутер загружается и файл LuCI: версия v115 появляется и в основной
|
||||
На роутер загружается и файл LuCI: версия v116 появляется и в основной
|
||||
CGI-панели, и в странице входа в неё через LuCI.
|
||||
Сначала сохраняются файлы
|
||||
и конфигурация; после замены проверяется heartbeat/health. При ошибке
|
||||
автоматически восстанавливается состояние перед текущей попыткой.
|
||||
Сохранённая резервная копия для ручного отката не перезаписывается.
|
||||
|
||||
* Роутер: `/root/owrt-remote-backup-before-host-policy-v115` — агент,
|
||||
* Роутер: `/root/owrt-remote-backup-before-host-policy-v116` — агент,
|
||||
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_VPS_V115_Install_OK` на VPS. Старые резервные копии предыдущей
|
||||
версии сохраняются; новые команды отката используют отдельные копии для v115.
|
||||
Успешная установка заканчивается `HOST_POLICY_ROUTER_V116_OK` на роутере
|
||||
и `HOST_POLICY_VPS_V116_Install_OK` на VPS. Старые резервные копии предыдущей
|
||||
версии сохраняются; новые команды отката используют отдельные копии для v116.
|
||||
|
||||
### Переход с nftables-маркировки на адресную маршрутизацию
|
||||
|
||||
@@ -148,11 +148,11 @@ CGI-панели, и в странице входа в неё через LuCI.
|
||||
Обновление VPS для этого изменения не требуется.
|
||||
|
||||
```powershell
|
||||
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "vps\deploy-host-policy.ps1" -Target Router -Machine "root@192.168.2.1" -PreserveConnectionSettings -BackupName "podkop-compat-v115" -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" -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-v116" -Action Rollback
|
||||
```
|
||||
|
||||
Копия: `/root/owrt-remote-backup-before-podkop-compat-v115`.
|
||||
Копия: `/root/owrt-remote-backup-before-podkop-compat-v116`.
|
||||
После установки повторите диагностику Podkop. Предупреждение от прежних правил
|
||||
Remote должно исчезнуть. Настоящие дополнительные правила других приложений
|
||||
по-прежнему обнаруживаются штатной диагностикой.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# reCAPTCHA v3 в OpenWrt Remote Hub v115
|
||||
# reCAPTCHA v3 в OpenWrt Remote Hub v116
|
||||
|
||||
В меню владельца, в блоке «Капча на экране входа», доступны цифры,
|
||||
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/captcha-before-recaptcha-v3-v115.json` (режим 0600).
|
||||
* `/opt/owrt-remote/owrt-remote-hub.py.bak-before-recaptcha-v3-v116`
|
||||
* `/opt/owrt-remote/captcha-before-recaptcha-v3-v116.json` (режим 0600).
|
||||
|
||||
Скрипт рассчитан на стандартные пути установленного Hub:
|
||||
`/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
|
||||
|
||||
@@ -115,7 +115,7 @@ powershell.exe -NoProfile -ExecutionPolicy Bypass -File "vps\deploy-resource-fix
|
||||
|
||||
Установщик загружает локальный файл без Git, запускает изолированные тесты,
|
||||
сохраняет исходный серверный файл:
|
||||
`/opt/owrt-remote/owrt-remote-hub.py.bak-before-resource-fix-v115`,
|
||||
`/opt/owrt-remote/owrt-remote-hub.py.bak-before-resource-fix-v116`,
|
||||
атомарно заменяет Python файл, перезапускает `owrt-remote` и проверяет health.
|
||||
Существующая резервная копия не перезаписывается. При ошибке установки
|
||||
восстанавливается файл, работавший непосредственно перед текущей попыткой.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Виджеты ресурсов VPS (v115)
|
||||
# Виджеты ресурсов VPS (v116)
|
||||
|
||||
Три карточки ЦП, ОЗУ и ДИСК находятся над кнопками «Рестарт Xray VPS»,
|
||||
профилем и выходом. На ПК ширина и высота совпадают с кнопками под ними.
|
||||
@@ -23,7 +23,7 @@ vCPU и объёмы занятой/общей памяти и диска.
|
||||
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\Documents\openwrt overlay\vps\deploy-vps-widgets.ps1" -Vps "root@193.233.82.38" -Action Install
|
||||
```
|
||||
|
||||
После `VPS_WIDGETS_V115_Install_OK` обновите страницу через Ctrl+F5.
|
||||
После `VPS_WIDGETS_V116_Install_OK` обновите страницу через Ctrl+F5.
|
||||
Скрипт загружает локальный файл, проверяет его до замены, перезапускает
|
||||
службу и проверяет health. При ошибке после замены восстанавливает файл
|
||||
перед текущей попыткой. База данных и настройки не заменяются.
|
||||
@@ -33,8 +33,8 @@ powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\
|
||||
```
|
||||
|
||||
Откат использует неизменяемую копию первого состояния до установки:
|
||||
`/opt/owrt-remote/owrt-remote-hub.py.bak-before-vps-widgets-v115`.
|
||||
Успешное завершение: `VPS_WIDGETS_V115_Rollback_OK`.
|
||||
`/opt/owrt-remote/owrt-remote-hub.py.bak-before-vps-widgets-v116`.
|
||||
Успешное завершение: `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 вместе. До замены
|
||||
сохраняются прежние файлы, UCI-настройки и Xray config в
|
||||
`/root/owrt-remote-backup-before-wan-multi-v115`.
|
||||
`/root/owrt-remote-backup-before-wan-multi-v116`.
|
||||
Успех подтверждает `WAN_MULTI_ROUTER_Install_OK`. После установки обновить
|
||||
панель роутера через Ctrl+F5, отметить интерфейсы и сохранить выбор.
|
||||
VPS обновлять не требуется. Старый `deploy-wan-interface-picker.ps1`
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Исправление запуска прямого WAN в v115
|
||||
# Исправление запуска прямого WAN в v116
|
||||
|
||||
На проблемном роутере обычный `wan` был поднят, имел IPv4-адрес,
|
||||
маршрут и рабочий DNS. Проверка `ip -4 route show table 210` возвращала
|
||||
@@ -16,7 +16,7 @@ instance после шести падений. Из-за остановленн
|
||||
конфигурации останавливают агент до запуска Xray.
|
||||
|
||||
Изменены только `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
|
||||
для этого исправления не требуется.
|
||||
|
||||
@@ -28,7 +28,7 @@ powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\
|
||||
|
||||
Скрипт перед заменой проверяет синтаксис и подготовку WAN новым helper,
|
||||
сохраняет агент, helper, UCI и Xray-конфигурацию в
|
||||
`/root/owrt-remote-backup-before-wan-stability-v115`. Сохранённая копия
|
||||
`/root/owrt-remote-backup-before-wan-stability-v116`. Сохранённая копия
|
||||
не перезаписывается при повторной установке. После замены выполняются
|
||||
перезапуск, проверка процесса Xray и настоящий heartbeat до Hub.
|
||||
При ошибке восстанавливается состояние до текущей попытки.
|
||||
|
||||
+4
-4
@@ -1,4 +1,4 @@
|
||||
# Применение OpenWrt config через панель роутера (v115)
|
||||
# Применение OpenWrt config через панель роутера (v116)
|
||||
|
||||
При отправке textarea браузер кодирует переносы строк как CRLF. CGI
|
||||
декодировал их без нормализации и записывал CR в исполняемый shell-скрипт.
|
||||
@@ -22,7 +22,7 @@ CRLF и LF, heredoc, пустые строки, кодированные сим
|
||||
|
||||
Скрипт обновляет только CGI на роутере. VPS обновлять для этого фикса
|
||||
не требуется. До замены сохраняется первая резервная копия 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, если адрес роутера отличается:
|
||||
|
||||
@@ -53,7 +53,7 @@ python tests/test_xray_apply.py -v
|
||||
|
||||
Переносы строк в формах описаны в [стандарте HTML](https://html.spec.whatwg.org/multipage/form-control-infrastructure.html).
|
||||
|
||||
## Мобильная вставка команд (локальный фикс v115)
|
||||
## Мобильная вставка команд (локальный фикс v116)
|
||||
|
||||
Воспроизведён отдельный случай `rc=255`: в строке
|
||||
`uci set owrtremote.main.router_name=‘Дом у моря’` типографские кавычки
|
||||
@@ -77,7 +77,7 @@ python tests/test_xray_apply.py -v
|
||||
|
||||
Обновляется только `/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:
|
||||
|
||||
|
||||
+151
-7
@@ -1,5 +1,7 @@
|
||||
"""Exercise the real RAM journal and authorized router CGI with temporary files."""
|
||||
import concurrent.futures
|
||||
import base64
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
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 = source.replace('log_clock() { cut -d. -f1 /proc/uptime; }',
|
||||
'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.cgi = self.root / 'cgi'
|
||||
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('Xray connected', downloaded)
|
||||
self.assertIn('Cache-Control: no-store', downloaded)
|
||||
for _ in range(70):
|
||||
self.helper_call('append', 'y' * 1024 + '\n')
|
||||
# The bounded read is independent of append filtering; supply an existing large journal.
|
||||
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]
|
||||
# Git for Windows can translate CRLF inside native pipes.
|
||||
self.assertLessEqual(len(live.encode()), 65536)
|
||||
self.assertGreater(len(live.encode()), 64000)
|
||||
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):
|
||||
self.helper_call('append', 'retain this event\n')
|
||||
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.assertEqual(self.helper_call('read'), '')
|
||||
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):
|
||||
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.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):
|
||||
self.helper_call('clear')
|
||||
current = self.log_dir / 'current.log'
|
||||
current.write_text('A' * 1048576, encoding='utf-8')
|
||||
self.helper_call('append', 'second file\n')
|
||||
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')
|
||||
self.helper_call('append', 'third file\n')
|
||||
output = self.helper_call('read')
|
||||
@@ -111,7 +255,7 @@ class GlobalLogTests(unittest.TestCase):
|
||||
def test_parallel_events_do_not_corrupt_or_drop_lines(self):
|
||||
with concurrent.futures.ThreadPoolExecutor(max_workers=4) as pool:
|
||||
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())
|
||||
|
||||
def test_stale_lock_recovers(self):
|
||||
@@ -120,7 +264,7 @@ class GlobalLogTests(unittest.TestCase):
|
||||
lock.mkdir()
|
||||
(lock / 'pid').write_text('99999999')
|
||||
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):
|
||||
self.helper.unlink()
|
||||
@@ -130,7 +274,7 @@ class GlobalLogTests(unittest.TestCase):
|
||||
self.helper_call('clear')
|
||||
(self.log_dir / 'lock').mkdir()
|
||||
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):
|
||||
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/uhttpd'] = (self.root / 'etc/init.d/uhttpd').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))
|
||||
self.script = re.sub(pattern, lambda match: mappings[match.group()], self.script)
|
||||
# Existing sandbox service scripts only print markers. Mock readiness.
|
||||
@@ -51,6 +51,7 @@ class GlobalLogsDeploymentTests(unittest.TestCase):
|
||||
logread() { return 0; }
|
||||
ubus() { printf '{"running": true}\\n'; }
|
||||
mkfifo() { return 0; }
|
||||
jsonfilter() { return 0; }
|
||||
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)
|
||||
@@ -73,6 +74,7 @@ logger() { printf '%s\\n' "$3" | sh "$TEST_LOG_HELPER" append; }
|
||||
text = (ROOT / source).read_text(encoding='utf-8')
|
||||
if item == 'logs.sh':
|
||||
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':
|
||||
text = '#!/bin/sh\necho logs-service-$1\n'
|
||||
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)
|
||||
for item in ('cgi', 'luci'):
|
||||
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():
|
||||
self.assertEqual(self.backup.joinpath(item).read_bytes(), data)
|
||||
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.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__':
|
||||
unittest.main()
|
||||
@@ -7,6 +7,13 @@ const { chromium } = require('playwright');
|
||||
const root = path.resolve('.test-output/global-logs');
|
||||
let text = Array.from({length: 150}, (_, i) => `Heartbeat ${i}: OK`).join('\n');
|
||||
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 url = new URL(req.url, 'http://localhost');
|
||||
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'});
|
||||
try {
|
||||
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 errors = [];
|
||||
page.on('pageerror', error => errors.push(error.message));
|
||||
@@ -59,6 +66,13 @@ const server = http.createServer((req, res) => {
|
||||
await page.locator('#globalLogsToggle').click();
|
||||
assert.equal(await page.locator('#globalLogsPanel').isVisible(), true);
|
||||
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(await page.locator('#globalLogsLive').textContent(), 'Запустить в реальном времени');
|
||||
await page.waitForTimeout(3300);
|
||||
@@ -66,6 +80,8 @@ const server = http.createServer((req, res) => {
|
||||
await page.locator('#globalLogsLive').click();
|
||||
await page.waitForFunction(() => document.querySelector('#globalLogsText').textContent.includes('Heartbeat 149'));
|
||||
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;});
|
||||
text += '\nnew event\n<script>window.bad=1</script>';
|
||||
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")
|
||||
self.assertEqual(result.returncode, 0, result.stderr)
|
||||
config = json.loads(result.stdout)
|
||||
self.assertEqual(config['log'], {'access': 'none', 'error': '', 'loglevel': 'warning'})
|
||||
for outbound in config["outbounds"]:
|
||||
if outbound["tag"].startswith("vps-"):
|
||||
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 "notifications" in json.loads(self.request("/api/notifications"))
|
||||
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()
|
||||
|
||||
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")
|
||||
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('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()))
|
||||
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()) + ' ;;')
|
||||
|
||||
@@ -29,7 +29,7 @@ class XrayMobileDeploymentTests(unittest.TestCase):
|
||||
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 = 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()))
|
||||
|
||||
def deploy(self, action, content=None, fail_verify=False):
|
||||
|
||||
Reference in new issue
Block a user