Samuel Onoja
a6f24e8188
Bound IPC transport deadlines while preserving portal leases, supervise desktop helper and agent recovery, and reserve final floating window geometry during placement. Stabilize CLI output and isolated tests, expand workspace CI, resolve formatting and lint failures, and bundle the MIT license with installer compatibility.
166 lines
8.4 KiB
Python
166 lines
8.4 KiB
Python
"""Session startup regressions using fake services; never touches the host bus."""
|
|
import os
|
|
from pathlib import Path
|
|
import shutil
|
|
import signal
|
|
import subprocess
|
|
import tempfile
|
|
import time
|
|
import unittest
|
|
|
|
SCRIPT = Path(__file__).resolve().parents[2] / 'packaging/ferese-session-shell'
|
|
|
|
|
|
class SessionStartupTest(unittest.TestCase):
|
|
def run_session(self, direct=True, fail_target=False, shell_status=0, terminate=False,
|
|
display=None, xauthority=None, extra_env=None, programs_override=None):
|
|
with tempfile.TemporaryDirectory() as directory:
|
|
root = Path(directory)
|
|
helper = root / 'ferese-session-shell'
|
|
shutil.copyfile(SCRIPT, helper)
|
|
programs = {
|
|
'dbus-update-activation-environment': (
|
|
'printf "import:%s\\n" "$WAYLAND_DISPLAY" >> "$TEST_ROOT/events"\n'
|
|
'printf "vars:%s\\n" "$*" >> "$TEST_ROOT/events"\n'),
|
|
'dbus-send': 'echo reload-bus >> "$TEST_ROOT/events"\n',
|
|
'systemctl': 'echo "$*" >> "$TEST_ROOT/events"\nif [[ $* == "--user start ferese-session.target" && $TEST_FAIL == 1 ]]; then exit 1; fi\n',
|
|
'ferese-polkit-agent': 'exec sleep 30\n',
|
|
'ferese-shell': 'printf "shell:%s\\n" "$WAYLAND_SOCKET" >> "$TEST_ROOT/events"\nif [[ $TEST_WAIT == 1 ]]; then exec sleep 30; fi\nexit "$TEST_STATUS"\n',
|
|
}
|
|
programs.update(programs_override or {})
|
|
for name, body in programs.items():
|
|
path = root / name
|
|
path.write_text('#!/bin/bash\n' + body)
|
|
path.chmod(0o755)
|
|
env = dict(os.environ, PATH=f'{root}:{os.environ["PATH"]}', TEST_ROOT=directory,
|
|
FERESE_SESSION_MODE='desktop',
|
|
FERESE_SESSION_IMPORT_ENV=str(int(direct)), WAYLAND_DISPLAY='private-display',
|
|
FERESE_PUBLIC_WAYLAND_DISPLAY='public-display', WAYLAND_SOCKET='77',
|
|
TEST_FAIL=str(int(fail_target)), TEST_STATUS=str(shell_status), TEST_WAIT=str(int(terminate)))
|
|
env.pop('DISPLAY', None)
|
|
env.pop('XAUTHORITY', None)
|
|
if display is not None:
|
|
env['DISPLAY'] = display
|
|
if xauthority is not None:
|
|
env['XAUTHORITY'] = xauthority
|
|
env.update(extra_env or {})
|
|
child = subprocess.Popen(['bash', str(helper)], env=env, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
|
if terminate:
|
|
deadline = time.monotonic() + 3
|
|
while not (root / 'events').exists() or 'shell:77' not in (root / 'events').read_text():
|
|
if time.monotonic() > deadline:
|
|
child.kill()
|
|
self.fail('Session shell did not start')
|
|
time.sleep(.01)
|
|
child.send_signal(signal.SIGTERM)
|
|
child.communicate(timeout=4)
|
|
return child.returncode, (root / 'events').read_text().splitlines()
|
|
|
|
@staticmethod
|
|
def imported_vars(events):
|
|
for line in events:
|
|
if line.startswith('vars:'):
|
|
return line[len('vars:'):].split(' ')
|
|
raise AssertionError('no activation-environment import recorded')
|
|
|
|
def test_direct_session_imports_public_display_before_activation_and_cleans_up(self):
|
|
status, events = self.run_session(shell_status=7)
|
|
self.assertEqual(status, 7)
|
|
self.assertEqual([e for e in events if e.startswith('import:')], ['import:public-display'])
|
|
self.assertEqual([e for e in events if not e.startswith(('import:', 'vars:'))],
|
|
['reload-bus', '--user daemon-reload',
|
|
'--user start ferese-session.target',
|
|
'--user try-restart xdg-desktop-portal-ferese.service', 'shell:77',
|
|
'--user stop ferese-session.target'])
|
|
|
|
def test_direct_session_imports_its_control_socket(self):
|
|
status, events = self.run_session(extra_env={'FERESE_SOCKET': '/run/user/1000/ferese/control.sock'})
|
|
self.assertEqual(status, 0)
|
|
self.assertIn('FERESE_SOCKET=/run/user/1000/ferese/control.sock', self.imported_vars(events))
|
|
|
|
def test_a_managed_x11_endpoint_is_imported_for_dbus_activators(self):
|
|
status, events = self.run_session(display=':7', xauthority='/run/user/1000/ferese-xauth-abcd')
|
|
self.assertEqual(status, 0)
|
|
imported = self.imported_vars(events)
|
|
self.assertIn('DISPLAY=:7', imported)
|
|
self.assertIn('XAUTHORITY=/run/user/1000/ferese-xauth-abcd', imported)
|
|
self.assertIn('WAYLAND_DISPLAY=public-display', imported)
|
|
|
|
def test_a_session_without_x11_imports_empty_values_instead_of_omitting_them(self):
|
|
status, events = self.run_session()
|
|
self.assertEqual(status, 0)
|
|
imported = self.imported_vars(events)
|
|
self.assertIn('DISPLAY=', imported)
|
|
self.assertIn('XAUTHORITY=', imported)
|
|
|
|
def test_activation_import_never_leaks_the_private_socket_or_cookies(self):
|
|
status, events = self.run_session(
|
|
display=':7', xauthority='/run/user/1000/ferese-xauth-abcd',
|
|
extra_env={'WAYLAND_SOCKET': '77',
|
|
'FERESE_SHELL_CONTROL_SOCKET': '/run/user/1000/ferese/shell.sock',
|
|
'FERESE_PRIVATE_X11_COOKIE': 'deadbeefdeadbeefdeadbeefdeadbeef'})
|
|
self.assertEqual(status, 0)
|
|
imported = self.imported_vars(events)
|
|
for leaked in ('WAYLAND_SOCKET', 'FERESE_SHELL_CONTROL_SOCKET',
|
|
'FERESE_PRIVATE_X11_COOKIE', 'deadbeef'):
|
|
self.assertFalse([entry for entry in imported if leaked in entry],
|
|
f'{leaked} must not reach the activation environment')
|
|
self.assertIn('WAYLAND_DISPLAY=public-display', imported)
|
|
|
|
def test_nested_session_never_changes_host_activation(self):
|
|
status, events = self.run_session(direct=False)
|
|
self.assertEqual(status, 0)
|
|
self.assertEqual(events, ['shell:77'])
|
|
|
|
def test_embedded_policy_blocks_session_services_despite_an_inherited_import_flag(self):
|
|
status, events = self.run_session(direct=True, extra_env={'FERESE_SESSION_MODE': 'embedded'})
|
|
self.assertEqual(status, 0)
|
|
self.assertEqual(events, ['shell:77'])
|
|
|
|
def test_failed_target_does_not_prevent_shell_or_stop_unowned_target(self):
|
|
status, events = self.run_session(fail_target=True)
|
|
self.assertEqual(status, 0)
|
|
self.assertIn('shell:77', events)
|
|
self.assertNotIn('--user stop ferese-session.target', events)
|
|
self.assertNotIn('--user try-restart xdg-desktop-portal-ferese.service', events)
|
|
|
|
def test_termination_stops_the_session_target(self):
|
|
status, events = self.run_session(terminate=True)
|
|
self.assertEqual(status, 143)
|
|
self.assertEqual(events[-1], '--user stop ferese-session.target')
|
|
|
|
def test_agent_failure_recovers_without_restarting_shell(self):
|
|
status, events = self.run_session(programs_override={
|
|
'ferese-polkit-agent': (
|
|
'echo agent >> "$TEST_ROOT/events"\n'
|
|
'if [[ ! -f $TEST_ROOT/agent-failed ]]; then touch "$TEST_ROOT/agent-failed"; exit 7; fi\n'
|
|
'touch "$TEST_ROOT/agent-recovered"\nexec sleep 30\n'),
|
|
'ferese-shell': (
|
|
'echo shell >> "$TEST_ROOT/events"\n'
|
|
'for ((i=0; i<200; i++)); do\n'
|
|
' [[ -f $TEST_ROOT/agent-recovered ]] && exit 0\n'
|
|
' sleep .01\ndone\nexit 1\n'),
|
|
})
|
|
self.assertEqual(status, 0)
|
|
self.assertEqual(events.count('agent'), 2)
|
|
self.assertEqual(events.count('shell'), 1)
|
|
self.assertEqual(events[-1], '--user stop ferese-session.target')
|
|
|
|
def test_recovered_shell_does_not_repeat_autostart(self):
|
|
programs = {
|
|
'feresectl': 'touch "$TEST_ROOT/autostarted"\necho autostart >> "$TEST_ROOT/events"\n',
|
|
'ferese-shell': (
|
|
'if [[ ${FERESE_CLIENT_RESTART:-0} == 1 ]]; then sleep .1; exit 0; fi\n'
|
|
'for ((i=0; i<100; i++)); do\n'
|
|
' [[ -f $TEST_ROOT/autostarted ]] && exit 0\n'
|
|
' sleep .01\ndone\nexit 1\n'),
|
|
}
|
|
for restarted in ('0', '1'):
|
|
status, events = self.run_session(extra_env={'FERESE_CLIENT_RESTART': restarted}, programs_override=programs)
|
|
self.assertEqual(status, 0)
|
|
self.assertEqual(events.count('autostart'), int(restarted == '0'))
|
|
|
|
|
|
if __name__ == '__main__':
|
|
unittest.main()
|