feat(proxy-client): добавлен мастер установки системной службы
- Зачем: установка с нуля и переход из ручного Xray одной командой. - Что: план с подтверждением или --yes, скрытый ввод ссылки, проверка Xray, перенос настроек, запуск службы и переключение домашнего профиля; безопасное продолжение после сбоя и сохранение существующих настроек. - Проверка: cross-review Claude и исправление находок; по 108 тестов на Python 3.8 и 3.14 под PTY, 18 Bash-проверок. После аудита уточнена фикстура повторного запуска и отдельно проверена на обеих версиях Python. Настоящие службы и настройки машины не изменялись.
This commit is contained in:
1 parent
45938cde98
commit
203e515479
5 files changed
+1250
-56
No files matched your search
@@ -1,6 +1,8 @@
|
||||
"""Публичный CLI профилей и установка в изолированный корень."""
|
||||
import os
|
||||
import json
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
import unittest
|
||||
from pathlib import Path
|
||||
@@ -20,7 +22,7 @@ class ProfilesServiceTest(unittest.TestCase):
|
||||
|
||||
def cli(self, *args):
|
||||
return subprocess.run([str(CLI), *map(str, args)], env=self.env,
|
||||
capture_output=True, text=True, timeout=15)
|
||||
stdin=subprocess.DEVNULL, capture_output=True, text=True, timeout=15)
|
||||
|
||||
def test_unknown_profile_never_falls_back_even_for_stop(self):
|
||||
for command in ('status', 'env', 'run', 'start', 'stop'):
|
||||
@@ -66,6 +68,104 @@ class ProfilesServiceTest(unittest.TestCase):
|
||||
self.assertEqual((stage / 'etc/proxy-client/default.url').stat().st_mode & 0o777, 0o640)
|
||||
self.assertIn('journald', result.stdout)
|
||||
|
||||
def test_install_defaults_copy_current_profile_and_local_xray(self):
|
||||
args = self.install_args()
|
||||
source, xray = args[3], args[5]
|
||||
for name in ('config', 'default.url'):
|
||||
(source / name).replace(self.config / name)
|
||||
local_xray = self.root / '.local/bin/xray'
|
||||
local_xray.parent.mkdir(parents=True)
|
||||
xray.replace(local_xray)
|
||||
result = self.cli('service', 'install', '--root', self.root / 'stage')
|
||||
self.assertEqual(0, result.returncode, result.stderr)
|
||||
settings = self.root / 'stage/etc/proxy-client'
|
||||
for name in ('config', 'default.url'):
|
||||
self.assertEqual((self.config / name).read_bytes(), (settings / name).read_bytes())
|
||||
self.assertEqual(local_xray.read_bytes(),
|
||||
(self.root / 'stage/usr/local/lib/proxy-client/xray').read_bytes())
|
||||
|
||||
def test_missing_settings_fail_before_sudo(self):
|
||||
args = self.install_args()
|
||||
fake = self.root / 'fake-os'
|
||||
fake.mkdir()
|
||||
(fake / 'sitecustomize.py').write_text('import os\nos.geteuid = lambda: 1000\n')
|
||||
log = self.root / 'sudo-called'
|
||||
sudo = fake / 'sudo'
|
||||
sudo.write_text('#!/bin/sh\ntouch "$TEST_SUDO_LOG"\nexit 23\n')
|
||||
sudo.chmod(0o755)
|
||||
self.env.update(PYTHONPATH=str(fake), TEST_SUDO_LOG=str(log),
|
||||
PATH=str(fake) + os.pathsep + os.environ['PATH'])
|
||||
result = self.cli('service', 'install', '--install-only', '--xray', args[5])
|
||||
self.assertEqual(1, result.returncode, result.stderr)
|
||||
self.assertIn('настрой', result.stderr)
|
||||
self.assertIn('терминал', result.stderr)
|
||||
self.assertNotIn('No such file', result.stderr)
|
||||
self.assertFalse(log.exists())
|
||||
|
||||
def test_install_can_select_named_profile(self):
|
||||
args = self.install_args()
|
||||
named = self.config / 'profiles/work'
|
||||
named.parent.mkdir(parents=True)
|
||||
args[3].rename(named)
|
||||
result = self.cli('--profile', 'work', 'service', 'install', '--xray', args[5],
|
||||
'--root', self.root / 'stage')
|
||||
self.assertEqual(0, result.returncode, result.stderr)
|
||||
self.assertEqual((named / 'config').read_bytes(),
|
||||
(self.root / 'stage/etc/proxy-client/config').read_bytes())
|
||||
ambiguous = self.cli('--profile', 'work', *args)
|
||||
self.assertEqual(1, ambiguous.returncode)
|
||||
self.assertIn('--config-dir', ambiguous.stderr)
|
||||
|
||||
def test_install_resolves_user_paths_before_sudo(self):
|
||||
args = self.install_args()
|
||||
for name in ('config', 'default.url'):
|
||||
(args[3] / name).replace(self.config / name)
|
||||
local_xray = self.root / '.local/bin/xray'
|
||||
local_xray.parent.mkdir(parents=True)
|
||||
args[5].replace(local_xray)
|
||||
fake = self.root / 'fake-os'
|
||||
fake.mkdir()
|
||||
(fake / 'sitecustomize.py').write_text('import os\nos.geteuid = lambda: 1000\n')
|
||||
sudo = fake / 'sudo'
|
||||
sudo.write_text('#!/usr/bin/env python3\nimport json, os, sys\n'
|
||||
'open(os.environ["TEST_SUDO_ARGS"], "w").write(json.dumps(sys.argv[1:]))\n'
|
||||
'sys.exit(23)\n')
|
||||
sudo.chmod(0o755)
|
||||
log = self.root / 'sudo-args.json'
|
||||
self.env.update(PYTHONPATH=str(fake), TEST_SUDO_ARGS=str(log),
|
||||
PATH=str(fake) + os.pathsep + os.environ['PATH'])
|
||||
result = self.cli('service', 'install', '--install-only', '--enable', '--start')
|
||||
self.assertEqual(23, result.returncode, result.stderr)
|
||||
command = json.loads(log.read_text())
|
||||
self.assertEqual(['service', 'install', '--config-dir', str(self.config),
|
||||
'--xray', str(local_xray), '--enable', '--start'], command[3:])
|
||||
self.assertEqual('--', command[0])
|
||||
self.assertEqual(str(CLI.resolve()), command[2])
|
||||
|
||||
def test_direct_sudo_uses_invoking_users_home(self):
|
||||
args = self.install_args()
|
||||
source = self.root / '.config/proxy-client'
|
||||
source.parent.mkdir()
|
||||
args[3].rename(source)
|
||||
xray = self.root / '.local/bin/xray'
|
||||
xray.parent.mkdir(parents=True)
|
||||
args[5].replace(xray)
|
||||
fake = self.root / 'fake-os'
|
||||
fake.mkdir()
|
||||
(fake / 'sitecustomize.py').write_text(
|
||||
'import os, pwd, types\nos.geteuid = lambda: 0\n'
|
||||
'def user(uid):\n'
|
||||
' assert uid == 12345\n'
|
||||
' return types.SimpleNamespace(pw_dir=os.environ["TEST_USER_HOME"])\n'
|
||||
'pwd.getpwuid = user\n')
|
||||
self.env.pop('XDG_CONFIG_HOME')
|
||||
self.env.update(HOME=str(self.root / 'root-home'), SUDO_UID='12345',
|
||||
TEST_USER_HOME=str(self.root), PYTHONPATH=str(fake))
|
||||
result = self.cli('service', 'install', '--root', self.root / 'stage')
|
||||
self.assertEqual(0, result.returncode, result.stderr)
|
||||
self.assertEqual((source / 'config').read_bytes(),
|
||||
(self.root / 'stage/etc/proxy-client/config').read_bytes())
|
||||
|
||||
def test_install_refuses_foreign_files_before_writing(self):
|
||||
args = self.install_args()
|
||||
target = self.root / 'stage/etc/systemd/system/proxy-client.service'
|
||||
@@ -97,6 +197,26 @@ class ProfilesServiceTest(unittest.TestCase):
|
||||
updated = self.cli(*args)
|
||||
self.assertEqual(0, updated.returncode, updated.stderr)
|
||||
|
||||
def test_default_update_preserves_service_settings_without_home_files(self):
|
||||
args = self.install_args()
|
||||
first = self.cli(*args)
|
||||
self.assertEqual(0, first.returncode, first.stderr)
|
||||
settings = self.root / 'stage/etc/proxy-client'
|
||||
saved = {name: (settings / name).read_bytes() for name in ('config', 'default.url')}
|
||||
for path in args[3].iterdir():
|
||||
path.unlink()
|
||||
args[3].rmdir()
|
||||
args[5].unlink()
|
||||
# В PATH только Python для shebang тестового CLI; Xray там отсутствует.
|
||||
path = self.root / 'path'
|
||||
path.mkdir()
|
||||
(path / 'python3').symlink_to(sys.executable)
|
||||
self.env['PATH'] = str(path)
|
||||
updated = self.cli('service', 'install', '--root', self.root / 'stage')
|
||||
self.assertEqual(0, updated.returncode, updated.stderr)
|
||||
for name, data in saved.items():
|
||||
self.assertEqual(data, (settings / name).read_bytes())
|
||||
|
||||
def test_unspecified_journal_storage_is_not_guessed(self):
|
||||
result = self.cli(*self.install_args())
|
||||
self.assertEqual(0, result.returncode, result.stderr)
|
||||
@@ -153,6 +273,7 @@ import os, pathlib, grp, types
|
||||
stage = os.environ['TEST_INSTALL_ROOT']
|
||||
OriginalPath = type(pathlib.Path())
|
||||
class StagedPath:
|
||||
home = staticmethod(OriginalPath.home)
|
||||
def __new__(cls, *parts, **kwargs):
|
||||
if parts == ('/',):
|
||||
parts = (stage,)
|
||||
@@ -204,9 +325,29 @@ os.chown = chown
|
||||
self.assertFalse((self.root / 'stage').exists())
|
||||
config = self.root / 'source/config'
|
||||
original = config.read_text()
|
||||
for invalid in (original.replace('type=xray', 'type=external'),
|
||||
original.replace('127.0.0.1', '192.0.2.1')):
|
||||
for invalid in [original.replace('type=xray', 'type=external')] + [
|
||||
original.replace('127.0.0.1', address)
|
||||
for address in ('0.0.0.0', '::', '192.0.2.1', '2001:db8::1', 'localhost')]:
|
||||
config.write_text(invalid)
|
||||
result = self.cli(*args)
|
||||
self.assertNotEqual(0, result.returncode)
|
||||
self.assertFalse((self.root / 'stage').exists())
|
||||
|
||||
def test_manual_and_service_run_reject_non_loopback_before_start(self):
|
||||
args = self.install_args()
|
||||
config_path = args[3] / 'config'
|
||||
original = config_path.read_text()
|
||||
for name in ('config', 'default.url'):
|
||||
(args[3] / name).replace(self.config / name)
|
||||
runtime = self.root / 'service-runtime'
|
||||
commands = [('start',), ('service', 'run', '--config-dir', self.config,
|
||||
'--runtime-dir', runtime, '--xray', args[5])]
|
||||
for address in ('0.0.0.0', '::', '192.0.2.1', '2001:db8::1', 'localhost'):
|
||||
(self.config / 'config').write_text(original.replace('127.0.0.1', address))
|
||||
for command in commands:
|
||||
with self.subTest(address=address, command=command):
|
||||
result = self.cli(*command)
|
||||
self.assertEqual(1, result.returncode, result.stderr)
|
||||
self.assertIn('loopback', result.stderr)
|
||||
self.assertFalse(runtime.exists())
|
||||
self.assertFalse((self.root / 'state').exists())
|
||||
Reference in new issue
Block a user