Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 20 additions & 8 deletions src/t2-native-enroll.py
Original file line number Diff line number Diff line change
Expand Up @@ -597,23 +597,35 @@ def _sleep_inhibitor_is_registered(process: subprocess.Popen[bytes]) -> bool:
if process.poll() is not None:
return False
completed = subprocess.run(
[str(SYSTEMD_INHIBIT), "--list", "--json=short"],
["/usr/bin/busctl", "--system", "--json=short", "call",
"org.freedesktop.login1", "/org/freedesktop/login1",
"org.freedesktop.login1.Manager", "ListInhibitors"],
check=False,
capture_output=True,
timeout=2,
)
if completed.returncode:
return False
try:
records = json.loads(completed.stdout)
document = json.loads(completed.stdout)
except (TypeError, UnicodeDecodeError, json.JSONDecodeError):
return False
return isinstance(records, list) and any(
isinstance(record, dict)
and record.get("pid") == process.pid
and record.get("who") == "t2-touchid-native-enrollment"
and record.get("what") == "sleep"
and record.get("mode") == "block"
if (not isinstance(document, dict) or document.get("type") != "a(ssssuu)"
or not isinstance(document.get("data"), list)
or len(document["data"]) != 1
or not isinstance(document["data"][0], list)):
return False
records = document["data"][0]
# logind's signature is (what, who, why, mode, uid, pid). Query it
# directly: systemd-inhibit --list does not support JSON on Ubuntu.
return process.poll() is None and any(
isinstance(record, list) and len(record) == 6
and all(isinstance(value, str) for value in record[:4])
and all(type(value) is int and 0 <= value < (1 << 32) for value in record[4:])
and record[5] == process.pid
and record[1] == "t2-touchid-native-enrollment"
and record[0] == "sleep"
and record[3] == "block"
for record in records
)

Expand Down
28 changes: 20 additions & 8 deletions src/t2-touchid-manage.py
Original file line number Diff line number Diff line change
Expand Up @@ -582,23 +582,35 @@ def _sleep_inhibitor_registered(process: subprocess.Popen[bytes]) -> bool:
if process.poll() is not None:
return False
completed = subprocess.run(
[str(SYSTEMD_INHIBIT), "--list", "--json=short"],
["/usr/bin/busctl", "--system", "--json=short", "call",
"org.freedesktop.login1", "/org/freedesktop/login1",
"org.freedesktop.login1.Manager", "ListInhibitors"],
check=False,
capture_output=True,
timeout=2,
)
if completed.returncode:
return False
try:
records = json.loads(completed.stdout)
document = json.loads(completed.stdout)
except (TypeError, UnicodeDecodeError, json.JSONDecodeError):
return False
return isinstance(records, list) and any(
isinstance(record, dict)
and record.get("pid") == process.pid
and record.get("who") == "t2-touchid-management"
and record.get("what") == "sleep"
and record.get("mode") == "block"
if (not isinstance(document, dict) or document.get("type") != "a(ssssuu)"
or not isinstance(document.get("data"), list)
or len(document["data"]) != 1
or not isinstance(document["data"][0], list)):
return False
records = document["data"][0]
# logind's signature is (what, who, why, mode, uid, pid). Query it
# directly: systemd-inhibit --list does not support JSON on Ubuntu.
return process.poll() is None and any(
isinstance(record, list) and len(record) == 6
and all(isinstance(value, str) for value in record[:4])
and all(type(value) is int and 0 <= value < (1 << 32) for value in record[4:])
and record[5] == process.pid
and record[1] == "t2-touchid-management"
and record[0] == "sleep"
and record[3] == "block"
for record in records
)

Expand Down
82 changes: 82 additions & 0 deletions tests/test_native_sleep_inhibitor.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
# SPDX-License-Identifier: GPL-2.0-only
import importlib.util
import json
from pathlib import Path
import subprocess
import sys
from types import SimpleNamespace
import unittest
from unittest import mock

SOURCE = Path(__file__).parents[1] / "src"
sys.path.insert(0, str(SOURCE))
spec = importlib.util.spec_from_file_location("native_inhibitor_test", SOURCE / "t2-native-enroll.py")
native = importlib.util.module_from_spec(spec)
spec.loader.exec_module(native)


class NativeSleepInhibitorTests(unittest.TestCase):
def setUp(self):
self.check = native._sleep_inhibitor_is_registered
self.process = SimpleNamespace(pid=4242, poll=mock.Mock(return_value=None))
self.row = ["sleep", "t2-touchid-native-enrollment", "fixture", "block", 0, 4242]

def registered(self, rows=None, *, document=None, status=0):
if document is None:
document = {"type": "a(ssssuu)", "data": [rows if rows is not None else [self.row]]}
result = subprocess.CompletedProcess([], status, stdout=json.dumps(document).encode())
with mock.patch.object(native.subprocess, "run", return_value=result) as run:
answer = self.check(self.process)
if self.process.poll.return_value is None:
self.assertEqual(run.call_args.args[0][-1], "ListInhibitors")
self.assertNotIn("--list", run.call_args.args[0])
return answer

def test_own_live_block_inhibitor_is_registered(self):
self.assertTrue(self.registered())

def test_other_inhibitor_is_not_authority(self):
for index, value in [(0, "shutdown"), (1, "other"), (3, "delay"), (5, 4243)]:
row = list(self.row)
row[index] = value
with self.subTest(index=index): self.assertFalse(self.registered([row]))

def test_dead_process_rejected_without_query(self):
self.process.poll.return_value = 1
self.assertFalse(self.registered())

def test_process_exits_during_query(self):
self.process.poll.side_effect = [None, 1]
self.assertFalse(self.registered())

def test_failed_query_rejected(self):
self.assertFalse(self.registered(status=1))

def test_invalid_json_rejected(self):
with mock.patch.object(native.subprocess, "run", return_value=SimpleNamespace(returncode=0, stdout=b"bad")):
self.assertFalse(self.check(self.process))

def test_malformed_signature_or_container_rejected(self):
for d in [[], {}, {"type": "a(ssssuu)", "data": []},
{"type": "a(ssssuu)", "data": [[] , []]},
{"type": "s", "data": [[self.row]]}]:
with self.subTest(document=d): self.assertFalse(self.registered(document=d))

def test_malformed_rows_rejected(self):
for row in [[], {}, self.row[:-1], self.row + [1], self.row[:5] + [True],
self.row[:4] + [-1, 4242]]:
with self.subTest(row=row): self.assertFalse(self.registered([row]))


class ManagementSleepInhibitorTests(NativeSleepInhibitorTests):
def setUp(self):
super().setUp()
spec = importlib.util.spec_from_file_location("management_inhibitor_test", SOURCE / "t2-touchid-manage.py")
module = importlib.util.module_from_spec(spec)
spec.loader.exec_module(module)
self.check = module._sleep_inhibitor_registered
self.row[1] = "t2-touchid-management"


if __name__ == "__main__":
unittest.main()