diff --git a/tests/ROUTER_UPDATES.md b/tests/ROUTER_UPDATES.md new file mode 100644 index 0000000..0d9e7e9 --- /dev/null +++ b/tests/ROUTER_UPDATES.md @@ -0,0 +1,65 @@ +# Обновление всех роутеров из Hub, v117 + +В меню владельца «Доступ к Hub» добавлен блок «Обновить все роутеры разом». +Ссылка «Открыть терминал обновления» открывает отдельную вкладку. В ней задаются +команда установки и один общий SSH-пароль root. При SSH-ключе поле можно оставить +пустым. Команда по умолчанию использует `RAW_REPO_BASE` именно этого Hub: +GitHub — GitHub, GitVerse — GitVerse. + +Hub запускает одну очередь, по одному роутеру. Имена берутся из Heartbeat +(`owrtremote.main.router_name`) и уточняются чтением UCI по SSH перед установкой. +Неуспешное подключение, ошибка команды и отсутствие подтверждения различаются. +Если SSH отклонил общий пароль, у этого роутера выводится понятная ошибка +авторизации: его пароль может отличаться от общего. Обновление на нём не +запускается, очередь переходит к следующему. Запрет входа по паролю, отсутствие +SSH-ключа и сетевые ошибки отображаются отдельно; сам пароль не показывается. +Надпись «Успешно — Советская 30» появляется только при полученном `rc=0`. +Код 0 подтверждает выполнение команды, а не проверку всех функций роутера. + +Установка запускается отдельным процессом с `setsid` на роутере, не в shell VPS. +При разрыве SSH во время установки Hub запрашивает результат по тому же ID, +не повторяя команду. При невозможности получить итог останавливаются оставшиеся +обновления, чтобы не запускать другую установку параллельно с неподтверждённой. +«Остановить очередь после текущего» не прерывает уже начатую установку. + +Временный каталог задачи расположен в `/tmp/owrt-remote-update-ID` на роутере; +вывод ограничен примерно 32 КиБ, на VPS передаётся хвост до 8 КиБ. После получения +результата каталог удаляется. При потере связи остаётся ограниченный результат +до следующей перезагрузки; нет постоянно работающего сборщика этой задачи. +Новый API доступен только владельцу, POST защищён токеном и проверкой Origin. +SSH-пароль хранится только в памяти текущего worker, не в БД/журнале/URL/browser +storage. Из вывода удаляются пароль и строки с известными форматами секретов. + +Закрытие вкладки не отменяет очередь. После открытия показывается текущее +состояние; результаты находятся в памяти VPS до двух часов после завершения. +Перезапуск Hub прерывает очередь, но уже запущенный installer на роутере +продолжает работу. После перезапуска Hub его итог нужно проверять отдельно. +Роутеры с неработающим обратным SSH-туннелем обновить этим способом нельзя. +Перед запуском списка устройств нет новых требований к их текущему клиенту. + +## Установка локальной версии на VPS из Windows PowerShell + +```powershell +powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\Documents\openwrt overlay\vps\deploy-router-updates.ps1" -Vps "root@193.233.82.38" -Action Install +``` + +Откат Hub (уже установленные на роутеры версии не откатываются этой командой): + +```powershell +powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\Documents\openwrt overlay\vps\deploy-router-updates.ps1" -Vps "root@193.233.82.38" -Action Rollback +``` + +Резервная копия: `/opt/owrt-remote/owrt-remote-hub.py.bak-before-router-updates-v117`. +Не устанавливай/не откатывай Hub, пока его очередь работает. + +## Проверки + +`python -m unittest discover -s tests -p test_router_updates.py -v` проверяет +последовательность, код результата, пароль, отказы подключения, обрыв после +запуска, остановку очереди, повторный запрос, права/CSRF и ограниченный shell +вывод. Реальный task исполняется в MSYS; там адаптирован только отсутствующий +`setsid`. Синтаксис проверяется также BusyBox ash. Настоящий Linux `setsid`, +Dropbear и обновление физического OpenWrt требуют проверки пользователем. + +`node tests/test_router_updates_ui.cjs` проверяет desktop/mobile, ввод команды, +очистку пароля, итоги, сохранение раскрытого вывода и возобновление просмотра. diff --git a/tests/test_router_updates.py b/tests/test_router_updates.py new file mode 100644 index 0000000..47f98c1 --- /dev/null +++ b/tests/test_router_updates.py @@ -0,0 +1,276 @@ +"""Sequential updates: isolated Hub, fake SSH, and real shell task execution.""" +import base64 +import http.client +import importlib.util +import json +import os +from pathlib import Path +import re +import subprocess +import sys +import tempfile +import threading +import time +import unittest +from unittest import mock + +ROOT = Path(__file__).resolve().parents[1] +STATE = tempfile.TemporaryDirectory(prefix='owrt-router-update-tests-') +spec = importlib.util.spec_from_file_location('router_update_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 b64(value): + return base64.b64encode(value.encode()).decode() + + +class UpdatesTests(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', 'owner-session', 'agent', '') + self.manager = self.app.router_updates + self.manager.POLL_SECONDS = .001 + self.manager.ROUTER_TIMEOUT = .02 + hub.save_auth_state({'username': 'owner', 'password': hub.password_digest('hub-password')}) + hub.save_sessions([]) + with self.app.conn() as conn: + for index, name in enumerate(['Old name', 'Second router']): + row = hub.upsert_router(conn, {'id': ['main', 'node-2'][index], 'name': name, + 'entry_port': 18080 + index, 'ssh_entry_port': 19080 + index}) + conn.execute('update routers set status_json=? where id=?', + (json.dumps({'name': 'Советская 30' if index == 0 else name}), row['id'])) + self.addCleanup(self.manager.stop) + + def finish(self): + self.manager.thread.join(timeout=3) + self.assertFalse(self.manager.thread.is_alive()) + return self.manager.snapshot() + + def test_sequential_names_failures_and_no_password_in_snapshot(self): + calls = [] + def ssh(row, script, password): + if 'OWRT_UPDATE_READY=1' in script: return 'OWRT_UPDATE_READY=1\n' + calls.append((row['id'], script, password)) + if 'exec setsid /bin/sh' in script: + return 'OWRT_UPDATE_STARTED=1\nOWRT_UPDATE_NAME=' + b64('Советская 30' if row['id'] == 'main' else 'node-2') + if 'OWRT_UPDATE_OUTPUT=' in script: + return 'OWRT_UPDATE_STATE=done\nOWRT_UPDATE_RC=' + ('0' if row['id'] == 'main' else '5') + '\nOWRT_UPDATE_OUTPUT=' + b64('ssh-secret\nhub_token=hidden\nCompleted') + return '' + with mock.patch.object(self.manager, '_ssh', side_effect=ssh): + self.manager.start('wget -O - "https://repo.example/install.sh" | sh', 'ssh-secret', 'request-1234567890') + job = self.finish() + self.assertEqual([x[0] for x in calls], ['main'] * 3 + ['node-2'] * 3) + self.assertTrue(all(x[2] == 'ssh-secret' for x in calls)) + self.assertEqual(job['items'][0]['name'], 'Советская 30') + self.assertEqual([x['state'] for x in job['items']], ['success', 'error']) + self.assertNotIn('ssh-secret', json.dumps(job)) + self.assertNotIn('hub_token=hidden', json.dumps(job)) + self.assertNotIn('command', job) + self.assertIsNone(getattr(self.manager.thread, '_target', None)) + + def test_launch_disconnect_polls_existing_task_without_reexecution(self): + launches = [] + def ssh(row, script, password): + if 'OWRT_UPDATE_READY=1' in script: return 'OWRT_UPDATE_READY=1\n' + if 'exec setsid /bin/sh' in script: + launches.append(row['id']) + raise RuntimeError('connection closed after acceptance') + return 'OWRT_UPDATE_STATE=done\nOWRT_UPDATE_RC=0\n' + with mock.patch.object(self.manager, '_ssh', side_effect=ssh): + self.manager.start('echo install', '', 'request-1234567891') + job = self.finish() + self.assertEqual(launches, ['main', 'node-2']) + self.assertTrue(all(x['state'] == 'success' for x in job['items'])) + + def test_unknown_result_stops_queue_without_false_success_or_overlap(self): + launches = [] + def ssh(row, script, password): + if 'OWRT_UPDATE_READY=1' in script: return 'OWRT_UPDATE_READY=1\n' + if 'exec setsid /bin/sh' in script: + launches.append(row['id']) + return 'OWRT_UPDATE_STARTED=1\n' + raise RuntimeError('temporary disconnect') + with mock.patch.object(self.manager, '_ssh', side_effect=ssh): + self.manager.start('echo install', '', 'request-1234567892') + job = self.finish() + self.assertEqual(launches, ['main']) + self.assertEqual([x['state'] for x in job['items']], ['unknown', 'skipped']) + + def test_duplicate_click_and_cancel_dont_launch_again_or_interrupt_current(self): + entered, release = threading.Event(), threading.Event() + def ssh(row, script, password): + if 'OWRT_UPDATE_READY=1' in script: return 'OWRT_UPDATE_READY=1\n' + if 'exec setsid /bin/sh' in script: + entered.set(); release.wait(2) + return 'OWRT_UPDATE_STARTED=1\n' + return 'OWRT_UPDATE_STATE=done\nOWRT_UPDATE_RC=0\n' + with mock.patch.object(self.manager, '_ssh', side_effect=ssh): + task = self.manager.start('echo install', '', 'request-1234567893') + self.assertTrue(entered.wait(2)) + self.assertEqual(task, self.manager.start('echo install', '', 'request-1234567893')) + with self.assertRaises(RuntimeError): + self.manager.start('echo install', '', 'request-1234567894') + self.manager.cancel(task) + release.set() + job = self.finish() + self.assertEqual([x['state'] for x in job['items']], ['success', 'skipped']) + + def test_missing_tunnel_and_invalid_input(self): + with self.app.conn() as conn: + conn.execute('update routers set ssh_entry_port=0, entry_port=0') + with mock.patch.object(self.manager, '_ssh') as ssh: + self.manager.start('echo install', '', 'request-1234567895') + job = self.finish() + ssh.assert_not_called() + self.assertTrue(all(x['state'] == 'skipped' for x in job['items'])) + for value in ['', 'a' * 8193, '\x00', None]: + with self.assertRaises(ValueError): + self.manager.start(value, '', 'request-1234567896') + + def test_failed_authentication_continues_without_sending_installer(self): + calls = [] + def ssh(row, script, password): + calls.append(script) + raise RuntimeError('Permission denied, please try again.\nroot@127.0.0.1: Permission denied (publickey,password).') + with mock.patch.object(self.manager, '_ssh', side_effect=ssh): + self.manager.start('echo install', 'wrong-password', 'request-1234567888') + job = self.finish() + self.assertEqual(len(calls), 2) + self.assertTrue(all('OWRT_UPDATE_READY' in script for script in calls)) + self.assertTrue(all(item['state'] == 'error' for item in job['items'])) + self.assertTrue(all('Общий SSH-пароль не принят' in item['message'] for item in job['items'])) + self.assertNotIn('строка с ключом или паролем скрыта', json.dumps(job, ensure_ascii=False)) + self.assertNotIn('wrong-password', json.dumps(job)) + + def test_wrong_common_password_skips_installer_but_next_router_succeeds(self): + launches = [] + def ssh(row, script, password): + if row['id'] == 'main': + raise RuntimeError('root@127.0.0.1: Permission denied (publickey,password,keyboard-interactive).') + if 'OWRT_UPDATE_READY=1' in script: return 'OWRT_UPDATE_READY=1\n' + if 'exec setsid /bin/sh' in script: + launches.append(row['id']) + return 'OWRT_UPDATE_STARTED=1\n' + return 'OWRT_UPDATE_STATE=done\nOWRT_UPDATE_RC=0\n' + with mock.patch.object(self.manager, '_ssh', side_effect=ssh): + self.manager.start('echo install', 'common-secret', 'request-1234567889') + job = self.finish() + self.assertEqual(launches, ['node-2']) + self.assertEqual([item['state'] for item in job['items']], ['error', 'success']) + self.assertEqual(job['items'][0]['name'], 'Советская 30') + self.assertIn('отличается от общего', job['items'][0]['message']) + self.assertNotIn('common-secret', json.dumps(job)) + + def test_authentication_diagnosis_preserves_other_errors_and_secret_filter(self): + for response in ['Permission denied', 'Permission denied (password).', 'Authentication failed.']: + with self.subTest(response=response): + self.assertIn('Общий SSH-пароль не принят', self.manager._ssh_error(response, 'secret')) + self.assertIn('SSH-ключ', self.manager._ssh_error('Permission denied (publickey).', '')) + self.assertIn('не предлагает вход по паролю', self.manager._ssh_error('Permission denied (publickey).', 'secret')) + for response in ['ssh command timeout after 20s', 'Connection refused', '/root/file: Permission denied']: + with self.subTest(response=response): + self.assertEqual(self.manager._ssh_error(response, 'secret'), response) + safe = self.manager._ssh_error('Failed: password=secret\nConnection closed', 'secret') + self.assertNotIn('secret', safe) + self.assertIn('строка с ключом или паролем скрыта', safe) + self.assertIn('Connection closed', safe) + + def test_owner_only_api_csrf_and_page_default_hosting(self): + class Quiet(hub.Handler): + def log_message(self, *args): pass + server = hub.HubHTTPServer(('127.0.0.1', 0), Quiet) + server.app = self.app + thread = threading.Thread(target=server.serve_forever, daemon=True) + thread.start() + def request(path, body=None, cookie='owner-session', csrf=None, origin=None): + headers = {'Cookie': hub.SESSION_COOKIE + '=' + cookie} + if body is not None: headers['Content-Type'] = 'application/json' + if csrf is not None: headers['X-Router-Update-CSRF'] = csrf + if origin is not None: headers['Origin'] = origin + conn = http.client.HTTPConnection('127.0.0.1', server.server_port, timeout=5) + try: + conn.request('POST' if body is not None else 'GET', path, json.dumps(body) if body is not None else None, headers) + response = conn.getresponse() + return response.status, response.read().decode() + finally: conn.close() + try: + self.assertEqual(request('/api/router-updates', cookie='')[0], 401) + with mock.patch.object(hub.Handler, 'current_account_profile', return_value={'is_owner': False}): + self.assertEqual(request('/api/router-updates')[0], 403) + self.assertEqual(request('/router-updates/')[0], 403) + status, page = request('/router-updates/') + self.assertEqual(status, 200) + self.assertIn(hub.RAW_REPO_BASE + '/install.sh', page) + self.assertIn(self.manager.csrf, page) + payload = {'command': 'echo install', 'ssh_password': '', 'request_id': 'request-1234567897'} + self.assertEqual(request('/api/router-updates/start', payload)[0], 403) + self.assertEqual(request('/api/router-updates/start', payload, csrf=self.manager.csrf, origin='https://attacker.example')[0], 403) + def ssh(row, script, password): + if 'OWRT_UPDATE_READY=1' in script: return 'OWRT_UPDATE_READY=1\n' + return 'OWRT_UPDATE_STATE=done\nOWRT_UPDATE_RC=0\n' + with mock.patch.object(self.manager, '_ssh', side_effect=ssh): + self.assertEqual(request('/api/router-updates/start', payload, csrf=self.manager.csrf)[0], 200) + self.assertTrue(all(item['state'] == 'success' for item in self.finish()['items'])) + _, body = request('/api/router-updates') + self.assertNotIn('ssh_password', body) + finally: + server.shutdown(); server.server_close(); thread.join(3) + + +class RouterTaskTests(unittest.TestCase): + @unittest.skipUnless(os.name == 'nt', 'fixture uses bundled Windows POSIX shell') + def test_real_detached_task_failure_pipefail_bounded_output_and_cleanup(self): + shell = r'C:\Program Files\Git\usr\bin\sh.exe' + with tempfile.TemporaryDirectory(prefix='owrt-update-shell-') as folder: + root = Path(folder).as_posix() + task_dir = root + '/task' + env = {**os.environ, 'PATH': str(Path(shell).parent) + os.pathsep + os.environ['PATH']} + def run(script): + file = Path(folder) / 'invoke.sh' + file.write_text(script.replace('/tmp/owrt-remote-update-fixture', task_dir), encoding='utf-8', newline='\n') + return subprocess.run([shell, file.as_posix()], capture_output=True, text=True, env=env, timeout=8) + launch = hub.router_update_launch_script('fixture', 'i=0; while [ "$i" -lt 1200 ]; do echo "A line of output to keep in a bounded tail only"; i=$((i+1)); done; false | cat') + # MSYS has FIFO/process support but no setsid applet. Linux OpenWrt + # provides setsid; only that platform-specific syscall is adapted. + result = run(launch.replace('command -v setsid', 'command -v sh').replace('exec setsid /bin/sh', 'exec /bin/sh')) + self.assertEqual(result.returncode, 0, result.stderr) + deadline = time.monotonic() + 5 + while not (Path(task_dir)/'result').exists() and time.monotonic() < deadline: + time.sleep(.05) + polled = run(hub.router_update_poll_script('fixture')) + fields = hub.router_update_fields(polled.stdout) + self.assertEqual(fields['STATE'], 'done', polled.stderr + polled.stdout) + self.assertNotEqual(fields['RC'], '0', 'wget failure must not be hidden by the succeeding shell') + self.assertLessEqual((Path(task_dir)/'output').stat().st_size, 32768) + self.assertLessEqual(len(fields['OUTPUT'].encode()), 8192) + self.assertFalse((Path(task_dir)/'stream').exists()) + self.assertEqual(run(hub.router_update_poll_script('fixture', cleanup=True)).returncode, 0) + self.assertFalse(Path(task_dir).exists()) + # A successful command yields rc=0 only after completion, and a + # replay of the same task cannot execute that command twice. + good = hub.router_update_launch_script('fixture', 'echo run >>"' + root + '/runs"; echo installed') + adapted = good.replace('command -v setsid', 'command -v sh').replace('exec setsid /bin/sh', 'exec /bin/sh') + self.assertEqual(run(adapted).returncode, 0) + self.assertEqual(run(adapted).returncode, 0) + deadline = time.monotonic() + 5 + while not (Path(task_dir)/'result').exists() and time.monotonic() < deadline: + time.sleep(.05) + fields = hub.router_update_fields(run(hub.router_update_poll_script('fixture')).stdout) + self.assertEqual(fields['RC'], '0') + self.assertEqual((Path(folder)/'runs').read_text().splitlines(), ['run']) + self.assertEqual(run(hub.router_update_poll_script('fixture', cleanup=True)).returncode, 0) + # All generated shell scripts must also parse under real BusyBox ash. + busybox = ROOT / '.test-output/busybox/busybox64.exe' + script = Path(folder)/'syntax.sh' + script.write_text(launch, encoding='utf-8', newline='\n') + self.assertEqual(subprocess.run([str(busybox), 'ash', '-n', str(script)], capture_output=True).returncode, 0) + runner = launch.split("<<'OWRT_UPDATE_RUNNER'\n", 1)[1].split('\nOWRT_UPDATE_RUNNER', 1)[0] + script.write_text(runner, encoding='utf-8', newline='\n') + self.assertEqual(subprocess.run([str(busybox), 'ash', '-n', str(script)], capture_output=True).returncode, 0) + + +if __name__ == '__main__': unittest.main() diff --git a/tests/test_router_updates_deploy.py b/tests/test_router_updates_deploy.py new file mode 100644 index 0000000..5f7c268 --- /dev/null +++ b/tests/test_router_updates_deploy.py @@ -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 RouterUpdatesDeployTests(unittest.TestCase): + def setUp(self): + self.temp = tempfile.TemporaryDirectory(prefix='vps-router-updates-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-router-updates-v117' + source = (ROOT / 'vps/deploy-router-updates.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('ROUTER_UPDATES_V117_Install_OK', result.stdout) + self.assertIn(b'class RouterUpdateManager:', 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() diff --git a/tests/test_router_updates_ui.cjs b/tests/test_router_updates_ui.cjs new file mode 100644 index 0000000..4da3048 --- /dev/null +++ b/tests/test_router_updates_ui.cjs @@ -0,0 +1,94 @@ +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/router-updates'); +fs.mkdirSync(root, {recursive: true}); +const defaultRepo = execFileSync(process.env.TEST_PYTHON || 'python', ['-c', String.raw` +import importlib.util, os, sys, tempfile +from pathlib import Path +with tempfile.TemporaryDirectory() as state: + os.environ['OWRT_REMOTE_STATE_DIR']=state + spec=importlib.util.spec_from_file_location('preview_updates','vps/owrt-remote-hub.py') + hub=importlib.util.module_from_spec(spec);sys.modules[spec.name]=hub;spec.loader.exec_module(hub) + out=Path('.test-output/router-updates') + out.joinpath('updates.html').write_text(hub.router_updates_html('test-csrf'),encoding='utf-8') + out.joinpath('dashboard.html').write_text(hub.dashboard_html([],'owner',auth_bootstrap={'username':'owner','is_owner':True}),encoding='utf-8') + print(hub.RAW_REPO_BASE) +`], {env:{...process.env,PYTHONIOENCODING:'utf-8'},encoding:'utf-8'}).trim(); +let job = null, starts = [], polls = 0; +function send(res, data) {res.setHeader('Content-Type','application/json');res.end(JSON.stringify(data));} +const server = http.createServer((req,res)=>{ + const url=new URL(req.url,'http://localhost'); + if(url.pathname==='/api/router-updates') {polls++;return send(res,{job,routers:[{id:'main',name:'Советская 30'}]});} + if(url.pathname==='/api/router-updates/start') { + assert.equal(req.headers['x-router-update-csrf'],'test-csrf'); + let body='';req.on('data',data=>body+=data);req.on('end',()=>{ + const payload=JSON.parse(body);starts.push(payload); + job={id:'test-task',request_id:payload.request_id,state:'running',cancel_requested:false,items:[{id:'main',name:'Советская 30',state:'running',message:'Установка выполняется',output:'one\ntwo'}]}; + send(res,{ok:true,job}); + });return; + } + if(url.pathname==='/api/router-updates/cancel') {job.cancel_requested=true;return send(res,{job});} + if(url.pathname==='/api/auth/meta')return send(res,{username:'owner',is_owner:true,users:[],sessions:[],captcha:{mode:'digits'}}); + if(url.pathname.startsWith('/api/'))return send(res,{}); + res.setHeader('Content-Type','text/html; charset=utf-8'); + res.end(fs.readFileSync(path.join(root,url.pathname==='/'?'dashboard.html':'updates.html'))); +}); +(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]) { + job=null; + const page=await browser.newPage({viewport:mobile?{width:390,height:844}:{width:1280,height:900},isMobile:mobile,hasTouch:mobile}); + const errors=[];page.on('pageerror',error=>errors.push(error.message)); + const base=`http://127.0.0.1:${server.address().port}`; + await page.goto(base+'/router-updates/'); + await page.waitForFunction(()=>!document.getElementById('start').disabled); + assert.equal(await page.locator('#command').inputValue(),'wget -O - "'+defaultRepo+'/install.sh?v=$(date +%s)" | sh'); + const command='wget -O - "https://repo.example/install.sh?v=$(date +%s)" | sh'; + await page.locator('#command').fill(command); + await page.locator('#sshPassword').fill('test-password'); + await page.locator('#start').click(); + await page.waitForFunction(()=>document.getElementById('status').textContent.includes('Обновление выполняется')); + assert.equal(starts.at(-1).command,command);assert.equal(starts.at(-1).ssh_password,'test-password'); + assert.equal(await page.locator('#sshPassword').inputValue(),''); + assert.equal(await page.locator('#start').isDisabled(),true); + assert.equal(await page.locator('#cancel').isEnabled(),true); + await page.locator('summary').click(); + job.items[0].output+='\nupdated'; + await page.waitForFunction(()=>document.querySelector('pre').textContent.includes('updated')); + assert.equal(await page.locator('details').evaluate(node=>node.open),true); + await page.reload(); + await page.waitForFunction(()=>document.getElementById('cancel').disabled===false); + const count=starts.length; + assert.equal(await page.locator('#start').isDisabled(),true); + if(mobile) { + await page.locator('#cancel').click(); + await page.waitForFunction(()=>document.getElementById('status').textContent.includes('остальные роутеры будут пропущены')); + assert.equal(job.cancel_requested,true); + assert.equal(await page.locator('#cancel').isDisabled(),true); + } + job.state='finished';job.items[0].state='success';job.items[0].message='Установка успешно завершена, rc=0'; + await page.waitForFunction(()=>document.getElementById('status').textContent.includes('Очередь завершена')); + assert.equal(await page.locator('.router strong').textContent(),'Успешно — Советская 30'); + assert.equal(starts.length,count); + assert.equal(await page.evaluate(()=>document.documentElement.scrollWidth<=innerWidth),true); + assert.equal(await page.evaluate(()=>JSON.stringify({...localStorage,...sessionStorage}).includes('test-password')),false); + await page.screenshot({path:path.join(root,mobile?'mobile.png':'desktop.png'),fullPage:true}); + assert.deepEqual(errors,[]); + await page.close(); + } + const dashboard=await browser.newPage(); + await dashboard.goto(`http://127.0.0.1:${server.address().port}/`); + const link=dashboard.locator('#routerUpdatesGroup a'); + assert.equal(await link.getAttribute('target'),'_blank'); + assert.equal(await link.getAttribute('href'),'/router-updates/'); + assert.match(await link.getAttribute('rel'),/noopener/); + await dashboard.close(); + console.log('Router updates desktop/mobile UI, polling, reload, privacy and new-tab link: PASS'); + } finally {await browser.close();await new Promise(resolve=>server.close(resolve));} +})().catch(error=>{console.error(error);process.exitCode=1;}); diff --git a/vps/deploy-router-updates.ps1 b/vps/deploy-router-updates.ps1 new file mode 100644 index 0000000..5454706 --- /dev/null +++ b/vps/deploy-router-updates.ps1 @@ -0,0 +1,151 @@ +param( + [Parameter(Mandatory = $true)][ValidateNotNullOrEmpty()][string]$Vps, + [ValidateSet('Install', 'Rollback')][string]$Action = 'Install', + [switch]$PrepareOnly +) + +$ErrorActionPreference = 'Stop' +$RepoRoot = Split-Path -Parent $PSScriptRoot +$UploadName = 'owrt-router-updates-' + [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-router-updates-v117 +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 = ( + "class RouterUpdateManager:", + "def router_updates_html(csrf):", + "def router_updates_api(self, action=''):", + "X-Router-Update-CSRF", + "router_update_launch_script", + "routerUpdatesGroup", + "app.router_updates.stop()", +) +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\nROUTER_UPDATES_V117_%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 "Router updates feature $Action finished successfully." +} +finally { + if (-not $PrepareOnly) { + $Resolved = [System.IO.Path]::GetFullPath($StageRoot) + $Expected = [System.IO.Path]::GetFullPath((Join-Path ([System.IO.Path]::GetTempPath()) $UploadName)) + if ($Resolved -ne $Expected -or (Split-Path -Leaf $Resolved) -ne $UploadName) { + throw 'Unsafe staging cleanup path.' + } + if (Test-Path -LiteralPath $Resolved) { + Remove-Item -LiteralPath $Resolved -Recurse -Force + } + } +} diff --git a/vps/owrt-remote-hub.py b/vps/owrt-remote-hub.py index 4326ac5..502ee58 100644 --- a/vps/owrt-remote-hub.py +++ b/vps/owrt-remote-hub.py @@ -5362,6 +5362,18 @@ input,select{{min-width:0;border:1px solid var(--line);border-radius:8px;padding +
+ +
+ Обновить все роутеры разом + Общая команда и SSH-пароль, последовательное обновление с итогом по каждому роутеру. +
+ +
+
+ Открыть терминал обновления +
+
@@ -9745,7 +9757,7 @@ function renderDelegatedOverview(meta) {{ authSummary.innerHTML = assigned.length ? assigned.map((item) => `${{escapeHtml((item.name || item.id) + ' [' + (item.flag_label || '-') + ']')}}`).join('') : 'Роутеры не назначены'; - ['securityGroup', 'socialGroup', 'notifyGroup', 'backupGroup', 'delegatedUsersGroup'].forEach((id) => {{ + ['securityGroup', 'socialGroup', 'notifyGroup', 'backupGroup', 'delegatedUsersGroup', 'routerUpdatesGroup'].forEach((id) => {{ const node = document.getElementById(id); if (node) node.hidden = true; }}); @@ -10096,7 +10108,7 @@ function renderAuthMeta() {{ loadPushStatus({{silent: true}}); return; }} - ['securityGroup', 'socialGroup', 'notifyGroup', 'backupGroup', 'delegatedUsersGroup'].forEach((id) => {{ + ['securityGroup', 'socialGroup', 'notifyGroup', 'backupGroup', 'delegatedUsersGroup', 'routerUpdatesGroup'].forEach((id) => {{ const node = document.getElementById(id); if (node) node.hidden = false; }}); @@ -12203,6 +12215,54 @@ window.setTimeout(focusTerminal, 80); """ +def router_updates_html(csrf): + default_command = 'wget -O - "' + RAW_REPO_BASE + '/install.sh?v=$(date +%s)" | sh' + return r''' + +Обновить все роутеры — OpenWrt Remote Hub
+

Обновить все роутеры разом

Вернуться в Hub
+
Команда выполняется на роутерах по очереди через SSH. Укажи один общий SSH-пароль root. Для каждого роутера будет отдельный итог. Если туннель не работает, обновить этот роутер через VPS не получится.
+
+ +
Пароль используется только текущей очередью и не сохраняется на диске или в браузере. Закрытие вкладки не останавливает обновления. Перезапуск Hub прерывает очередь; начатая установка на роутере продолжает работать.
+
+
Получаю список роутеров…
+

Ход обновления

+
'''.replace('__COMMAND__', html.escape(default_command)).replace('__CSRF__', json.dumps(csrf)) + + 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') @@ -14323,6 +14383,299 @@ class VpsResourceMonitor: return self.cached +def router_update_launch_script(task_id, command): + """Stage a detached router-side task; never execute the owner's command on VPS.""" + encoded = base64.b64encode(command.encode("utf-8")).decode("ascii") + return r'''set -eu +umask 077 +job=/tmp/owrt-remote-update-__TASK__ +if [ ! -d "$job" ]; then + command -v setsid >/dev/null || { echo 'setsid is required'; exit 1; } + mkdir "$job" + printf '%s' '__COMMAND__' | base64 -d >"$job/command.sh" + cat >"$job/runner.sh" <<'OWRT_UPDATE_RUNNER' +#!/bin/sh +umask 077 +job=$1 +printf '%s\n' "$$" >"$job/pid" +mkfifo "$job/stream" || exit 1 +# A bounded output tail in RAM. No growing log file, shell variable containing +# the whole output, or writer that survives a normally completed command. +( + while :; do + dd bs=4096 count=1 iflag=fullblock <&3 >"$job/chunk" 2>/dev/null + [ -s "$job/chunk" ] || break + cat "$job/chunk" >>"$job/output" + bytes=$(wc -c <"$job/output") + if [ "$bytes" -gt 32768 ]; then + tail -c 16384 "$job/output" >"$job/output.new" && mv "$job/output.new" "$job/output" + fi + done 3<"$job/stream" +) & +reader=$! +# BusyBox ash's pipefail also catches wget failures in `wget ... | sh`. +/bin/sh -ec 'set -o pipefail; . "$1"' sh "$job/command.sh" >"$job/stream" 2>&1 +rc=$? +wait "$reader" || { [ "$rc" -ne 0 ] || rc=125; } +printf '%s\n' "$rc" >"$job/result.new" +mv "$job/result.new" "$job/result" +rm -f "$job/stream" "$job/chunk" "$job/command.sh" "$job/runner.sh" +OWRT_UPDATE_RUNNER + # OpenWrt supplies setsid by default; nohup is optional. Ignore HUP before + # exec so loss of the reverse SSH connection cannot kill the installer. + (trap '' HUP; exec setsid /bin/sh "$job/runner.sh" "$job") /dev/null 2>&1 & +fi +printf 'OWRT_UPDATE_NAME=' +(uci -q get owrtremote.main.router_name || true) | head -c 512 | base64 | tr -d '\r\n' +printf '\nOWRT_UPDATE_STARTED=1\n' +'''.replace('__TASK__', task_id).replace('__COMMAND__', encoded) + + +def router_update_poll_script(task_id, cleanup=False): + prefix = 'job=/tmp/owrt-remote-update-' + task_id + '\n' + if cleanup: + return prefix + '''[ -s "$job/result" ] || exit 0 +rm -f "$job/result" "$job/result.new" "$job/pid" "$job/output" "$job/output.new" "$job/chunk" "$job/stream" "$job/command.sh" "$job/runner.sh" +rmdir "$job" 2>/dev/null || true +''' + return prefix + r'''if [ ! -d "$job" ]; then echo OWRT_UPDATE_STATE=missing; exit 0; fi +if [ -s "$job/result" ]; then + printf 'OWRT_UPDATE_RC='; cat "$job/result" + echo OWRT_UPDATE_STATE=done +elif [ -s "$job/pid" ] && kill -0 "$(cat "$job/pid")" 2>/dev/null; then + echo OWRT_UPDATE_STATE=running +else + echo OWRT_UPDATE_STATE=starting +fi +printf 'OWRT_UPDATE_OUTPUT=' +tail -c 8192 "$job/output" 2>/dev/null | base64 | tr -d '\r\n' +printf '\n' +''' + + +def router_update_fields(output): + fields = {} + for line in str(output or '').splitlines(): + key, separator, value = line.partition('=') + if separator and key.startswith('OWRT_UPDATE_'): + fields[key.removeprefix('OWRT_UPDATE_')] = value + for key in ('NAME', 'OUTPUT'): + try: + fields[key] = base64.b64decode(fields.get(key, ''), validate=True).decode('utf-8', 'replace') + except (ValueError, UnicodeError): + fields[key] = '' + return fields + + +class RouterUpdateManager: + """One sequential owner-controlled queue per Hub, independent of the browser.""" + POLL_SECONDS = 3 + ROUTER_TIMEOUT = 900 + RESULT_TTL = 7200 + + def __init__(self, app): + self.app = app + self.lock = threading.Lock() + self.csrf = secrets.token_urlsafe(32) + self.job = None + self.thread = None + self.stopping = threading.Event() + + def _ssh(self, row, script, password): + # These transport helpers use no request headers or client connection. + helper = Handler.__new__(Handler) + return helper.run_router_ssh_script(row, script, timeout=20, ssh_password=password) + + def snapshot(self): + with self.lock: + if self.job and self.job['state'] != 'running' and time.time() - self.job['finished_at'] > self.RESULT_TTL: + self.job = None + return json.loads(json.dumps(self.job)) if self.job else None + + def start(self, command, password, request_id): + if not isinstance(command, str) or not command.strip() or len(command.encode('utf-8')) > 8192 or '\x00' in command: + raise ValueError('Укажи команду обновления размером до 8 КиБ без нулевых символов.') + if not isinstance(password, str) or len(password.encode('utf-8')) > 1024 or '\x00' in password: + raise ValueError('Некорректный SSH-пароль.') + if not isinstance(request_id, str) or not re.fullmatch(r'[a-zA-Z0-9_-]{16,80}', request_id): + raise ValueError('Некорректный идентификатор запроса. Обнови страницу.') + command = command.removeprefix('\ufeff').replace('\r\n', '\n').replace('\r', '\n').strip() + with self.lock: + if self.job and self.job['request_id'] == request_id: + return self.job['id'] + if self.job and self.job['state'] == 'running': + raise RuntimeError('Очередь уже запущена. Дождись её завершения или останови оставшиеся обновления.') + if self.stopping.is_set(): + raise RuntimeError('Hub завершает работу. Повтори после запуска.') + with self.app.conn() as conn: + rows = [dict(row) for row in list_router_rows(conn)] + if not rows: + raise ValueError('Нет роутеров для обновления.') + if len(rows) > 512: + raise ValueError('В одной очереди поддерживается до 512 роутеров.') + items = [] + for row in rows: + try: + reported_name = json.loads(row.get('status_json') or '{}').get('name') + except (ValueError, AttributeError): + reported_name = '' + items.append({'id': row['id'], 'name': str(reported_name or row.get('name') or row['id'])[:200], + 'state': 'queued', 'message': 'Ожидает очереди', 'output': ''}) + job_id = secrets.token_hex(16) + self.job = {'id': job_id, 'request_id': request_id, 'state': 'running', 'started_at': time.time(), + 'finished_at': 0, 'cancel_requested': False, 'items': items} + self.thread = threading.Thread(target=self._run, args=(rows, command, password, job_id), daemon=True, + name='owrt-router-updates') + try: + self.thread.start() + except BaseException: + self.job = None + self.thread = None + raise + return job_id + + def cancel(self, job_id): + with self.lock: + if not self.job or self.job['id'] != job_id: + raise ValueError('Очередь не найдена.') + self.job['cancel_requested'] = True + + def _set(self, index, **values): + with self.lock: + self.job['items'][index].update(values) + + def _cancelled(self): + with self.lock: + return self.stopping.is_set() or self.job['cancel_requested'] + + @staticmethod + def _safe(text, password): + text = str(text or '') + if password: + text = text.replace(password, '[пароль скрыт]') + text = redact_router_log_bytes(text.encode('utf-8', 'replace')).decode('utf-8', 'replace') + return re.sub(r'[\x00-\x08\x0b-\x1f\x7f]', '', text)[-8192:] + + @classmethod + def _ssh_error(cls, error, password): + # Diagnose SSH's authentication response before the general secret + # filter hides its literal "password" authentication method name. + text = str(error or '') + denied = re.search( + r'(?im)^(?:[^\s@]+@[^\s:]+:\s*)?Permission denied' + r'(?:\s*\(([^)\r\n]*)\)[.!]?|,\s*please try again[.!]?|[.!]?)\s*$', text) + failed = re.search(r'(?im)^(?:ssh:\s*)?Authentication failed[.!]?\s*$', text) + if denied or failed: + methods = set((denied.group(1) or '').lower().replace(' ', '').split(',')) if denied else set() + if password: + if denied and denied.group(1) and not methods.intersection({'password', 'keyboard-interactive'}): + return 'SSH-сервер не предлагает вход по паролю. Проверь разрешение входа root по SSH.' + return ('Общий SSH-пароль не принят этим роутером. Возможно, пароль роутера отличается ' + 'от общего; проверь его пароль и разрешение входа root по SSH.') + return 'SSH-авторизация отклонена. Укажи пароль root или проверь SSH-ключ доступа к этому роутеру.' + return cls._safe(text, password)[:1200] or 'Ошибка подключения по SSH' + + def _run(self, rows, command, password, job_id): + try: + for index, row in enumerate(rows): + if self._cancelled(): + self._set(index, state='skipped', message='Пропущен: очередь остановлена') + continue + try: + # Reload ports/deletion state immediately before this router, + # without retaining a database connection during SSH waits. + with self.app.conn() as conn: + current = get_active_router(conn, row['id']) + current = dict(current) if current else None + if not current: + self._set(index, state='skipped', message='Роутер удалён из Hub') + continue + self._update_one(index, current, command, password, job_id) + with self.lock: + # Do not start a second installation while the first may + # still be running behind a disconnected SSH tunnel. + if self.job['items'][index]['state'] == 'unknown': + self.job['cancel_requested'] = True + except Exception as exc: + self._set(index, state='error', message=self._ssh_error(exc, password)) + finally: + password = '' + command = '' + with self.lock: + self.job['state'] = 'finished' + self.job['finished_at'] = time.time() + + def _update_one(self, index, row, command, password, job_id): + if not int(row.get('ssh_entry_port') or 0): + self._set(index, state='skipped', message='SSH-туннель не настроен') + return + task_id = job_id + '-' + str(index) + self._set(index, state='connecting', message='Подключаюсь по SSH') + ready = self._ssh(row, "printf 'OWRT_UPDATE_READY=1\\n'\n", password) + if 'OWRT_UPDATE_READY=1' not in ready.splitlines(): + raise RuntimeError('SSH не подтвердил готовность. Команда обновления не отправлена.') + launched = False + launch_error = '' + try: + fields = router_update_fields(self._ssh(row, router_update_launch_script(task_id, command), password)) + launched = fields.get('STARTED') == '1' + if fields.get('NAME', '').strip(): + name = re.sub(r'[\x00-\x1f\x7f]', ' ', fields['NAME']).strip()[:200] + self._set(index, name=name) + except Exception as exc: + # SSH can close after the detached task was accepted. Poll its known + # ID instead of executing the installation a second time. + launch_error = self._ssh_error(exc, password) + self._set(index, state='running', message='Установка выполняется' if launched else 'Проверяю, запустилась ли установка') + deadline = time.monotonic() + (self.ROUTER_TIMEOUT if launched else 40) + last_error = launch_error + missing = 0 + while time.monotonic() < deadline and not self.stopping.is_set(): + try: + fields = router_update_fields(self._ssh(row, router_update_poll_script(task_id), password)) + self._set(index, output=self._safe(fields.get('OUTPUT', ''), password)) + state = fields.get('STATE') + if state == 'done': + rc = fields.get('RC', '') + if not re.fullmatch(r'\d{1,3}', rc): + raise RuntimeError('Роутер вернул некорректный результат установки') + self._set(index, state='success' if rc == '0' else 'error', + message='Установка успешно завершена, rc=0' if rc == '0' else 'Ошибка установки, rc=' + rc) + try: + self._ssh(row, router_update_poll_script(task_id, cleanup=True), password) + except Exception: + pass + return + if state in {'running', 'starting'} and not launched: + launched = True + deadline = time.monotonic() + self.ROUTER_TIMEOUT + if state == 'missing': + missing += 1 + if not launched and missing < 3: + self.stopping.wait(self.POLL_SECONDS) + continue + self._set(index, state='unknown' if launched else 'error', + message=('Результат установки потерян: временные файлы отсутствуют. Успех не подтверждён.' + if launched else launch_error or 'Установка не запущена')) + return + if state not in {'running', 'starting'}: + raise RuntimeError('Не получен статус установки от роутера') + self._set(index, message='Установка выполняется; ожидаю итоговый код') + except Exception as exc: + last_error = self._ssh_error(exc, password) + self._set(index, message='SSH временно недоступен; ожидаю результат установки') + self.stopping.wait(self.POLL_SECONDS) + self._set(index, state='unknown', + message='Результат не подтверждён: ' + + (last_error or 'истекло время ожидания')) + + def stop(self): + self.stopping.set() + thread = self.thread + if thread and thread.ident is not None and thread is not threading.current_thread(): + thread.join(timeout=25) + + class App: def __init__(self, db_path, session, agent, public_url): self.db_path = Path(db_path) @@ -14334,6 +14687,7 @@ class App: self.router_monitor_stop = threading.Event() self.router_monitor_thread = None self.vps_resources = VpsResourceMonitor() + self.router_updates = RouterUpdateManager(self) @contextmanager def conn(self): @@ -16017,6 +16371,51 @@ a{{display:inline-flex;margin-top:18px;color:#93c5fd}} quick_commands_html = vps_quick_commands_html(public_host or "YOUR_VPS_IP") self.send_bytes(200, ssh_terminal_html_v2(row, ws_token, quick_commands_html).encode("utf-8"), "text/html; charset=utf-8") + def router_updates_page(self): + if not self.require_owner(): + return + self.send_bytes(200, router_updates_html(self.app.router_updates.csrf).encode('utf-8'), 'text/html; charset=utf-8') + + def router_updates_api(self, action=''): + if not self.require_owner(json_mode=True): + return + manager = self.app.router_updates + if action: + if not secrets.compare_digest(self.headers.get('X-Router-Update-CSRF', ''), manager.csrf): + self.send_json(403, {'ok': False, 'error': 'Обнови страницу терминала обновления и повтори.'}) + return + origin = self.headers.get('Origin', '') + if origin and origin != self.request_origin(): + self.send_json(403, {'ok': False, 'error': 'Недопустимый источник запроса.'}) + return + if 'application/json' not in self.headers.get('Content-Type', ''): + self.send_json(415, {'ok': False, 'error': 'Ожидается JSON.'}) + return + length = self.headers.get('Content-Length', '') + if self.headers.get('Transfer-Encoding') or not length.isdigit() or int(length) > 65536: + self.send_json(413, {'ok': False, 'error': 'Слишком большой запрос.'}) + return + try: + payload = self.read_payload() + if not isinstance(payload, dict): + raise ValueError('Ожидается объект JSON.') + if action == 'start': + manager.start(payload.get('command'), payload.get('ssh_password', ''), payload.get('request_id')) + elif action == 'cancel': + manager.cancel(payload.get('id')) + except ValueError as exc: + self.send_json(400, {'ok': False, 'error': str(exc)}) + return + except RuntimeError as exc: + self.send_json(409, {'ok': False, 'error': str(exc)}) + return + job = manager.snapshot() + routers = [] + if not job: + with self.app.conn() as conn: + routers = [{'id': row['id'], 'name': row['name']} for row in list_router_rows(conn)] + self.send_json(200, {'ok': True, 'job': job, 'routers': routers}) + def ssh_ws(self): try: self.connection.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1) @@ -17428,6 +17827,12 @@ exit 127 if path == "/vps-terminal/": self.vps_terminal_page() return + if path in {'/router-updates', '/router-updates/'}: + self.router_updates_page() + return + if path == '/api/router-updates': + self.router_updates_api() + return if path.startswith("/api/ssh/") and path.endswith("/check"): self.ssh_check() return @@ -17602,6 +18007,9 @@ exit 127 def do_POST(self): path = self.parsed().path + if path in {'/api/router-updates/start', '/api/router-updates/cancel'}: + self.router_updates_api(path.rsplit('/', 1)[-1]) + return if path == "/login": self.login() return @@ -18984,6 +19392,7 @@ def cmd_serve(args): except KeyboardInterrupt: print("") finally: + app.router_updates.stop() app.stop_router_state_monitor() stop_ssh_http_sessions() for extra_server, thread in extra_servers: