Add XWayland support (#16)
* save dev state * fix xwayland-satellite supervisor lifecycle, readiness and cleanup * remove wayland scanner protocol generated files * default xwayland enabled with path * remove jargons * address x11 review: park unconfirmed cleanup, never signal a reaped group, fix storm test and notify dir mode * fix resize tests: never build Size values from negative dimensions * add min-width/min-height window rules that replace client minimum sizes * rename effective_size_constraints to effective_minimum_size and minor cleanups
This commit is contained in:
1 parent
ed23949a95
commit
a6f83689f8
42 files changed
+7162
-1333
No files matched your search
@@ -12,13 +12,16 @@ 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):
|
||||
def run_session(self, direct=True, fail_target=False, shell_status=0, terminate=False,
|
||||
display=None, xauthority=None, extra_env=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',
|
||||
'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',
|
||||
@@ -32,6 +35,13 @@ class SessionStartupTest(unittest.TestCase):
|
||||
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
|
||||
@@ -44,13 +54,51 @@ class SessionStartupTest(unittest.TestCase):
|
||||
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(events, ['import:public-display', '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'])
|
||||
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_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)
|
||||
|
||||
Reference in new issue
Block a user